#41 - a little bit of cosmetics (simplified some statements)

mojohaus · Jul 25, 2018 · e9bf86c · e9bf86c
1 parent fb04320
commit e9bf86c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 35 deletions.
diff --git a/animal-sniffer-ant-tasks/src/main/java/org/codehaus/mojo/animal_sniffer/ant/Annotation.java b/animal-sniffer-ant-tasks/src/main/java/org/codehaus/mojo/animal_sniffer/ant/Annotation.java
@@ -30,12 +30,7 @@ public boolean equals( Object o )
 
         Annotation annotation = (Annotation) o;
 
-        if ( className != null ? !className.equals( annotation.className ) : annotation.className != null )
-        {
-            return false;
-        }
-
-        return true;
+        return className != null ? className.equals( annotation.className ) : annotation.className == null;
     }
 
     public int hashCode()

diff --git a/animal-sniffer-ant-tasks/src/main/java/org/codehaus/mojo/animal_sniffer/ant/Ignore.java b/animal-sniffer-ant-tasks/src/main/java/org/codehaus/mojo/animal_sniffer/ant/Ignore.java
@@ -58,12 +58,7 @@ public boolean equals( Object o )
 
         Ignore ignore = (Ignore) o;
 
-        if ( className != null ? !className.equals( ignore.className ) : ignore.className != null )
-        {
-            return false;
-        }
-
-        return true;
+        return className != null ? className.equals( ignore.className ) : ignore.className == null;
     }
 
     public int hashCode()

diff --git a/animal-sniffer-ant-tasks/src/main/java/org/codehaus/mojo/animal_sniffer/ant/Signature.java b/animal-sniffer-ant-tasks/src/main/java/org/codehaus/mojo/animal_sniffer/ant/Signature.java
@@ -53,12 +53,7 @@ public boolean equals( Object o )
 
         Signature signature = (Signature) o;
 
-        if ( src != null ? !src.equals( signature.src ) : signature.src != null )
-        {
-            return false;
-        }
-
-        return true;
+        return src != null ? src.equals( signature.src ) : signature.src == null;
     }
 
     public int hashCode()

diff --git a/...aven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/BuildSignaturesMojo.java b/...aven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/BuildSignaturesMojo.java
@@ -598,9 +598,7 @@ private InputStream[] getBaseSignatures()
                 baseSignatures.add( new FileInputStream( artifact.getFile() ) );
             }
         }
-        final InputStream[] baseSignatureInputStreams =
-            (InputStream[]) baseSignatures.toArray( new InputStream[baseSignatures.size()] );
-        return baseSignatureInputStreams;
+        return baseSignatures.toArray( new InputStream[baseSignatures.size()] );
     }
 
     /**

diff --git a/...maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/CheckSignatureMojo.java b/...maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/CheckSignatureMojo.java
@@ -196,9 +196,10 @@ public void execute()
             return;
         }
 
-		if ( signature == null || StringUtils.isBlank(signature.getGroupId()) || signature.getGroupId() == "null") {
-			getLog().info( "Signature version is: " + signature.getVersion() );
-			return;
+        if ( signature == null || StringUtils.isBlank( signature.getGroupId() ) || "null".equals( signature.getGroupId()) )
+        {
+            getLog().info( "Signature version is: " + signature.getVersion() );
+            return;
         }
 
         try

diff --git a/...iffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/JdkToolchain.java b/...iffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/JdkToolchain.java
@@ -64,12 +64,7 @@ public boolean equals( Object o )
 
         JdkToolchain that = (JdkToolchain) o;
 
-        if ( parameters != null ? !parameters.equals( that.parameters ) : that.parameters != null )
-        {
-            return false;
-        }
-
-        return true;
+        return parameters != null ? parameters.equals( that.parameters ) : that.parameters == null;
     }
 
     public int hashCode()

diff --git a/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/Main.java b/animal-sniffer/src/main/java/org/codehaus/mojo/animal_sniffer/Main.java
@@ -83,13 +83,15 @@ public static void main( String[] args )
             files.add(new File(args[i]));
         }
 
-        for (int i = 0; i < files.size(); i++)
+        for ( File file : files )
         {
-            m.process((File) files.get(i));
+            m.process(file);
         }
 
-        if (threshold!=null && m.maximumVersion.compareTo(threshold)>0)
+        if ( threshold != null && m.maximumVersion.compareTo( threshold ) > 0 )
+        {
             System.exit(1);
+        }
     }
 
     protected void process( String name, InputStream image )
@@ -107,8 +109,8 @@ protected void process( String name, InputStream image )
 
         if (humanReadableName)
         {
-            String hn = (String)HUMAN_READABLE_NAME.get(v);
-            if (hn!=null)   v = hn;
+            String hn = HUMAN_READABLE_NAME.get(v);
+            if ( hn != null ) v = hn;
         }
 
         System.out.println( v + " " + name );
@@ -129,5 +131,7 @@ private static int u2( byte u, byte d )
         HUMAN_READABLE_NAME.put("48.0","Java4");
         HUMAN_READABLE_NAME.put("49.0","Java5");
         HUMAN_READABLE_NAME.put("50.0","Java6");
+        HUMAN_READABLE_NAME.put("51.0","Java7");
+        HUMAN_READABLE_NAME.put("52.0","Java8");
     }
 }