svn commit: r1596006 - in /maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal: Invoker.java Maven31DependencyGraphBuilder.java Maven3DependencyGraphBuilder.java

[hb...@apache.org]

Author: hboutemy
Date: Mon May 19 19:43:12 2014
New Revision: 1596006

URL: http://svn.apache.org/r1596006
Log:
use Invoker for every reflection needs

Modified:
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Invoker.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Invoker.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Invoker.java?rev=1596006&r1=1596005&r2=1596006&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Invoker.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Invoker.java Mon May 19 19:43:12 2014
@@ -33,6 +33,12 @@ final class Invoker
         // do not instantiate
     }
 
+    public static Object invoke( Object object, String method )
+        throws DependencyGraphBuilderException
+    {
+        return invoke( object.getClass(), object, method );
+    }
+
     public static Object invoke( Class<?> objectClazz, Object object, String method )
         throws DependencyGraphBuilderException
     {

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java?rev=1596006&r1=1596005&r2=1596006&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java Mon May 19 19:43:12 2014
@@ -93,11 +93,10 @@ public class Maven31DependencyGraphBuild
         throws DependencyGraphBuilderException
     {
         ProjectBuildingRequest projectBuildingRequest =
-            (ProjectBuildingRequest) Invoker.invoke( project.getClass(), project, "getProjectBuildingRequest" );
+            (ProjectBuildingRequest) Invoker.invoke( project, "getProjectBuildingRequest" );
 
         RepositorySystemSession session =
-            (RepositorySystemSession) Invoker.invoke( ProjectBuildingRequest.class, projectBuildingRequest,
-                                                      "getRepositorySession" );
+            (RepositorySystemSession) Invoker.invoke( projectBuildingRequest, "getRepositorySession" );
 
         /*
          * if ( Boolean.TRUE != ( (Boolean) session.getConfigProperties().get(

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java?rev=1596006&r1=1596005&r2=1596006&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java Mon May 19 19:43:12 2014
@@ -39,7 +39,6 @@ import org.codehaus.plexus.logging.Abstr
 import org.sonatype.aether.graph.Dependency;
 import org.sonatype.aether.version.VersionConstraint;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -93,7 +92,7 @@ public class Maven3DependencyGraphBuilde
         throws DependencyGraphBuilderException
     {
         ProjectBuildingRequest projectBuildingRequest =
-            (ProjectBuildingRequest) invoke( project, "getProjectBuildingRequest" );
+            (ProjectBuildingRequest) Invoker.invoke( project, "getProjectBuildingRequest" );
 
         DependencyResolutionRequest request =
             new DefaultDependencyResolutionRequest( project, projectBuildingRequest.getRepositorySession() );
@@ -170,27 +169,6 @@ public class Maven3DependencyGraphBuilde
         return reactorDeps;
     }
 
-    private Object invoke( Object object, String method )
-        throws DependencyGraphBuilderException
-    {
-        try
-        {
-            return object.getClass().getMethod( method ).invoke( object );
-        }
-        catch ( IllegalAccessException e )
-        {
-            throw new DependencyGraphBuilderException( e.getMessage(), e );
-        }
-        catch ( InvocationTargetException e )
-        {
-            throw new DependencyGraphBuilderException( e.getMessage(), e );
-        }
-        catch ( NoSuchMethodException e )
-        {
-            throw new DependencyGraphBuilderException( e.getMessage(), e );
-        }
-    }
-
     private Artifact getDependencyArtifact( Dependency dep )
     {
         org.sonatype.aether.artifact.Artifact artifact = dep.getArtifact();