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 2019/04/25 03:49:27 UTC
[maven-resolver] 08/08: [MRESOLVER-88] Misc fixes 3
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MRESOLVER-88
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit c26226ea5a03c8d3ed5ca839463a9476a859e007
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Apr 24 22:16:56 2019 +0200
[MRESOLVER-88] Misc fixes 3
---
.../aether/internal/impl/DefaultRemoteRepositoryManager.java | 2 ++
.../aether/internal/impl/collect/DefaultVersionFilterContext.java | 1 +
.../eclipse/aether/internal/impl/DefaultArtifactResolverTest.java | 2 +-
.../aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java | 2 +-
.../java/org/eclipse/aether/transport/wagon/WagonTransporter.java | 6 +++---
.../eclipse/aether/util/filter/AbstractPatternDependencyFilter.java | 2 +-
.../eclipse/aether/util/filter/ExclusionDependencyFilterTest.java | 2 +-
.../aether/util/graph/versions/ChainedVersionFilterTest.java | 1 +
.../util/graph/versions/ContextualSnapshotVersionFilterTest.java | 1 +
.../aether/util/graph/versions/HighestVersionFilterTest.java | 1 +
.../aether/util/graph/versions/SnapshotVersionFilterTest.java | 1 +
11 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
index dbabd71..489b66e 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
@@ -329,6 +329,7 @@ public class DefaultRemoteRepositoryManager
else
{
String checksums = session.getChecksumPolicy();
+ //noinspection StatementWithEmptyBody
if ( globalPolicy && !StringUtils.isEmpty( checksums ) )
{
// use global override
@@ -341,6 +342,7 @@ public class DefaultRemoteRepositoryManager
}
String updates = session.getUpdatePolicy();
+ //noinspection StatementWithEmptyBody
if ( globalPolicy && !StringUtils.isEmpty( updates ) )
{
// use global override
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContext.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContext.java
index c3b45c3..8830730 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContext.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContext.java
@@ -164,6 +164,7 @@ final class DefaultVersionFilterContext
advance();
}
+ @SuppressWarnings( "StatementWithEmptyBody" )
private void advance()
{
for ( next = index + 1; next < size && deleted[next] != (byte) 0; next++ )
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
index ac628a1..3710a69 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
@@ -285,7 +285,7 @@ public class DefaultArtifactResolverTest
ArtifactRequest request1 = new ArtifactRequest( artifact1, Arrays.asList( remoteRepo ), "" );
ArtifactRequest request2 = new ArtifactRequest( artifact2, Arrays.asList( remoteRepo ), "" );
- connector.setExpectGet( new Artifact[] { artifact1, artifact2 } );
+ connector.setExpectGet( artifact1, artifact2 );
try
{
resolver.resolveArtifacts( session, Arrays.asList( request1, request2 ) );
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java
index 7484f4c..58c3e8c 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java
@@ -86,7 +86,7 @@ public class DefaultUpdatePolicyAnalyzerTest
String policy = RepositoryPolicy.UPDATE_POLICY_DAILY;
assertEquals( true, analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
assertEquals( false, analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) );
- assertEquals( false, analyzer.isUpdatedRequired( session, localMidnight + 0, policy ) );
+ assertEquals( false, analyzer.isUpdatedRequired( session, localMidnight, policy ) );
assertEquals( false, analyzer.isUpdatedRequired( session, localMidnight + 1, policy ) );
assertEquals( true, analyzer.isUpdatedRequired( session, localMidnight - 1, policy ) );
}
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
index 00a0eb6..92f3064 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
@@ -154,21 +154,21 @@ final class WagonTransporter
String suffix = '.' + repoId;
- String fileMode = ConfigUtils.getString( session, (String) null, CONFIG_PROP_FILE_MODE + suffix );
+ String fileMode = ConfigUtils.getString( session, null, CONFIG_PROP_FILE_MODE + suffix );
if ( fileMode != null )
{
perms.setFileMode( fileMode );
result = perms;
}
- String dirMode = ConfigUtils.getString( session, (String) null, CONFIG_PROP_DIR_MODE + suffix );
+ String dirMode = ConfigUtils.getString( session, null, CONFIG_PROP_DIR_MODE + suffix );
if ( dirMode != null )
{
perms.setDirectoryMode( dirMode );
result = perms;
}
- String group = ConfigUtils.getString( session, (String) null, CONFIG_PROP_GROUP + suffix );
+ String group = ConfigUtils.getString( session, null, CONFIG_PROP_GROUP + suffix );
if ( group != null )
{
perms.setGroup( group );
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java
index f7a3fc2..87d22ee 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java
@@ -154,7 +154,7 @@ class AbstractPatternDependencyFilter
// support leading wildcard
else if ( pattern.startsWith( "*" ) )
{
- final String suffix = pattern.substring( 1, pattern.length() );
+ final String suffix = pattern.substring( 1 );
matches = token.endsWith( suffix );
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java
index f4c45e9..1da95bb 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java
@@ -55,6 +55,6 @@ public class ExclusionDependencyFilterTest
excludes = new String[] { "otherArtifact" };
assertTrue( new ExclusionsDependencyFilter( Arrays.asList( excludes ) ).accept( builder.build(), parents ) );
- assertTrue( new ExclusionsDependencyFilter( (Collection<String>) null ).accept( builder.build(), parents ) );
+ assertTrue( new ExclusionsDependencyFilter( null ).accept( builder.build(), parents ) );
}
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
index 1e8a5bd..9f8a2aa 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
@@ -73,6 +73,7 @@ public class ChainedVersionFilterTest
assertSame( filter1, derive( filter, "g:a:1" ) );
}
+ @SuppressWarnings( "EqualsWithItself" )
@Test
public void testEquals()
{
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java
index dd88a66..08b5a58 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java
@@ -60,6 +60,7 @@ public class ContextualSnapshotVersionFilterTest
assertTrue( derive( filter, "g:a:1-SNAPSHOT" ) instanceof SnapshotVersionFilter );
}
+ @SuppressWarnings( "EqualsWithItself" )
@Test
public void testEquals()
{
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java
index 3926c66..49cbc9c 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java
@@ -45,6 +45,7 @@ public class HighestVersionFilterTest
assertSame( filter, derive( filter, "g:a:1" ) );
}
+ @SuppressWarnings( "EqualsWithItself" )
@Test
public void testEquals()
{
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java
index 70c26f9..add2037 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java
@@ -45,6 +45,7 @@ public class SnapshotVersionFilterTest
assertSame( filter, derive( filter, "g:a:1" ) );
}
+ @SuppressWarnings( "EqualsWithItself" )
@Test
public void testEquals()
{