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:26 UTC
[maven-resolver] 07/08: [MRESOLVER-88] Misc fixes 2
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 c63b99dd32aa08140f143cf2d7e209f526647937
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Apr 24 21:36:55 2019 +0200
[MRESOLVER-88] Misc fixes 2
---
.../java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java | 1 -
.../eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java | 3 ---
.../java/org/eclipse/aether/internal/impl/TrackingFileManager.java | 2 +-
.../aether/internal/impl/collect/DefaultDependencyCollector.java | 4 ----
.../java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java | 1 -
.../test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java | 2 --
.../src/test/java/org/eclipse/aether/impl/StubVersionResolver.java | 1 -
.../eclipse/aether/internal/impl/DefaultArtifactResolverTest.java | 6 +++---
.../java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java | 1 -
.../eclipse/aether/internal/impl/RecordingRepositoryConnector.java | 3 +--
.../java/org/eclipse/aether/internal/impl/StubVersionResolver.java | 1 -
.../aether/internal/test/util/IniArtifactDescriptorReaderTest.java | 2 --
.../src/test/java/org/eclipse/aether/transport/http/HttpServer.java | 4 ----
.../src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java | 1 -
.../eclipse/aether/util/graph/transformer/SimpleConflictMarker.java | 1 -
.../org/eclipse/aether/util/version/GenericVersionRangeTest.java | 5 +----
16 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
index 911fd8f..b75c01b 100644
--- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
+++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.fail;
import java.lang.reflect.Method;
import java.util.Map;
-import java.util.Objects;
import org.eclipse.aether.repository.Authentication;
import org.eclipse.aether.repository.AuthenticationContext;
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
index 2f96646..9385e9a 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
@@ -19,7 +19,6 @@ package org.eclipse.aether.internal.impl;
* under the License.
*/
-import javax.inject.Inject;
import javax.inject.Named;
import org.eclipse.aether.RepositorySystemSession;
@@ -27,8 +26,6 @@ import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.repository.RepositoryPolicy;
import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy;
import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider;
-import org.eclipse.aether.spi.locator.Service;
-import org.eclipse.aether.spi.locator.ServiceLocator;
import org.eclipse.aether.transfer.TransferResource;
/**
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
index 4e8a21f..e377065 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
@@ -210,7 +210,7 @@ class TrackingFileManager
{
if ( attempts <= 0 )
{
- throw (IOException) new IOException().initCause( e );
+ throw new IOException( e );
}
try
{
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
index 24931e1..25e4f00 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
@@ -417,9 +417,7 @@ public class DefaultDependencyCollector
{
return dc.args.executor.submit( new Callable<DependencyContext>()
{
-
public DependencyContext call()
- throws Exception
{
return processDependency( dc );
}
@@ -631,9 +629,7 @@ public class DefaultDependencyCollector
{
descriptorResult = args.executor.submit( new Callable<ArtifactDescriptorResult>()
{
-
public ArtifactDescriptorResult call()
- throws Exception
{
try
{
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 dabc1dc..2882dc2 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
@@ -20,7 +20,6 @@ package org.eclipse.aether.impl;
*/
import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.impl.ArtifactDescriptorReader;
import org.eclipse.aether.resolution.ArtifactDescriptorException;
import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
import org.eclipse.aether.resolution.ArtifactDescriptorResult;
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 1a37878..924ff5a 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
@@ -20,9 +20,7 @@ package org.eclipse.aether.impl;
*/
import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.impl.VersionRangeResolver;
import org.eclipse.aether.resolution.VersionRangeRequest;
-import org.eclipse.aether.resolution.VersionRangeResolutionException;
import org.eclipse.aether.resolution.VersionRangeResult;
public class StubVersionRangeResolver
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 5abf5a6..4baa461 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
@@ -20,7 +20,6 @@ package org.eclipse.aether.impl;
*/
import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.resolution.VersionRequest;
import org.eclipse.aether.resolution.VersionResolutionException;
import org.eclipse.aether.resolution.VersionResult;
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 2df18ce..ac628a1 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
@@ -456,7 +456,7 @@ public class DefaultArtifactResolverTest
resolver.resolveArtifact( session, request );
fail( "expected exception" );
}
- catch ( ArtifactResolutionException e )
+ catch ( ArtifactResolutionException ignored )
{
}
@@ -541,7 +541,7 @@ public class DefaultArtifactResolverTest
resolver.resolveArtifact( session, request );
fail( "expected exception" );
}
- catch ( ArtifactResolutionException e )
+ catch ( ArtifactResolutionException ignored )
{
}
@@ -628,7 +628,7 @@ public class DefaultArtifactResolverTest
resolver.resolveArtifact( session, request );
fail( "expected exception" );
}
- catch ( ArtifactResolutionException e )
+ catch ( ArtifactResolutionException ignored )
{
}
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 5ae8fb3..0fb0e56 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
@@ -50,7 +50,6 @@ import org.eclipse.aether.internal.test.util.TestUtils;
import org.eclipse.aether.metadata.DefaultMetadata;
import org.eclipse.aether.metadata.Metadata;
import org.eclipse.aether.metadata.Metadata.Nature;
-import org.eclipse.aether.transform.TransformException;
import org.eclipse.aether.transform.FileTransformer;
import org.eclipse.aether.util.artifact.SubArtifact;
import org.junit.After;
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java
index a41013b..05d0890 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java
@@ -200,7 +200,6 @@ class RecordingRepositoryConnector
}
private void fireDone( Transfer transfer )
- throws Exception
{
TransferListener listener = transfer.getListener();
if ( listener == null )
@@ -232,7 +231,7 @@ class RecordingRepositoryConnector
assertSeenExpected( actualPutMD, expectPutMD );
}
- private void assertSeenExpected( List<? extends Object> actual, Object[] expected )
+ private void assertSeenExpected( List<?> actual, Object[] expected )
{
if ( expected == null )
{
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 74d2373..10a54f1 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
@@ -22,7 +22,6 @@ package org.eclipse.aether.internal.impl;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.resolution.VersionRequest;
-import org.eclipse.aether.resolution.VersionResolutionException;
import org.eclipse.aether.resolution.VersionResult;
/* *
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 a75ad59..41ed12a 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
@@ -21,7 +21,6 @@ package org.eclipse.aether.internal.test.util;
import static org.junit.Assert.*;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -30,7 +29,6 @@ import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.Exclusion;
-import org.eclipse.aether.internal.test.util.IniArtifactDescriptorReader;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.ArtifactDescriptorException;
import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
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 a269663..ee5dbed 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
@@ -254,9 +254,7 @@ public class HttpServer
extends AbstractHandler
{
- @SuppressWarnings( "unchecked" )
public void handle( String target, Request req, HttpServletRequest request, HttpServletResponse response )
- throws IOException
{
LOGGER.info( "{} {}{}", req.getMethod(), req.getRequestURL(),
req.getQueryString() != null ? "?" + req.getQueryString() : "");
@@ -472,7 +470,6 @@ public class HttpServer
{
public void handle( String target, Request req, HttpServletRequest request, HttpServletResponse response )
- throws IOException
{
String path = req.getPathInfo();
if ( !path.startsWith( "/redirect/" ) )
@@ -537,7 +534,6 @@ public class HttpServer
{
public void handle( String target, Request req, HttpServletRequest request, HttpServletResponse response )
- throws IOException
{
if ( proxyUsername != null && proxyPassword != null )
{
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java
index 08d1c64..6082386 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java
@@ -55,7 +55,6 @@ public class ChecksumUtilTest
@BeforeClass
public static void beforeClass()
- throws IOException
{
emptyChecksums.put( "MD5", "d41d8cd98f00b204e9800998ecf8427e" );
emptyChecksums.put( "SHA-1", "da39a3ee5e6b4b0d3255bfef95601890afd80709" );
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java
index 5f06580..2c596e0 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java
@@ -28,7 +28,6 @@ import org.eclipse.aether.collection.DependencyGraphTransformationContext;
import org.eclipse.aether.collection.DependencyGraphTransformer;
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.util.graph.transformer.TransformationContextKeys;
/**
* Set "groupId:artId:classifier:extension" as conflict marker for every node.
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java
index 85d007f..08e9bce 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java
@@ -44,10 +44,7 @@ public class GenericVersionRangeTest
}
catch ( InvalidVersionSpecificationException e )
{
- AssertionError error =
- new AssertionError( range + " should be valid but failed to parse due to: " + e.getMessage() );
- error.initCause( e );
- throw error;
+ throw new AssertionError( range + " should be valid but failed to parse due to: " + e.getMessage(), e );
}
}