You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/10/10 08:54:08 UTC
[maven] branch master updated: MNG-7296 - Remove redundant 'if'
statement
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 4fafe44 MNG-7296 - Remove redundant 'if' statement
4fafe44 is described below
commit 4fafe44112e7c8e8d9049499c4ca51be00758adf
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sun Oct 10 09:43:13 2021 +0200
MNG-7296 - Remove redundant 'if' statement
---
.../src/main/java/org/apache/maven/artifact/ArtifactUtils.java | 4 ++--
.../src/main/java/org/apache/maven/artifact/DefaultArtifact.java | 6 ++----
.../java/org/apache/maven/artifact/versioning/Restriction.java | 5 +----
.../maven/project/interpolation/StringSearchModelInterpolator.java | 7 +------
.../java/org/apache/maven/exception/DefaultExceptionHandler.java | 5 ++---
.../src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java | 5 +----
.../org/apache/maven/project/artifact/ActiveProjectArtifact.java | 6 ++----
.../maven/model/profile/activation/FileProfileActivator.java | 6 +-----
.../maven/model/profile/activation/JdkVersionProfileActivator.java | 6 +-----
.../model/profile/activation/OperatingSystemProfileActivator.java | 6 +-----
.../maven/model/profile/activation/PropertyProfileActivator.java | 6 +-----
.../main/java/org/apache/maven/model/transform/DependencyKey.java | 7 +------
12 files changed, 16 insertions(+), 53 deletions(-)
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
index bd76edd..e144cc3 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
+++ b/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;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
index d63d6c9..4aafcff 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
+++ b/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()
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
index c728e9f..2b37793 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
+++ b/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;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index f137c6e..553874c 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/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 )
diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
index 7d19818..3e21587 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
+++ b/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 )
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index d1236e8..0b19f72 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/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 "."
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
index 8639234..5a96efd 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
+++ b/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;
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
index 999e070..060ae6d 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
+++ b/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;
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
index e9dcd77..b21fd81 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
+++ b/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 )
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
index e53141e..29e96bc 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
+++ b/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 )
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
index 671a096..47e00d7 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
+++ b/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;
}
}
diff --git a/maven-model-transform/src/main/java/org/apache/maven/model/transform/DependencyKey.java b/maven-model-transform/src/main/java/org/apache/maven/model/transform/DependencyKey.java
index d114cc1..95c40e0 100644
--- a/maven-model-transform/src/main/java/org/apache/maven/model/transform/DependencyKey.java
+++ b/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 );
}