From 242b4f4d892c1ad90fd84ccd2b32e57081770739 Mon Sep 17 00:00:00 2001 From: Dezhi Cai Date: Wed, 4 Sep 2019 16:58:57 +0800 Subject: [PATCH 1/2] [refactor] use utility method of Objects to simplify code --- .../maven/artifact/versioning/VersionRange.java | 13 +++---------- .../artifact/resolver/DebugResolutionListener.java | 3 ++- .../repository/MavenArtifactRepository.java | 3 ++- .../resolver/filter/ScopeArtifactFilter.java | 4 +++- .../java/org/apache/maven/plugin/CacheUtils.java | 2 +- .../maven/plugin/DefaultPluginDescriptorCache.java | 7 ++----- .../java/org/apache/maven/project/MavenProject.java | 12 ++---------- .../project/artifact/DefaultMavenMetadataCache.java | 10 ++-------- .../apache/maven/toolchain/DefaultToolchain.java | 9 +++------ 9 files changed, 20 insertions(+), 43 deletions(-) diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java index c37eabb22ec..d0835e6090b 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java @@ -19,12 +19,7 @@ * under the License. */ -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; +import java.util.*; import org.apache.maven.artifact.Artifact; @@ -593,11 +588,9 @@ public boolean equals( Object obj ) VersionRange other = (VersionRange) obj; boolean equals = - recommendedVersion == other.recommendedVersion - || ( ( recommendedVersion != null ) && recommendedVersion.equals( other.recommendedVersion ) ); + Objects.equals(recommendedVersion, other.recommendedVersion); equals &= - restrictions == other.restrictions - || ( ( restrictions != null ) && restrictions.equals( other.restrictions ) ); + Objects.equals(restrictions, other.restrictions); return equals; } diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java index 01aa80fcaf7..e011760216f 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java @@ -20,6 +20,7 @@ */ import java.util.HashSet; +import java.util.Objects; import java.util.Set; import org.apache.maven.artifact.Artifact; @@ -69,7 +70,7 @@ public void omitForNearer( Artifact omitted, Artifact kept ) String omittedVersion = omitted.getVersion(); String keptVersion = kept.getVersion(); - if ( omittedVersion != null ? !omittedVersion.equals( keptVersion ) : keptVersion != null ) + if (!Objects.equals(omittedVersion, keptVersion)) { logger.debug( indent + omitted + " (removed - nearer found: " + keptVersion + ")" ); } diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java index 76bb6048235..4c081a17d29 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java @@ -22,6 +22,7 @@ import java.io.File; import java.util.Collections; import java.util.List; +import java.util.Objects; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.metadata.ArtifactMetadata; @@ -353,7 +354,7 @@ public boolean equals( Object obj ) protected static boolean eq( T s1, T s2 ) { - return s1 != null ? s1.equals( s2 ) : s2 == null; + return Objects.equals(s1, s2); } public Authentication getAuthentication() diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java index 1d131b71a40..651acb4b7e5 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java @@ -19,6 +19,8 @@ * under the License. */ +import java.util.Objects; + /** * Filter to only retain objects in the given artifactScope or better. * @@ -72,7 +74,7 @@ public boolean equals( Object obj ) private static boolean equals( T str1, T str2 ) { - return str1 != null ? str1.equals( str2 ) : str2 == null; + return Objects.equals(str1, str2); } } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java index ccb9a65b383..ec874c6ccaf 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java @@ -39,7 +39,7 @@ class CacheUtils @Deprecated public static boolean eq( T s1, T s2 ) { - return s1 != null ? s1.equals( s2 ) : s2 == null; + return Objects.equals(s1, s2); } /** diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java index 1e87998d716..5ad2a1839d5 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java @@ -19,10 +19,7 @@ * under the License. */ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.ArtifactUtils; @@ -212,7 +209,7 @@ private static int hash( Object obj ) private static boolean eq( T s1, T s2 ) { - return s1 != null ? s1.equals( s2 ) : s2 == null; + return Objects.equals(s1, s2); } } diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index 75c334808f0..ce82c206778 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -22,15 +22,7 @@ import java.io.File; import java.io.IOException; import java.io.Writer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; +import java.util.*; import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; @@ -1061,7 +1053,7 @@ else if ( !( other instanceof MavenProject ) ) private static boolean eq( T s1, T s2 ) { - return ( s1 != null ) ? s1.equals( s2 ) : s2 == null; + return Objects.equals(s1, s2); } @Override diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java index 056c052b1be..bf6a7e4a191 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java @@ -20,13 +20,7 @@ */ import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import org.apache.maven.artifact.Artifact; @@ -201,7 +195,7 @@ private static boolean repositoriesEquals( List r1, List boolean eq( T s1, T s2 ) { - return s1 != null ? s1.equals( s2 ) : s2 == null; + return Objects.equals(s1, s2); } /** diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java index 59f5e13fbb9..e7698d872cd 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java @@ -19,10 +19,7 @@ * under the License. */ -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; +import java.util.*; import org.apache.maven.toolchain.model.ToolchainModel; import org.codehaus.plexus.logging.Logger; @@ -137,7 +134,7 @@ public boolean equals( Object obj ) DefaultToolchain other = (DefaultToolchain) obj; - if ( type == null ? other.type != null : !type.equals( other.type ) ) + if (!Objects.equals(type, other.type)) { return false; } @@ -145,7 +142,7 @@ public boolean equals( Object obj ) Properties thisProvides = this.getModel().getProvides(); Properties otherProvides = other.getModel().getProvides(); - if ( thisProvides == null ? otherProvides != null : !thisProvides.equals( otherProvides ) ) + if (!Objects.equals(thisProvides, otherProvides)) { return false; } From 86f0a0b3f99a4f3b549db1b2c2c24f620b48235f Mon Sep 17 00:00:00 2001 From: Dezhi Cai Date: Thu, 5 Sep 2019 10:19:52 +0800 Subject: [PATCH 2/2] [refactor] use utility method of Objects to simplify code --- .../maven/artifact/versioning/VersionRange.java | 8 +++++++- .../maven/plugin/DefaultPluginDescriptorCache.java | 6 +++++- .../java/org/apache/maven/project/MavenProject.java | 11 ++++++++++- .../project/artifact/DefaultMavenMetadataCache.java | 9 ++++++++- .../org/apache/maven/toolchain/DefaultToolchain.java | 6 +++++- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java index d0835e6090b..af37d181f21 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java @@ -19,7 +19,13 @@ * under the License. */ -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; +import java.util.Objects; import org.apache.maven.artifact.Artifact; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java index 5ad2a1839d5..ba62888c95e 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java @@ -19,7 +19,11 @@ * under the License. */ -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.ArtifactUtils; diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index ce82c206778..17bf836f9a4 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -22,7 +22,16 @@ import java.io.File; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.Objects; import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java index bf6a7e4a191..0b9c577558c 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java @@ -20,7 +20,14 @@ */ import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import org.apache.maven.artifact.Artifact; diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java index e7698d872cd..a32f87e94f7 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java @@ -19,7 +19,11 @@ * under the License. */ -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Objects; import org.apache.maven.toolchain.model.ToolchainModel; import org.codehaus.plexus.logging.Logger;