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
The following commit(s) were added to refs/heads/MSHARED-864 by this push:
new faf04a9 Refactoring continued.
faf04a9 is described below
commit faf04a9fa0b2cae2c39daaa21b719ae7f0bb8654
Author: Karl Heinz Marbaise <khmarba...@apache.org>
AuthorDate: Sat Apr 4 13:26:13 2020 +0200
Refactoring continued.
---
.../plugin/project/deploy/ProjectDeployerMojo.java | 16 ++-----------
.../project/install/ProjectInstallerMojo.java | 12 ++--------
.../artifact/install/internal/Invoker.java | 28 +++-------------------
.../artifact/resolve/internal/Invoker.java | 20 ++--------------
.../resolve/internal/Maven30ArtifactResolver.java | 6 +----
.../resolve/internal/Maven31ArtifactResolver.java | 6 +----
.../transfer/collection/internal/Invoker.java | 5 ++++
.../dependencies/collect/internal/Invoker.java | 28 ----------------------
.../dependencies/resolve/internal/Invoker.java | 5 ++++
9 files changed, 21 insertions(+), 105 deletions(-)
diff --git
a/src/it/maven-project-deployer-plugin/src/main/java/org/apache/maven/plugin/project/deploy/ProjectDeployerMojo.java
b/src/it/maven-project-deployer-plugin/src/main/java/org/apache/maven/plugin/project/deploy/ProjectDeployerMojo.java
index 26c794e..39a2fb7 100644
---
a/src/it/maven-project-deployer-plugin/src/main/java/org/apache/maven/plugin/project/deploy/ProjectDeployerMojo.java
+++
b/src/it/maven-project-deployer-plugin/src/main/java/org/apache/maven/plugin/project/deploy/ProjectDeployerMojo.java
@@ -114,21 +114,9 @@ public class ProjectDeployerMojo
ArtifactRepository repo =
session.getCurrentProject().getDistributionManagementArtifactRepository();
deployer.deploy( session.getProjectBuildingRequest(), pdr, repo );
}
- catch ( IOException e )
+ catch ( IOException | NoFileAssignedException |
IllegalArgumentException | ArtifactDeployerException e )
{
- throw new MojoExecutionException( "IOException", e );
- }
- catch ( NoFileAssignedException e )
- {
- throw new MojoExecutionException( "NoFileAssignedException", e );
- }
- catch ( IllegalArgumentException e )
- {
- throw new MojoExecutionException( "IllegalArgumentException", e );
- }
- catch ( ArtifactDeployerException e )
- {
- throw new MojoExecutionException( "ArtifactDeployerException", e );
+ throw new MojoExecutionException( e.getClass().getName(), e);
}
}
diff --git
a/src/it/maven-project-installer-plugin/src/main/java/org/apache/maven/plugin/project/install/ProjectInstallerMojo.java
b/src/it/maven-project-installer-plugin/src/main/java/org/apache/maven/plugin/project/install/ProjectInstallerMojo.java
index 2e6a878..ee932aa 100644
---
a/src/it/maven-project-installer-plugin/src/main/java/org/apache/maven/plugin/project/install/ProjectInstallerMojo.java
+++
b/src/it/maven-project-installer-plugin/src/main/java/org/apache/maven/plugin/project/install/ProjectInstallerMojo.java
@@ -110,17 +110,9 @@ public class ProjectInstallerMojo
pir.setProject( session.getCurrentProject());
installer.install( pbr, pir );
}
- catch ( ArtifactInstallerException e )
+ catch ( ArtifactInstallerException | IOException |
NoFileAssignedException e )
{
- throw new MojoExecutionException( "ArtifactInstallerException", e
);
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "IOException", e );
- }
- catch ( NoFileAssignedException e )
- {
- throw new MojoExecutionException( "NoFileAssignedException", e );
+ throw new MojoExecutionException( e.getClass().getName(), e );
}
}
diff --git
a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Invoker.java
b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Invoker.java
index 20df360..eb8c69e 100644
---
a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Invoker.java
+++
b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Invoker.java
@@ -36,27 +36,13 @@ final class Invoker
public static <T> T invoke( Object object, String method )
throws ArtifactInstallerException
{
- return invoke( object.getClass(), object, method );
- }
-
- private static <T> T invoke( Class<?> objectClazz, Object object, String
method )
- throws ArtifactInstallerException
- {
try
{
@SuppressWarnings( "unchecked" )
- T invoke = (T) objectClazz.getMethod( method ).invoke( object );
+ T invoke = (T) object.getClass().getMethod( method ).invoke(
object );
return invoke;
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( IllegalAccessException | InvocationTargetException |
NoSuchMethodException e )
{
throw new ArtifactInstallerException( e.getMessage(), e );
}
@@ -71,15 +57,7 @@ final class Invoker
T invoke = (T) objectClazz.getMethod( staticMethod, argClazz
).invoke( null, arg );
return invoke;
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( IllegalAccessException | InvocationTargetException |
NoSuchMethodException e )
{
throw new ArtifactInstallerException( e.getMessage(), e );
}
diff --git
a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Invoker.java
b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Invoker.java
index e46c199..832f453 100644
---
a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Invoker.java
+++
b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Invoker.java
@@ -49,15 +49,7 @@ final class Invoker
T invoke = (T) objectClazz.getMethod( method ).invoke( object );
return invoke;
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( IllegalAccessException | InvocationTargetException |
NoSuchMethodException e )
{
throw new ArtifactResolverException( e.getMessage(), e );
}
@@ -72,15 +64,7 @@ final class Invoker
T invoke = (T) objectClazz.getMethod( staticMethod, argClazz
).invoke( null, arg );
return invoke;
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( IllegalAccessException | InvocationTargetException |
NoSuchMethodException e )
{
throw new ArtifactResolverException( e.getMessage(), e );
}
diff --git
a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResolver.java
b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResolver.java
index cdc3308..95a6dc5 100644
---
a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResolver.java
+++
b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResolver.java
@@ -98,11 +98,7 @@ class Maven30ArtifactResolver
return new Maven30ArtifactResult(
repositorySystem.resolveArtifact( session, request ) );
}
- catch ( ArtifactDescriptorException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( ArtifactResolutionException e )
+ catch ( ArtifactDescriptorException | ArtifactResolutionException e )
{
throw new ArtifactResolverException( e.getMessage(), e );
}
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 6308ddb..9ef5658 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
@@ -96,11 +96,7 @@ class Maven31ArtifactResolver
return new Maven31ArtifactResult(
repositorySystem.resolveArtifact( session, request ) );
}
- catch ( ArtifactDescriptorException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( ArtifactResolutionException e )
+ catch ( ArtifactDescriptorException | ArtifactResolutionException e )
{
throw new ArtifactResolverException( e.getMessage(), e );
}
diff --git
a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Invoker.java
b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Invoker.java
index c5290ac..ce16330 100644
---
a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Invoker.java
+++
b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Invoker.java
@@ -77,6 +77,11 @@ final class Invoker
public static <T> T invoke( Class<?> objectClazz, String staticMethod,
Class<?>[] argClasses, Object[] args )
throws DependencyCollectionException
{
+ if ( args.length != argClasses.length )
+ {
+ throw new IllegalArgumentException( "The number of elements in
argClasses and args is not the same." );
+ }
+
try
{
@SuppressWarnings( "unchecked" )
diff --git
a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Invoker.java
b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Invoker.java
index 6540fae..7587f87 100644
---
a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Invoker.java
+++
b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Invoker.java
@@ -61,34 +61,6 @@ final class Invoker
throw new DependencyCollectorException( e.getMessage(), e );
}
}
- //
- // public interface ExceptionFactory<E extends Exception>
- // {
- // E create(String message);
- // }
- //
- // public static <T, E extends Exception> T invokeX( Class<?>
objectClazz,
- // String staticMethod, Class<?> argClazz, Object arg )
- // throws E
- // {
- // try
- // {
- // return (T) objectClazz.getMethod( staticMethod, argClazz
).invoke( null, arg );
- // }
- // catch ( IllegalAccessException e )
- // {
- //
- // throw new DependencyCollectorException( e.getMessage(), e );
- // }
- // catch ( InvocationTargetException e )
- // {
- // throw new DependencyCollectorException( e.getMessage(), e );
- // }
- // catch ( NoSuchMethodException e )
- // {
- // throw new DependencyCollectorException( e.getMessage(), e );
- // }
- // }
/**
* @param objectClazz the class of the static method
diff --git
a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Invoker.java
b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Invoker.java
index 9055f14..300fb09 100644
---
a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Invoker.java
+++
b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Invoker.java
@@ -76,6 +76,11 @@ final class Invoker
public static <T> T invoke( Class<?> objectClazz, String staticMethod,
Class<?>[] argClasses, Object[] args )
throws DependencyResolverException
{
+ if ( args.length != argClasses.length )
+ {
+ throw new IllegalArgumentException( "The number of elements in
argClasses and args is not the same." );
+ }
+
try
{
@SuppressWarnings( "unchecked" )
