You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/05/19 19:42:08 UTC
svn commit: r1595975 - in
/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal:
Invoker.java Maven31DependencyGraphBuilder.java
Maven3DependencyGraphBuilder.java
Author: hboutemy
Date: Mon May 19 17:42:07 2014
New Revision: 1595975
URL: http://svn.apache.org/r1595975
Log:
avoid Invoker instantiation: define static methods
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=1595975&r1=1595974&r2=1595975&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 17:42:07 2014
@@ -28,7 +28,12 @@ import java.lang.reflect.InvocationTarge
*/
final class Invoker
{
- public Object invoke( Class objectClazz, Object object, String method )
+ private Invoker()
+ {
+ // do not instantiate
+ }
+
+ public static Object invoke( Class<?> objectClazz, Object object, String method )
throws DependencyGraphBuilderException
{
try
@@ -49,12 +54,12 @@ final class Invoker
}
}
- public Object invoke( Object object, String method, Class<?> clazz, Object arg )
+ public static Object invoke( Object object, String method, Class<?> clazz, Object arg )
throws DependencyGraphBuilderException
{
try
{
- final Class objectClazz = object.getClass();
+ final Class<?> objectClazz = object.getClass();
return objectClazz.getMethod( method, clazz ).invoke( object, arg );
}
catch ( IllegalAccessException e )
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=1595975&r1=1595974&r2=1595975&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 17:42:07 2014
@@ -65,8 +65,6 @@ public class Maven31DependencyGraphBuild
@Requirement
private ArtifactFactory factory;
- private final Invoker invoker = new Invoker();
-
/**
* Builds the dependency graph for Maven 3 point 1+.
*
@@ -78,7 +76,7 @@ public class Maven31DependencyGraphBuild
public DependencyNode buildDependencyGraph( MavenProject project, ArtifactFilter filter )
throws DependencyGraphBuilderException
{
- return buildDependencyGraph( project, filter, Collections.EMPTY_LIST );
+ return buildDependencyGraph( project, filter, Collections.<MavenProject>emptyList() );
}
/**
@@ -95,10 +93,10 @@ public class Maven31DependencyGraphBuild
throws DependencyGraphBuilderException
{
ProjectBuildingRequest projectBuildingRequest =
- (ProjectBuildingRequest) invoker.invoke( project.getClass(), project, "getProjectBuildingRequest" );
+ (ProjectBuildingRequest) Invoker.invoke( project.getClass(), project, "getProjectBuildingRequest" );
RepositorySystemSession session =
- (RepositorySystemSession) invoker.invoke( ProjectBuildingRequest.class, projectBuildingRequest,
+ (RepositorySystemSession) Invoker.invoke( ProjectBuildingRequest.class, projectBuildingRequest,
"getRepositorySession" );
/*
@@ -110,11 +108,11 @@ public class Maven31DependencyGraphBuild
final DependencyResolutionRequest request = new DefaultDependencyResolutionRequest();
request.setMavenProject( project );
- invoker.invoke( request, "setRepositorySession", RepositorySystemSession.class, session );
+ Invoker.invoke( request, "setRepositorySession", RepositorySystemSession.class, session );
final DependencyResolutionResult result = resolveDependencies( request, reactorProjects );
org.eclipse.aether.graph.DependencyNode graph =
- (org.eclipse.aether.graph.DependencyNode) invoker.invoke( DependencyResolutionResult.class, result,
+ (org.eclipse.aether.graph.DependencyNode) Invoker.invoke( DependencyResolutionResult.class, result,
"getDependencyGraph" );
return buildDependencyNode( null, graph, project.getArtifact(), filter );
@@ -144,8 +142,8 @@ public class Maven31DependencyGraphBuild
final DependencyResolutionResult result = e.getResult();
final List<Dependency> reactorDeps =
getReactorDependencies( reactorProjects, result.getUnresolvedDependencies() );
- invoker.invoke( result.getUnresolvedDependencies(), "removeAll", Collection.class, reactorDeps );
- invoker.invoke( result.getResolvedDependencies(), "addAll", Collection.class, reactorDeps );
+ Invoker.invoke( result.getUnresolvedDependencies(), "removeAll", Collection.class, reactorDeps );
+ Invoker.invoke( result.getResolvedDependencies(), "addAll", Collection.class, reactorDeps );
if ( !result.getUnresolvedDependencies().isEmpty() )
{
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=1595975&r1=1595974&r2=1595975&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 17:42:07 2014
@@ -65,8 +65,6 @@ public class Maven3DependencyGraphBuilde
@Requirement
private ArtifactFactory factory;
- private final Invoker invoker = new Invoker();
-
/**
* Builds the dependency graph for Maven 3.
*
@@ -78,7 +76,7 @@ public class Maven3DependencyGraphBuilde
public DependencyNode buildDependencyGraph( MavenProject project, ArtifactFilter filter )
throws DependencyGraphBuilderException
{
- return buildDependencyGraph( project, filter, Collections.EMPTY_LIST );
+ return buildDependencyGraph( project, filter, Collections.<MavenProject>emptyList() );
}
/**
@@ -129,8 +127,8 @@ public class Maven3DependencyGraphBuilde
final DependencyResolutionResult result = e.getResult();
final List<Dependency> reactorDeps =
getReactorDependencies( reactorProjects, result.getUnresolvedDependencies() );
- invoker.invoke( result.getUnresolvedDependencies(), "removeAll", Collection.class, reactorDeps );
- invoker.invoke( result.getResolvedDependencies(), "addAll", Collection.class, reactorDeps );
+ Invoker.invoke( result.getUnresolvedDependencies(), "removeAll", Collection.class, reactorDeps );
+ Invoker.invoke( result.getResolvedDependencies(), "addAll", Collection.class, reactorDeps );
if ( !result.getUnresolvedDependencies().isEmpty() )
{