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:25 UTC
[maven-resolver] 06/08: [MRESOLVER-88] Misc code style fixes
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 fcd37de5062f6115b0691f53b9c0351119568c07
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Apr 24 21:11:17 2019 +0200
[MRESOLVER-88] Misc code style fixes
---
.../java/org/eclipse/aether/graph/Dependency.java | 2 +-
.../eclipse/aether/DefaultRepositoryCacheTest.java | 2 +-
.../org/eclipse/aether/DefaultSessionDataTest.java | 2 +-
.../connector/basic/ChecksumValidatorTest.java | 6 ----
.../internal/impl/DefaultMetadataResolver.java | 3 +-
.../impl/DefaultRemoteRepositoryManager.java | 3 +-
.../impl/DefaultRepositoryLayoutProvider.java | 3 +-
.../aether/internal/impl/PrioritizedComponent.java | 2 +-
.../aether/impl/StubArtifactDescriptorReader.java | 3 +-
.../aether/impl/StubVersionRangeResolver.java | 4 +--
.../eclipse/aether/impl/StubVersionResolver.java | 3 +-
.../internal/impl/DefaultArtifactResolverTest.java | 18 ++++--------
.../impl/DefaultChecksumPolicyProviderTest.java | 2 --
.../internal/impl/DefaultFileProcessorTest.java | 1 -
.../aether/internal/impl/DefaultInstallerTest.java | 1 -
.../impl/DefaultRemoteRepositoryManagerTest.java | 2 --
.../impl/DefaultRepositoryEventDispatcherTest.java | 2 --
.../impl/DefaultUpdateCheckManagerTest.java | 34 ----------------------
.../impl/DefaultUpdatePolicyAnalyzerTest.java | 5 ----
.../internal/impl/DependencyGraphDumper.java | 2 +-
.../impl/SimpleLocalRepositoryManagerTest.java | 2 --
.../aether/internal/impl/StubVersionResolver.java | 1 -
.../collect/DefaultDependencyCollectorTest.java | 13 ++++-----
.../aether/spi/connector/ArtifactDownload.java | 9 ------
.../org/eclipse/aether/spi/io/FileProcessor.java | 2 +-
.../internal/test/util/DependencyGraphParser.java | 3 +-
.../internal/test/util/IniArtifactDataReader.java | 4 +--
.../test/util/TestLocalRepositoryManager.java | 6 ++--
.../internal/test/util/TestVersionScheme.java | 1 -
.../test/util/IniArtifactDataReaderTest.java | 1 -
.../test/util/IniArtifactDescriptorReaderTest.java | 1 -
.../classpath/ClasspathTransporterTest.java | 1 -
.../aether/transport/file/FileTransporterTest.java | 1 -
.../aether/transport/http/HttpTransporter.java | 2 +-
.../http/X509HostnameVerifierAdapter.java | 2 --
.../eclipse/aether/transport/http/HttpServer.java | 6 ++--
.../aether/transport/http/HttpTransporterTest.java | 2 +-
.../util/artifact/SimpleArtifactTypeRegistry.java | 4 +--
.../graph/manager/ClassicDependencyManager.java | 2 +-
.../util/graph/transformer/ConflictResolver.java | 2 +-
.../graph/visitor/CloningDependencyVisitor.java | 3 +-
.../util/listener/ChainedRepositoryListener.java | 1 +
.../util/listener/ChainedTransferListener.java | 1 +
.../aether/util/version/UnionVersionRange.java | 3 +-
.../util/repository/JreProxySelectorTest.java | 5 ----
.../util/version/GenericVersionSchemeTest.java | 1 -
46 files changed, 37 insertions(+), 142 deletions(-)
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Dependency.java b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Dependency.java
index cd43e6e..e7f430c 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Dependency.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Dependency.java
@@ -222,7 +222,7 @@ public final class Dependency
@Override
public String toString()
{
- return String.valueOf( getArtifact() ) + " (" + getScope() + ( isOptional() ? "?" : "" ) + ")";
+ return getArtifact() + " (" + getScope() + ( isOptional() ? "?" : "" ) + ")";
}
@Override
diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
index 19648dc..0586d8b 100644
--- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
+++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
@@ -73,7 +73,7 @@ public class DefaultRepositoryCacheTest
throws Exception
{
final AtomicReference<Throwable> error = new AtomicReference<>();
- Thread threads[] = new Thread[20];
+ Thread[] threads = new Thread[20];
for ( int i = 0; i < threads.length; i++ )
{
threads[i] = new Thread()
diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
index a88c254..191b73b 100644
--- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
+++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
@@ -99,7 +99,7 @@ public class DefaultSessionDataTest
throws Exception
{
final AtomicReference<Throwable> error = new AtomicReference<>();
- Thread threads[] = new Thread[20];
+ Thread[] threads = new Thread[20];
for ( int i = 0; i < threads.length; i++ )
{
threads[i] = new Thread()
diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
index f531509..0e860ce 100644
--- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
+++ b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
@@ -81,7 +81,6 @@ public class ChecksumValidatorTest
}
public void onChecksumError( String algorithm, int kind, ChecksumFailureException exception )
- throws ChecksumFailureException
{
callbacks.add( String.format( "error(%s, %04x, %s)", algorithm, kind, exception.getCause().getMessage() ) );
}
@@ -250,7 +249,6 @@ public class ChecksumValidatorTest
@Test
public void testValidate_FailOnFirstMismatch()
- throws Exception
{
ChecksumValidator validator = newValidator( SHA1 );
fetcher.mock( SHA1, "foo" );
@@ -284,7 +282,6 @@ public class ChecksumValidatorTest
@Test
public void testValidate_FailOnEnd()
- throws Exception
{
policy.inspectAll = true;
ChecksumValidator validator = newValidator( SHA1, MD5 );
@@ -367,7 +364,6 @@ public class ChecksumValidatorTest
@Test
public void testHandle_Accept()
- throws Exception
{
policy.tolerateFailure = true;
ChecksumValidator validator = newValidator( SHA1 );
@@ -377,7 +373,6 @@ public class ChecksumValidatorTest
@Test
public void testHandle_Reject()
- throws Exception
{
policy.tolerateFailure = false;
ChecksumValidator validator = newValidator( SHA1 );
@@ -387,7 +382,6 @@ public class ChecksumValidatorTest
@Test
public void testRetry_ResetPolicy()
- throws Exception
{
ChecksumValidator validator = newValidator( SHA1 );
validator.retry();
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
index 44df569..4244795 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
@@ -387,8 +387,7 @@ public class DefaultMetadataResolver
{
LocalRepositoryManager lrm = session.getLocalRepositoryManager();
LocalMetadataResult localResult = lrm.find( session, new LocalMetadataRequest( metadata, null, null ) );
- File localFile = localResult.getFile();
- return localFile;
+ return localResult.getFile();
}
private List<RemoteRepository> getEnabledSourceRepositories( RemoteRepository repository, Metadata.Nature nature )
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 127a022..dbabd71 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
@@ -274,8 +274,7 @@ public class DefaultRemoteRepositoryManager
{
RepositoryPolicy policy1 = releases ? repository.getPolicy( false ) : null;
RepositoryPolicy policy2 = snapshots ? repository.getPolicy( true ) : null;
- RepositoryPolicy policy = merge( session, policy1, policy2, true );
- return policy;
+ return merge( session, policy1, policy2, true );
}
private RepositoryPolicy merge( RepositorySystemSession session, RepositoryPolicy policy1,
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
index b858dd0..dfd3801 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
@@ -101,8 +101,7 @@ public final class DefaultRepositoryLayoutProvider
{
try
{
- RepositoryLayout layout = factory.getComponent().newInstance( session, repository );
- return layout;
+ return factory.getComponent().newInstance( session, repository );
}
catch ( NoRepositoryLayoutException e )
{
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponent.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponent.java
index 8bb7a1c..5bbf9fe 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponent.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponent.java
@@ -76,7 +76,7 @@ final class PrioritizedComponent<T>
@Override
public String toString()
{
- return priority + " (#" + index + "): " + String.valueOf( component );
+ return priority + " (#" + index + "): " + component;
}
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java
index a5e650f..dabc1dc 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java
@@ -33,8 +33,7 @@ public class StubArtifactDescriptorReader
ArtifactDescriptorRequest request )
throws ArtifactDescriptorException
{
- ArtifactDescriptorResult result = new ArtifactDescriptorResult( request );
- return result;
+ return new ArtifactDescriptorResult( request );
}
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java
index 81e000e..1a37878 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java
@@ -30,10 +30,8 @@ public class StubVersionRangeResolver
{
public VersionRangeResult resolveVersionRange( RepositorySystemSession session, VersionRangeRequest request )
- throws VersionRangeResolutionException
{
- VersionRangeResult result = new VersionRangeResult( request );
- return result;
+ return new VersionRangeResult( request );
}
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java
index f59fa11..5abf5a6 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java
@@ -32,8 +32,7 @@ public class StubVersionResolver
public VersionResult resolveVersion( RepositorySystemSession session, VersionRequest request )
throws VersionResolutionException
{
- VersionResult result = new VersionResult( request );
- return result;
+ return new VersionResult( request );
}
}
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 b15afec..2df18ce 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
@@ -90,7 +90,6 @@ public class DefaultArtifactResolverTest
@Before
public void setup()
- throws IOException
{
UpdateCheckManager updateCheckManager = new StaticUpdateCheckManager( true );
repositoryConnectorProvider = new StubRepositoryConnectorProvider();
@@ -146,7 +145,7 @@ public class DefaultArtifactResolverTest
@Test
public void testResolveLocalArtifactUnsuccessful()
- throws IOException, ArtifactResolutionException
+ throws IOException
{
File tmpFile = TestFileUtils.createTempFile( "tmp" );
Map<String, String> properties = new HashMap<>();
@@ -182,7 +181,7 @@ public class DefaultArtifactResolverTest
@Test
public void testResolveRemoteArtifact()
- throws IOException, ArtifactResolutionException
+ throws ArtifactResolutionException
{
connector.setExpectGet( artifact );
@@ -204,7 +203,6 @@ public class DefaultArtifactResolverTest
@Test
public void testResolveRemoteArtifactUnsuccessful()
- throws IOException, ArtifactResolutionException
{
RecordingRepositoryConnector connector = new RecordingRepositoryConnector()
{
@@ -373,7 +371,7 @@ public class DefaultArtifactResolverTest
@Test
public void testResolveFromWorkspaceFallbackToRepository()
- throws IOException, ArtifactResolutionException
+ throws ArtifactResolutionException
{
WorkspaceReader workspace = new WorkspaceReader()
{
@@ -444,7 +442,6 @@ public class DefaultArtifactResolverTest
@Test
public void testRepositoryEventsUnsuccessfulLocal()
- throws IOException
{
RecordingRepositoryListener listener = new RecordingRepositoryListener();
session.setRepositoryListener( listener );
@@ -515,7 +512,6 @@ public class DefaultArtifactResolverTest
@Test
public void testRepositoryEventsUnsuccessfulRemote()
- throws IOException, ArtifactResolutionException
{
RecordingRepositoryConnector connector = new RecordingRepositoryConnector()
{
@@ -790,8 +786,7 @@ public class DefaultArtifactResolverTest
public LocalMetadataResult find( RepositorySystemSession session, LocalMetadataRequest request )
{
- LocalMetadataResult result = new LocalMetadataResult( request );
- return result;
+ return new LocalMetadataResult( request );
}
public void add( RepositorySystemSession session, LocalMetadataRegistration request )
@@ -805,7 +800,6 @@ public class DefaultArtifactResolverTest
{
public VersionResult resolveVersion( RepositorySystemSession session, VersionRequest request )
- throws VersionResolutionException
{
return new VersionResult( request ).setRepository( new LocalRepository( "id" ) ).setVersion( request.getArtifact().getVersion() );
}
@@ -875,8 +869,7 @@ public class DefaultArtifactResolverTest
public LocalMetadataResult find( RepositorySystemSession session, LocalMetadataRequest request )
{
- LocalMetadataResult result = new LocalMetadataResult( request );
- return result;
+ return new LocalMetadataResult( request );
}
public void add( RepositorySystemSession session, LocalMetadataRegistration request )
@@ -890,7 +883,6 @@ public class DefaultArtifactResolverTest
{
public VersionResult resolveVersion( RepositorySystemSession session, VersionRequest request )
- throws VersionResolutionException
{
return new VersionResult( request ).setVersion( request.getArtifact().getVersion() );
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java
index 542e3ea..4f508ec 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java
@@ -46,7 +46,6 @@ public class DefaultChecksumPolicyProviderTest
@Before
public void setup()
- throws Exception
{
session = TestUtils.newSession();
provider = new DefaultChecksumPolicyProvider();
@@ -56,7 +55,6 @@ public class DefaultChecksumPolicyProviderTest
@After
public void teardown()
- throws Exception
{
provider = null;
session = null;
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
index 7b48230..6793977 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
@@ -113,7 +113,6 @@ public class DefaultFileProcessorTest
ProgressListener listener = new ProgressListener()
{
public void progressed( ByteBuffer buffer )
- throws IOException
{
progressed.addAndGet( buffer.remaining() );
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java
index 39f76e6..5ae8fb3 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java
@@ -430,7 +430,6 @@ public class DefaultInstallerTest
{
@Override
public InputStream transformData( File file )
- throws IOException, TransformException
{
return new ByteArrayInputStream( "transformed data".getBytes( StandardCharsets.UTF_8 ) );
}
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
index f00c480..b654f9b 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
@@ -51,7 +51,6 @@ public class DefaultRemoteRepositoryManagerTest
@Before
public void setup()
- throws Exception
{
session = TestUtils.newSession();
session.setChecksumPolicy( null );
@@ -63,7 +62,6 @@ public class DefaultRemoteRepositoryManagerTest
@After
public void teardown()
- throws Exception
{
manager = null;
session = null;
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java
index 25e8a87..14b1658 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java
@@ -40,7 +40,6 @@ public class DefaultRepositoryEventDispatcherTest
@Test
public void testDispatchHandlesAllEventTypes()
- throws Exception
{
DefaultRepositoryEventDispatcher dispatcher = new DefaultRepositoryEventDispatcher();
@@ -75,7 +74,6 @@ public class DefaultRepositoryEventDispatcherTest
public String methodName;
public Object invoke( Object proxy, Method method, Object[] args )
- throws Throwable
{
if ( args.length == 1 && args[0] instanceof RepositoryEvent )
{
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
index 906dc91..8ca42c0 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
@@ -126,7 +126,6 @@ public class DefaultUpdateCheckManagerTest
@Test( expected = Exception.class )
public void testCheckMetadataFailOnNoFile()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
check.setItem( metadata.setFile( null ) );
@@ -137,7 +136,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataUpdatePolicyRequired()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
@@ -163,7 +161,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataUpdatePolicyNotRequired()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
@@ -188,7 +185,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadata()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_DAILY );
@@ -216,7 +212,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataNoLocalFile()
- throws Exception
{
metadata.getFile().delete();
@@ -233,7 +228,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataNotFoundInRepoCachingEnabled()
- throws Exception
{
metadata.getFile().delete();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( true, false ) );
@@ -254,7 +248,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataNotFoundInRepoCachingDisabled()
- throws Exception
{
metadata.getFile().delete();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( false, false ) );
@@ -274,7 +267,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataErrorFromRepoCachingEnabled()
- throws Exception
{
metadata.getFile().delete();
@@ -297,7 +289,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataErrorFromRepoCachingDisabled()
- throws Exception
{
metadata.getFile().delete();
@@ -318,7 +309,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataAtMostOnceDuringSessionEvenIfUpdatePolicyAlways()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
@@ -336,7 +326,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataSessionStateModes()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
@@ -360,7 +349,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_InvalidFile()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
@@ -388,7 +376,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_DifferentRepoIdSameUrl()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
@@ -408,7 +395,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataWhenLocallyMissingEvenIfUpdatePolicyIsNever()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_NEVER );
@@ -423,7 +409,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataWhenLocallyPresentButInvalidEvenIfUpdatePolicyIsNever()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_NEVER );
@@ -440,7 +425,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataWhenLocallyDeletedEvenIfTimestampUpToDate()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( true, false ) );
@@ -457,7 +441,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckMetadataNotWhenUpdatePolicyIsNeverAndTimestampIsUnavailable()
- throws Exception
{
UpdateCheck<Metadata, MetadataTransferException> check = newMetadataCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_NEVER );
@@ -469,7 +452,6 @@ public class DefaultUpdateCheckManagerTest
@Test( expected = NullPointerException.class )
public void testCheckArtifactFailOnNoFile()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setItem( artifact.setFile( null ) );
@@ -481,7 +463,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactUpdatePolicyRequired()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setItem( artifact );
@@ -511,7 +492,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactUpdatePolicyNotRequired()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setItem( artifact );
@@ -540,7 +520,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifact()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
long fifteenMinutes = new Date().getTime() - ( 15L * 60L * 1000L );
@@ -570,7 +549,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactNoLocalFile()
- throws Exception
{
artifact.getFile().delete();
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
@@ -585,7 +563,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactNotFoundInRepoCachingEnabled()
- throws Exception
{
artifact.getFile().delete();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( true, false ) );
@@ -605,7 +582,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactNotFoundInRepoCachingDisabled()
- throws Exception
{
artifact.getFile().delete();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( false, false ) );
@@ -624,7 +600,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactErrorFromRepoCachingEnabled()
- throws Exception
{
artifact.getFile().delete();
@@ -645,7 +620,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactErrorFromRepoCachingDisabled()
- throws Exception
{
artifact.getFile().delete();
@@ -665,7 +639,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactAtMostOnceDuringSessionEvenIfUpdatePolicyAlways()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
@@ -683,7 +656,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactSessionStateModes()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
@@ -707,7 +679,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_InvalidFile()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
@@ -735,7 +706,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_DifferentRepoIdSameUrl()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
@@ -754,7 +724,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactWhenLocallyMissingEvenIfUpdatePolicyIsNever()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_NEVER );
@@ -769,7 +738,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactWhenLocallyPresentButInvalidEvenIfUpdatePolicyIsNever()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_NEVER );
@@ -786,7 +754,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactWhenLocallyDeletedEvenIfTimestampUpToDate()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( true, false ) );
@@ -803,7 +770,6 @@ public class DefaultUpdateCheckManagerTest
@Test
public void testCheckArtifactNotWhenUpdatePolicyIsNeverAndTimestampIsUnavailable()
- throws Exception
{
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
check.setPolicy( RepositoryPolicy.UPDATE_POLICY_NEVER );
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 31bcbaa..7484f4c 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
@@ -41,7 +41,6 @@ public class DefaultUpdatePolicyAnalyzerTest
@Before
public void setup()
- throws Exception
{
analyzer = new DefaultUpdatePolicyAnalyzer();
session = TestUtils.newSession();
@@ -54,7 +53,6 @@ public class DefaultUpdatePolicyAnalyzerTest
@Test
public void testIsUpdateRequired_PolicyNever()
- throws Exception
{
String policy = RepositoryPolicy.UPDATE_POLICY_NEVER;
assertEquals( false, analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
@@ -66,7 +64,6 @@ public class DefaultUpdatePolicyAnalyzerTest
@Test
public void testIsUpdateRequired_PolicyAlways()
- throws Exception
{
String policy = RepositoryPolicy.UPDATE_POLICY_ALWAYS;
assertEquals( true, analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
@@ -78,7 +75,6 @@ public class DefaultUpdatePolicyAnalyzerTest
@Test
public void testIsUpdateRequired_PolicyDaily()
- throws Exception
{
Calendar cal = Calendar.getInstance();
cal.set( Calendar.HOUR_OF_DAY, 0 );
@@ -97,7 +93,6 @@ public class DefaultUpdatePolicyAnalyzerTest
@Test
public void testIsUpdateRequired_PolicyInterval()
- throws Exception
{
String policy = RepositoryPolicy.UPDATE_POLICY_INTERVAL + ":5";
assertEquals( true, analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) );
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java
index 68d4ef4..8c8b1a6 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java
@@ -123,7 +123,7 @@ public class DependencyGraphDumper
}
}
- static enum Indent
+ enum Indent
{
NO_CHILDREN( " " ),
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java
index a301bd4..9a98526 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java
@@ -68,7 +68,6 @@ public class SimpleLocalRepositoryManagerTest
@Test
public void testGetPathForLocalArtifact()
- throws Exception
{
Artifact artifact = new DefaultArtifact( "g.i.d:a.i.d:1.0-SNAPSHOT" );
assertEquals( "1.0-SNAPSHOT", artifact.getBaseVersion() );
@@ -84,7 +83,6 @@ public class SimpleLocalRepositoryManagerTest
@Test
public void testGetPathForRemoteArtifact()
- throws Exception
{
RemoteRepository remoteRepo = new RemoteRepository.Builder( "repo", "default", "ram:/void" ).build();
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java
index 719e5bc..74d2373 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java
@@ -32,7 +32,6 @@ class StubVersionResolver
{
public VersionResult resolveVersion( RepositorySystemSession session, VersionRequest request )
- throws VersionResolutionException
{
VersionResult result = new VersionResult( request ).setVersion( request.getArtifact().getVersion() );
if ( request.getRepositories().size() > 0 )
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
index e8a4cb2..0c10469 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
@@ -99,7 +99,6 @@ public class DefaultDependencyCollectorTest
@Before
public void setup()
- throws IOException
{
session = TestUtils.newSession();
@@ -176,7 +175,7 @@ public class DefaultDependencyCollectorTest
@Test
public void testSimpleCollection()
- throws IOException, DependencyCollectionException
+ throws DependencyCollectionException
{
Dependency dependency = newDep( "gid:aid:ext:ver", "compile" );
CollectRequest request = new CollectRequest( dependency, Arrays.asList( repository ) );
@@ -198,7 +197,6 @@ public class DefaultDependencyCollectorTest
@Test
public void testMissingDependencyDescription()
- throws IOException
{
CollectRequest request =
new CollectRequest( newDep( "missing:description:ext:ver" ), Arrays.asList( repository ) );
@@ -222,7 +220,7 @@ public class DefaultDependencyCollectorTest
@Test
public void testDuplicates()
- throws IOException, DependencyCollectionException
+ throws DependencyCollectionException
{
Dependency dependency = newDep( "duplicate:transitive:ext:dependency" );
CollectRequest request = new CollectRequest( dependency, Arrays.asList( repository ) );
@@ -358,7 +356,7 @@ public class DefaultDependencyCollectorTest
@Test
public void testCollectMultipleDependencies()
- throws IOException, DependencyCollectionException
+ throws DependencyCollectionException
{
Dependency root1 = newDep( "gid:aid:ext:ver", "compile" );
Dependency root2 = newDep( "gid:aid2:ext:ver", "compile" );
@@ -389,7 +387,6 @@ public class DefaultDependencyCollectorTest
{
public ArtifactDescriptorResult readArtifactDescriptor( RepositorySystemSession session,
ArtifactDescriptorRequest request )
- throws ArtifactDescriptorException
{
repos.addAll( request.getRepositories() );
return new ArtifactDescriptorResult( request );
@@ -408,7 +405,7 @@ public class DefaultDependencyCollectorTest
@Test
public void testManagedVersionScope()
- throws IOException, DependencyCollectionException
+ throws DependencyCollectionException
{
Dependency dependency = newDep( "managed:aid:ext:ver" );
CollectRequest request = new CollectRequest( dependency, Arrays.asList( repository ) );
@@ -502,7 +499,7 @@ public class DefaultDependencyCollectorTest
*/
@Test
public void testSelectionBeforeManagement()
- throws IOException, DependencyCollectionException
+ throws DependencyCollectionException
{
session.setDependencySelector( new ScopeDependencySelector( "provided", "test" ) );
session.setDependencyManager( new ClassicDependencyManager() );
diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java
index 3d82ac1..5c1fe7f 100644
--- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java
+++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java
@@ -80,15 +80,6 @@ public final class ArtifactDownload
return this;
}
- /**
- * {@inheritDoc} <em>Note:</em> In case of {@link #isExistenceCheck()}, this method may return {@code null}.
- */
- @Override
- public File getFile()
- {
- return super.getFile();
- }
-
@Override
public ArtifactDownload setFile( File file )
{
diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java
index 1de21a0..9e0f098 100644
--- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java
+++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java
@@ -104,7 +104,7 @@ public interface FileProcessor
*
* @see FileProcessor#copy(File, File, ProgressListener)
*/
- public interface ProgressListener
+ interface ProgressListener
{
void progressed( ByteBuffer buffer )
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java
index c86e3aa..8af15a3 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java
@@ -191,8 +191,7 @@ public class DependencyGraphParser
try
{
reader = new BufferedReader( new InputStreamReader( resource.openStream(), StandardCharsets.UTF_8 ) );
- final DependencyNode node = parse( reader );
- return node;
+ return parse( reader );
}
finally
{
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java
index b13c3cd..08a693b 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java
@@ -175,9 +175,7 @@ class IniArtifactDataReader
List<Dependency> managedDependencies = dependencies( sections.get( State.MANAGEDDEPENDENCIES ), true );
List<RemoteRepository> repositories = repositories( sections.get( State.REPOSITORIES ) );
- ArtifactDescription description =
- new ArtifactDescription( relocation, dependencies, managedDependencies, repositories );
- return description;
+ return new ArtifactDescription( relocation, dependencies, managedDependencies, repositories );
}
private List<RemoteRepository> repositories( List<String> list )
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
index 05225b5..19828e9 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
@@ -77,10 +77,8 @@ public class TestLocalRepositoryManager
String version = artifact.getVersion();
String classifier = artifact.getClassifier();
- String path =
- String.format( "%s/%s/%s/%s-%s-%s%s.%s", groupId, artifactId, version, groupId, artifactId, version,
- classifier, extension );
- return path;
+ return String.format( "%s/%s/%s/%s-%s-%s%s.%s", groupId, artifactId, version, groupId, artifactId, version,
+ classifier, extension );
}
public String getPathForRemoteArtifact( Artifact artifact, RemoteRepository repository, String context )
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java
index c337fdc..e6aa2ed 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java
@@ -36,7 +36,6 @@ final class TestVersionScheme
{
public Version parseVersion( final String version )
- throws InvalidVersionSpecificationException
{
return new TestVersion( version );
}
diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
index 4864b32..7afd8bc 100644
--- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
+++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
@@ -44,7 +44,6 @@ public class IniArtifactDataReaderTest
@Before
public void setup()
- throws Exception
{
this.parser = new IniArtifactDataReader( "org/eclipse/aether/internal/test/util/" );
}
diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java
index 8b6bfa4..a75ad59 100644
--- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java
+++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java
@@ -49,7 +49,6 @@ public class IniArtifactDescriptorReaderTest
@Before
public void setup()
- throws IOException
{
reader = new IniArtifactDescriptorReader( "org/eclipse/aether/internal/test/util/" );
session = TestUtils.newSession();
diff --git a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java b/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
index 6d7fa32..d61dec9 100644
--- a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
+++ b/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
@@ -91,7 +91,6 @@ public class ClasspathTransporterTest
@Test
public void testClassify()
- throws Exception
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( new FileNotFoundException() ) );
assertEquals( Transporter.ERROR_NOT_FOUND, transporter.classify( new ResourceNotFoundException( "test" ) ) );
diff --git a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java b/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
index f636644..e075dfd 100644
--- a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
+++ b/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
@@ -97,7 +97,6 @@ public class FileTransporterTest
@Test
public void testClassify()
- throws Exception
{
assertEquals( Transporter.ERROR_OTHER, transporter.classify( new FileNotFoundException() ) );
assertEquals( Transporter.ERROR_NOT_FOUND, transporter.classify( new ResourceNotFoundException( "test" ) ) );
diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
index 53b3dd0..9d7a725 100644
--- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
+++ b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
@@ -458,7 +458,7 @@ final class HttpTransporter
long resumeOffset = task.getResumeOffset();
if ( resumeOffset > 0L && task.getDataFile() != null )
{
- request.setHeader( HttpHeaders.RANGE, "bytes=" + Long.toString( resumeOffset ) + '-' );
+ request.setHeader( HttpHeaders.RANGE, "bytes=" + resumeOffset + '-' );
request.setHeader( HttpHeaders.IF_UNMODIFIED_SINCE,
DateUtils.formatDate( new Date( task.getDataFile().lastModified() - 60L * 1000L ) ) );
request.setHeader( HttpHeaders.ACCEPT_ENCODING, "identity" );
diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/X509HostnameVerifierAdapter.java b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/X509HostnameVerifierAdapter.java
index 007f660..ac0825b 100644
--- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/X509HostnameVerifierAdapter.java
+++ b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/X509HostnameVerifierAdapter.java
@@ -67,13 +67,11 @@ final class X509HostnameVerifierAdapter
}
public void verify( String host, X509Certificate cert )
- throws SSLException
{
throw new UnsupportedOperationException();
}
public void verify( String host, String[] cns, String[] subjectAlts )
- throws SSLException
{
throw new UnsupportedOperationException();
}
diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
index df74d7c..a269663 100644
--- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
+++ b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
@@ -350,11 +350,9 @@ public class HttpServer
if ( checksumHeader != null )
{
Map<String, Object> checksums = ChecksumUtils.calc( file, Collections.singleton( "SHA-1" ) );
- switch ( checksumHeader )
+ if ( checksumHeader == ChecksumHeader.NEXUS )
{
- case NEXUS:
- response.setHeader( HttpHeader.ETAG.asString(), "{SHA1{" + checksums.get( "SHA-1" ) + "}}" );
- break;
+ response.setHeader( HttpHeader.ETAG.asString(), "{SHA1{" + checksums.get( "SHA-1" ) + "}}" );
}
}
if ( HttpMethod.HEAD.is( req.getMethod() ) )
diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
index eb7e1e1..6bec999 100644
--- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
+++ b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
@@ -929,7 +929,7 @@ public class HttpTransporterTest
auth = new AuthenticationBuilder().addUsername( "testuser" ).addPassword( "testpass" ).build();
newTransporter( httpServer.getHttpUrl() );
final AtomicReference<Throwable> error = new AtomicReference<>();
- Thread threads[] = new Thread[20];
+ Thread[] threads = new Thread[20];
for ( int i = 0; i < threads.length; i++ )
{
final String path = "repo/file.txt?i=" + i;
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java
index 6fa4238..269e42b 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java
@@ -57,9 +57,7 @@ class SimpleArtifactTypeRegistry
public ArtifactType get( String typeId )
{
- ArtifactType type = types.get( typeId );
-
- return type;
+ return types.get( typeId );
}
@Override
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
index b0b1720..25db443 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
@@ -199,7 +199,7 @@ public final class ClassicDependencyManager
}
}
- if ( ( scope != null && JavaScopes.SYSTEM.equals( scope ) )
+ if ( ( JavaScopes.SYSTEM.equals( scope ) )
|| ( scope == null && JavaScopes.SYSTEM.equals( dependency.getScope() ) ) )
{
String localPath = managedLocalPaths.get( key );
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
index 16a004d..cd6cdf2 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
@@ -721,7 +721,7 @@ public final class ConflictResolver
private boolean deriveOptional( DependencyNode node, Object conflictId )
{
Dependency dep = node.getDependency();
- boolean optional = ( dep != null ) ? dep.isOptional() : false;
+ boolean optional = ( dep != null ) && dep.isOptional();
if ( optional || ( node.getManagedBits() & DependencyNode.MANAGED_OPTIONAL ) != 0
|| ( conflictId != null && resolvedIds.containsKey( conflictId ) ) )
{
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java
index 9dc72cf..7c57db1 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java
@@ -69,8 +69,7 @@ public class CloningDependencyVisitor
*/
protected DependencyNode clone( DependencyNode node )
{
- DefaultDependencyNode clone = new DefaultDependencyNode( node );
- return clone;
+ return new DefaultDependencyNode( node );
}
public final boolean visitEnter( DependencyNode node )
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java
index 8880730..c268a9d 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java
@@ -125,6 +125,7 @@ public final class ChainedRepositoryListener
}
}
+ @SuppressWarnings( "EmptyMethod" )
protected void handleError( RepositoryEvent event, RepositoryListener listener, RuntimeException error )
{
// default just swallows errors
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java
index 9abd49d..42e23b5 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java
@@ -126,6 +126,7 @@ public final class ChainedTransferListener
}
}
+ @SuppressWarnings( "EmptyMethod" )
protected void handleError( TransferEvent event, TransferListener listener, RuntimeException error )
{
// default just swallows errors
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java
index 5bb6189..42757cb 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java
@@ -159,8 +159,7 @@ final class UnionVersionRange
@Override
public int hashCode()
{
- int hash = 97 * ranges.hashCode();
- return hash;
+ return 97 * ranges.hashCode();
}
@Override
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java
index 8eac55b..5e8d274 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java
@@ -73,7 +73,6 @@ public class JreProxySelectorTest
@Test
public void testGetProxy_InvalidUrl()
- throws Exception
{
RemoteRepository repo = new RemoteRepository.Builder( "test", "default", "http://host:invalid" ).build();
assertNull( selector.getProxy( repo ) );
@@ -81,7 +80,6 @@ public class JreProxySelectorTest
@Test
public void testGetProxy_OpaqueUrl()
- throws Exception
{
RemoteRepository repo = new RemoteRepository.Builder( "test", "default", "classpath:base" ).build();
assertNull( selector.getProxy( repo ) );
@@ -89,7 +87,6 @@ public class JreProxySelectorTest
@Test
public void testGetProxy_NullSelector()
- throws Exception
{
RemoteRepository repo = new RemoteRepository.Builder( "test", "default", "http://repo.eclipse.org/" ).build();
java.net.ProxySelector.setDefault( null );
@@ -98,7 +95,6 @@ public class JreProxySelectorTest
@Test
public void testGetProxy_NoProxies()
- throws Exception
{
RemoteRepository repo = new RemoteRepository.Builder( "test", "default", "http://repo.eclipse.org/" ).build();
java.net.ProxySelector.setDefault( new AbstractProxySelector()
@@ -115,7 +111,6 @@ public class JreProxySelectorTest
@Test
public void testGetProxy_DirectProxy()
- throws Exception
{
RemoteRepository repo = new RemoteRepository.Builder( "test", "default", "http://repo.eclipse.org/" ).build();
final InetSocketAddress addr = InetSocketAddress.createUnresolved( "proxy", 8080 );
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java
index f52f73d..e5465be 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java
@@ -37,7 +37,6 @@ public class GenericVersionSchemeTest
@Before
public void setUp()
- throws Exception
{
scheme = new GenericVersionScheme();
}