You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/03/26 16:18:02 UTC
[maven-artifact-transfer] 02/02: improved code.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-864
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git
commit fe5674105faedbbc5402a27ed0165e038fdc4113
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Thu Mar 26 17:17:48 2020 +0100
improved code.
---
.../deploy/internal/Maven30ArtifactDeployer.java | 2 --
.../deploy/internal/Maven31ArtifactDeployer.java | 2 +-
.../resolve/internal/Maven31ArtifactResolver.java | 8 ++---
.../transfer/repository/internal/Invoker.java | 42 ++++++----------------
.../internal/Maven31RepositoryManager.java | 2 +-
5 files changed, 16 insertions(+), 40 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java
index 06a7c93..611eb4c 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java
@@ -131,11 +131,9 @@ class Maven30ArtifactDeployer
private RemoteRepository getRemoteRepository( RepositorySystemSession session, ArtifactRepository remoteRepository )
throws ArtifactDeployerException
{
- // CHECKSTYLE_OFF: LineLength
RemoteRepository aetherRepo = Invoker.invoke( RepositoryUtils.class, "toRepo",
ArtifactRepository.class,
remoteRepository );
- // CHECKSTYLE_ON: LineLength
if ( aetherRepo.getAuthentication() == null )
{
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java
index f3bf542..8865c69 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java
@@ -102,7 +102,7 @@ class Maven31ArtifactDeployer
Artifact pomArtifact = new SubArtifact( aetherArtifact, "", "pom" );
pomArtifact = pomArtifact.setFile( ( (ProjectArtifactMetadata) metadata ).getFile() );
request.addArtifact( pomArtifact );
- }
+ }
else if ( // metadata instanceof SnapshotArtifactRepositoryMetadata ||
metadata instanceof ArtifactRepositoryMetadata )
{
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResolver.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResolver.java
index ba1a419..6308ddb 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResolver.java
@@ -56,13 +56,11 @@ class Maven31ArtifactResolver
}
@Override
- // CHECKSTYLE_OFF: LineLength
- public org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult resolveArtifact( org.apache.maven.artifact.Artifact mavenArtifact )
- throws ArtifactResolverException
- // CHECKSTYLE_ON: LineLength
+ public org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult resolveArtifact(
+ org.apache.maven.artifact.Artifact mavenArtifact ) throws ArtifactResolverException
{
Artifact aetherArtifact = Invoker.invoke( RepositoryUtils.class, "toArtifact",
- org.apache.maven.artifact.Artifact.class, mavenArtifact );
+ org.apache.maven.artifact.Artifact.class, mavenArtifact );
return resolveArtifact( aetherArtifact );
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/repository/internal/Invoker.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Invoker.java
index 6f566e0..48342dc 100644
--- a/src/main/java/org/apache/maven/shared/transfer/repository/internal/Invoker.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Invoker.java
@@ -33,44 +33,32 @@ final class Invoker
// do not instantiate
}
- public static Object invoke( Object object, String method )
+ public static <T> T invoke( Object object, String method )
throws RepositoryManagerException
{
try
{
- return object.getClass().getMethod( method ).invoke( object );
+ @SuppressWarnings( "unchecked" )
+ T invoke = (T) object.getClass().getMethod( method ).invoke( object );
+ return invoke;
}
- catch ( IllegalAccessException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
{
throw new RepositoryManagerException( e.getMessage(), e );
}
}
- public static Object invoke( Object object, String method, Class<?> argClazz, Object arg )
+ public static <T> T invoke( Object object, String method, Class<?> argClazz, Object arg )
throws RepositoryManagerException
{
try
{
final Class<?> objectClazz = object.getClass();
- return objectClazz.getMethod( method, argClazz ).invoke( object, arg );
- }
- catch ( IllegalAccessException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
+ @SuppressWarnings( "unchecked" )
+ T invoke = (T) objectClazz.getMethod( method, argClazz ).invoke( object, arg );
+ return invoke;
}
- catch ( InvocationTargetException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
{
throw new RepositoryManagerException( e.getMessage(), e );
}
@@ -83,15 +71,7 @@ final class Invoker
{
return objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
}
- catch ( IllegalAccessException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
{
throw new RepositoryManagerException( e.getMessage(), e );
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven31RepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven31RepositoryManager.java
index 86ae613..6f486a0 100644
--- a/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven31RepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven31RepositoryManager.java
@@ -103,7 +103,7 @@ class Maven31RepositoryManager
RepositorySystemSession session;
try
{
- session = (RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
+ session = Invoker.invoke( buildingRequest, "getRepositorySession" );
}
catch ( RepositoryManagerException e )
{