Author: rfscholte
Date: Sat Jun 13 19:08:10 2015
New Revision: 1685306
URL: http://svn.apache.org/r1685306
Log:
Simplify Exception handling
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Invoker.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Invoker.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Invoker.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Invoker.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Invoker.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Invoker.java?rev=1685306&r1=1685305&r2=1685306&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Invoker.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Invoker.java
Sat Jun 13 19:08:10 2015
@@ -19,8 +19,6 @@ package org.apache.maven.shared.artifact
* under the License.
*/
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
/**
@@ -46,15 +44,7 @@ final class Invoker
{
return objectClazz.getMethod( method ).invoke( object );
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new ArtifactDeployerException( e.getMessage(), e );
}
@@ -68,15 +58,7 @@ final class Invoker
final Class<?> objectClazz = object.getClass();
return objectClazz.getMethod( method, clazz ).invoke( object, arg
);
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new ArtifactDeployerException( e.getMessage(), e );
}
@@ -89,15 +71,7 @@ final class Invoker
{
return objectClazz.getMethod( staticMethod, argClazz ).invoke(
null, arg );
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new ArtifactDeployerException( e.getMessage(), e );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Invoker.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Invoker.java?rev=1685306&r1=1685305&r2=1685306&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Invoker.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Invoker.java
Sat Jun 13 19:08:10 2015
@@ -19,8 +19,6 @@ package org.apache.maven.shared.artifact
* under the License.
*/
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
/**
@@ -46,15 +44,7 @@ final class Invoker
{
return objectClazz.getMethod( method ).invoke( object );
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new ArtifactInstallerException( e.getMessage(), e );
}
@@ -68,15 +58,7 @@ final class Invoker
final Class<?> objectClazz = object.getClass();
return objectClazz.getMethod( method, argClazz ).invoke( object,
arg );
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new ArtifactInstallerException( e.getMessage(), e );
}
@@ -89,15 +71,7 @@ final class Invoker
{
return objectClazz.getMethod( staticMethod, argClazz ).invoke(
null, arg );
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new ArtifactInstallerException( e.getMessage(), e );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Invoker.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Invoker.java?rev=1685306&r1=1685305&r2=1685306&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Invoker.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Invoker.java
Sat Jun 13 19:08:10 2015
@@ -19,8 +19,6 @@ package org.apache.maven.shared.artifact
* under the License.
*/
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.maven.shared.artifact.repository.RepositoryManagerException;
/**
@@ -46,15 +44,7 @@ final class Invoker
{
return objectClazz.getMethod( method ).invoke( object );
}
- catch ( IllegalAccessException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new RepositoryManagerException( e.getMessage(), e );
}
@@ -68,15 +58,7 @@ final class Invoker
final Class<?> objectClazz = object.getClass();
return objectClazz.getMethod( method, argClazz ).invoke( object,
arg );
}
- catch ( IllegalAccessException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new RepositoryManagerException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new RepositoryManagerException( e.getMessage(), e );
}
@@ -89,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 ( ReflectiveOperationException e )
{
throw new RepositoryManagerException( e.getMessage(), e );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Invoker.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Invoker.java?rev=1685306&r1=1685305&r2=1685306&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Invoker.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Invoker.java
Sat Jun 13 19:08:10 2015
@@ -19,8 +19,6 @@ package org.apache.maven.shared.artifact
* under the License.
*/
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
/**
@@ -46,15 +44,7 @@ final class Invoker
{
return objectClazz.getMethod( method ).invoke( object );
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new ArtifactResolverException( e.getMessage(), e );
}
@@ -68,15 +58,7 @@ final class Invoker
final Class<?> objectClazz = object.getClass();
return objectClazz.getMethod( method, argClazz ).invoke( object,
arg );
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new ArtifactResolverException( e.getMessage(), e );
}
@@ -89,15 +71,7 @@ final class Invoker
{
return objectClazz.getMethod( staticMethod, argClazz ).invoke(
null, arg );
}
- catch ( IllegalAccessException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
+ catch ( ReflectiveOperationException e )
{
throw new ArtifactResolverException( e.getMessage(), e );
}
