Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[refactor] use utility method of Objects to simplify code #284

Merged
merged 2 commits into from Sep 10, 2019
Merged

[refactor] use utility method of Objects to simplify code #284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
242b4f4
[refactor] use utility method of Objects to simplify code
caidezhi Sep 4, 2019
86f0a0b
[refactor] use utility method of Objects to simplify code
caidezhi Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 3 additions & 10 deletions maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
View file
Open in desktop
Expand Up @@ -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.*;
caidezhi marked this conversation as resolved.
Show resolved Hide resolved

import org.apache.maven.artifact.Artifact;

Expand Down Expand Up @@ -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;
}

Expand Down
3 changes: 2 additions & 1 deletion maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@
*/

import java.util.HashSet;
import java.util.Objects;
import java.util.Set;

import org.apache.maven.artifact.Artifact;
Expand Down Expand Up @@ -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 + ")" );
}
Expand Down
3 changes: 2 additions & 1 deletion maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -353,7 +354,7 @@ public boolean equals( Object obj )

protected static <T> boolean eq( T s1, T s2 )
{
return s1 != null ? s1.equals( s2 ) : s2 == null;
return Objects.equals(s1, s2);
}

public Authentication getAuthentication()
Expand Down
4 changes: 3 additions & 1 deletion maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
View file
Open in desktop
Expand Up @@ -19,6 +19,8 @@
* under the License.
*/

import java.util.Objects;

/**
* Filter to only retain objects in the given artifactScope or better.
*
Expand Down Expand Up @@ -72,7 +74,7 @@ public boolean equals( Object obj )

private static <T> boolean equals( T str1, T str2 )
{
return str1 != null ? str1.equals( str2 ) : str2 == null;
return Objects.equals(str1, str2);
}

}
2 changes: 1 addition & 1 deletion maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ class CacheUtils
@Deprecated
public static <T> boolean eq( T s1, T s2 )
{
return s1 != null ? s1.equals( s2 ) : s2 == null;
return Objects.equals(s1, s2);
}

/**
Expand Down
7 changes: 2 additions & 5 deletions maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
View file
Open in desktop
Expand Up @@ -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.*;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not use star import

Copy link
Contributor Author

@caidezhi caidezhi Sep 5, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@olamy thanks for review.I have modified the code as your suggestion.


import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.ArtifactUtils;
Expand Down Expand Up @@ -212,7 +209,7 @@ private static int hash( Object obj )

private static <T> boolean eq( T s1, T s2 )
{
return s1 != null ? s1.equals( s2 ) : s2 == null;
return Objects.equals(s1, s2);
}

}
Expand Down
12 changes: 2 additions & 10 deletions maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View file
Open in desktop
Expand Up @@ -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.*;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not use star import


import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
Expand Down Expand Up @@ -1061,7 +1053,7 @@ else if ( !( other instanceof MavenProject ) )

private static <T> boolean eq( T s1, T s2 )
{
return ( s1 != null ) ? s1.equals( s2 ) : s2 == null;
return Objects.equals(s1, s2);
}

@Override
Expand Down
10 changes: 2 additions & 8 deletions maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
View file
Open in desktop
Expand Up @@ -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.*;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not use star import

import java.util.concurrent.ConcurrentHashMap;

import org.apache.maven.artifact.Artifact;
Expand Down Expand Up @@ -201,7 +195,7 @@ private static boolean repositoriesEquals( List<ArtifactRepository> r1, List<Art

private static <T> boolean eq( T s1, T s2 )
{
return s1 != null ? s1.equals( s2 ) : s2 == null;
return Objects.equals(s1, s2);
}

/**
Expand Down
9 changes: 3 additions & 6 deletions maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
View file
Open in desktop
Expand Up @@ -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.*;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not use star import


import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.logging.Logger;
Expand Down Expand Up @@ -137,15 +134,15 @@ 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;
}

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;
}
Expand Down