[SHRINKRES-320] Remove redundant if statements

shrinkwrap · Feb 8, 2024 · 67e5c5c · 67e5c5c
1 parent 3ab21c6
commit 67e5c5c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 51 deletions.
diff --git a/maven/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/PackagingType.java b/maven/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/PackagingType.java
@@ -169,11 +169,8 @@ public boolean equals(Object obj) {
             return false;
         PackagingType other = (PackagingType) obj;
         if (id == null) {
-            if (other.id != null)
-                return false;
-        } else if (!id.equals(other.id))
-            return false;
-        return true;
+            return other.id == null;
+        } else return id.equals(other.id);
     }
 
 

diff --git a/...src/main/java/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenCoordinateImpl.java b/...src/main/java/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenCoordinateImpl.java
@@ -157,10 +157,7 @@ public boolean equals(final Object obj) {
         } else if (!classifier.equals(other.classifier)) {
             return false;
         }
-        if (!packaging.equals(other.packaging)) {
-            return false;
-        }
-        return true;
+        return packaging.equals(other.packaging);
     }
 
     /**

diff --git a/...ven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenGABaseImpl.java b/...ven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenGABaseImpl.java
@@ -117,13 +117,8 @@ public boolean equals(final Object obj) {
             return false;
         }
         if (groupId == null) {
-            if (other.groupId != null) {
-                return false;
-            }
-        } else if (!groupId.equals(other.groupId)) {
-            return false;
-        }
-        return true;
+            return other.groupId == null;
+        } else return groupId.equals(other.groupId);
     }
 
 }
diff --git a/...n/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/filter/ScopeFilter.java b/...n/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/filter/ScopeFilter.java
@@ -67,12 +67,7 @@ public boolean accepts(final MavenDependency dependency, final List<MavenDepende
         if (dependency == null) {
             return false;
         }
-
-        if (allowedScopes.contains(dependency.getScope())) {
-            return true;
-        }
-
-        return false;
+        return allowedScopes.contains(dependency.getScope());
     }
 
     @Override

diff --git a/...hive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/plugins/Validate.java b/...hive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/plugins/Validate.java
@@ -78,10 +78,7 @@ public static void notEmpty(final Collection<?> collection, final String message
      * @return {@code true} if specified String is null or empty, {@code false} otherwise
      */
     public static boolean isNullOrEmpty(final String string) {
-        if (string == null || string.length() == 0) {
-            return true;
-        }
-        return false;
+        return (string == null || string.length() == 0);
     }
 
     /**
@@ -92,10 +89,7 @@ public static boolean isNullOrEmpty(final String string) {
      * @return {@code true} if specified String is null or empty, {@code false} otherwise
      */
     public static boolean isNullOrEmptyOrQuestionMark(final String string) {
-        if (string == null || string.length() == 0 || "?".equals(string)) {
-            return true;
-        }
-        return false;
+        return (string == null || string.length() == 0 || "?".equals(string));
     }
 
     /**

diff --git a/...rc/main/java/org/jboss/shrinkwrap/resolver/impl/maven/coordinate/MavenDependencyImpl.java b/...rc/main/java/org/jboss/shrinkwrap/resolver/impl/maven/coordinate/MavenDependencyImpl.java
@@ -235,13 +235,8 @@ public boolean equals(Object obj) {
         }
         MavenDependencyImpl other = (MavenDependencyImpl) obj;
         if (delegate == null) {
-            if (other.delegate != null) {
-                return false;
-            }
-        } else if (!delegate.equals(other.delegate)) {
-            return false;
-        }
-        return true;
+            return other.delegate == null;
+        } else return delegate.equals(other.delegate);
     }
 
     /**

diff --git a/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/util/Validate.java b/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/util/Validate.java
@@ -87,10 +87,7 @@ public static void notEmpty(final Collection<?> collection, final String message
      * @return {@code true} if specified String is null or empty, {@code false} otherwise
      */
     public static boolean isNullOrEmpty(final String string) {
-        if (string == null || string.length() == 0) {
-            return true;
-        }
-        return false;
+        return (string == null || string.length() == 0);
     }
 
     /**
@@ -101,10 +98,7 @@ public static boolean isNullOrEmpty(final String string) {
      * @return {@code true} if specified String is null or empty, {@code false} otherwise
      */
     public static boolean isNullOrEmptyOrQuestionMark(final String string) {
-        if (string == null || string.length() == 0 || "?".equals(string)) {
-            return true;
-        }
-        return false;
+        return (string == null || string.length() == 0 || "?".equals(string));
     }
 
     /**

diff --git a/...st/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/DependencyDepthTestCase.java b/...st/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/DependencyDepthTestCase.java
@@ -128,12 +128,7 @@ private static class DepthFilter implements MavenResolutionFilter {
         @Override
         public boolean accepts(MavenDependency dependency, List<MavenDependency> dependenciesForResolution,
                 List<MavenDependency> dependencyAncestors) {
-
-            if (dependencyAncestors != null && dependencyAncestors.size() > depth) {
-                return false;
-            }
-
-            return true;
+            return (dependencyAncestors == null || dependencyAncestors.size() <= depth);
         }
     }
 }