MNG-7296 - Remove redundant 'if' statement

maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java

@@ -44,9 +44,9 @@ public final class ArtifactUtils
             {
                 return true;
             }
-            else if ( Artifact.VERSION_FILE_PATTERN.matcher( version ).matches() )
+            else
             {
-                return true;
+                return Artifact.VERSION_FILE_PATTERN.matcher( version ).matches();
             }
         }
         return false;

maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java

@@ -349,14 +349,12 @@ public class DefaultArtifact
         {
             return false;
         }
-        else if ( a.getClassifier() == null ? classifier != null : !a.getClassifier().equals( classifier ) )
+        else
         {
-            return false;
+            return a.getClassifier() == null ? classifier == null : a.getClassifier().equals( classifier );
         }
 
         // We don't consider the version range in the comparison, just the resolved version
-
-        return true;
     }
 
     public String getBaseVersion()

maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java

@@ -88,10 +88,7 @@ public class Restriction
             {
                 return false;
             }
-            if ( comparison < 0 )
-            {
-                return false;
-            }
+            return comparison >= 0;
         }
 
         return true;

maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java

@@ -368,12 +368,7 @@ public class StringSearchModelInterpolator
 //                return false;
 //            }
 
-            if ( "parent".equals( field.getName() ) )
-            {
-                return false;
-            }
-
-            return true;
+            return !"parent".equals( field.getName() );
         }
 
         private void evaluateArray( Object target )

maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java

@@ -265,11 +265,10 @@ public class DefaultExceptionHandler
         {
             return false;
         }
-        else if ( exception.getClass().getName().startsWith( "java" ) )
+        else
         {
-            return false;
+            return !exception.getClass().getName().startsWith( "java" );
         }
-        return true;
     }
 
     private String getMessage( String message, Throwable exception )

maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java

@@ -408,10 +408,7 @@ public class DefaultGraphBuilder
 
             id = project.getGroupId() + id;
 
-            if ( id.equals( selector ) )
-            {
-                return true;
-            }
+            return id.equals( selector );
         }
 
         // relative path, e.g. "sub", "../sub" or "."

maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java

@@ -392,12 +392,10 @@ public class ActiveProjectArtifact
         {
             return false;
         }
-        else if ( a.getClassifier() == null ? getClassifier() != null : !a.getClassifier().equals( getClassifier() ) )
+        else
         {
-            return false;
+            return a.getClassifier() == null ? getClassifier() == null : a.getClassifier().equals( getClassifier() );
         }
-
-        return true;
     }
 
 }

maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java

@@ -141,11 +141,7 @@ public class FileProfileActivator
 
         ActivationFile file = activation.getFile();
 
-        if ( file == null )
-        {
-            return false;
-        }
-        return true;
+        return file != null;
     }
 
 }

maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java

@@ -99,11 +99,7 @@ public class JdkVersionProfileActivator
 
         String jdk = activation.getJdk();
 
-        if ( jdk == null )
-        {
-            return false;
-        }
-        return true;
+        return jdk != null;
     }
 
     private static boolean isInRange( String value, List<RangeValue> range )

maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java

@@ -92,11 +92,7 @@ public class OperatingSystemProfileActivator
 
         ActivationOS os = activation.getOs();
 
-        if ( os == null )
-        {
-            return false;
-        }
-        return true;
+        return os != null;
     }
 
     private boolean ensureAtLeastOneNonNull( ActivationOS os )

maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java

@@ -119,11 +119,7 @@ public class PropertyProfileActivator
 
         ActivationProperty property = activation.getProperty();
 
-        if ( property == null )
-        {
-            return false;
-        }
-        return true;
+        return property != null;
     }
 
 }

maven-model-transform/src/main/java/org/apache/maven/model/transform/DependencyKey.java

@@ -80,12 +80,7 @@ public class DependencyKey
         {
             return false;
         }
-        if ( !Objects.equals( groupId, other.groupId ) )
-        {
-            return false;
-        }
-
-        return true;
+        return Objects.equals( groupId, other.groupId );
     }