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 24359e00e627e1e21748bda1c87c2933dda1020d
Author: Karl Heinz Marbaise <khmarba...@apache.org>
AuthorDate: Sat Mar 21 21:08:19 2020 +0100
Reformatting
---
.../deploy/internal/DefaultArtifactDeployer.java | 39 +++--
.../install/internal/DefaultArtifactInstaller.java | 38 ++---
.../resolve/internal/DefaultArtifactResolver.java | 54 ++++---
.../internal/DefaultDependencyCollector.java | 165 ++++++++++-----------
.../transfer/collection/internal/Invoker.java | 10 +-
.../internal/Maven30DependencyCollector.java | 5 +-
.../internal/DefaultDependencyCollector.java | 47 +++---
.../dependencies/collect/internal/Invoker.java | 35 +----
.../internal/DefaultDependencyResolver.java | 62 ++++----
9 files changed, 210 insertions(+), 245 deletions(-)
diff --git
a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
index 3d977c3..ff2b097 100644
---
a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
+++
b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
@@ -35,18 +35,17 @@ import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
/**
- *
+ *
*/
@Component( role = ArtifactDeployer.class )
-class DefaultArtifactDeployer
- implements ArtifactDeployer, Contextualizable
+class DefaultArtifactDeployer implements ArtifactDeployer, Contextualizable
{
private PlexusContainer container;
@Override
public void deploy( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
- throws ArtifactDeployerException
+ throws ArtifactDeployerException
{
validateParameters( request, mavenArtifacts );
@@ -62,8 +61,7 @@ class DefaultArtifactDeployer
@Override
public void deploy( ProjectBuildingRequest request, ArtifactRepository
remoteRepository,
- Collection<Artifact> mavenArtifacts )
- throws ArtifactDeployerException
+ Collection<Artifact> mavenArtifacts ) throws
ArtifactDeployerException
{
validateParameters( request, mavenArtifacts );
try
@@ -120,31 +118,32 @@ class DefaultArtifactDeployer
* @param context Plexus context to inject.
* @throws ContextException if the PlexusContainer could not be located.
*/
- public void contextualize( Context context )
- throws ContextException
+ public void contextualize( Context context ) throws ContextException
{
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
}
-
+
private MavenArtifactDeployer getMavenArtifactDeployer(
ProjectBuildingRequest buildingRequest )
- throws ComponentLookupException, ArtifactDeployerException
+ throws ComponentLookupException, ArtifactDeployerException
{
if ( isMaven31() )
{
- org.eclipse.aether.RepositorySystem repositorySystem =
- container.lookup(
org.eclipse.aether.RepositorySystem.class );
-
- org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest, "getRepositorySession" );
-
+ org.eclipse.aether.RepositorySystem repositorySystem =
container.lookup(
+ org.eclipse.aether.RepositorySystem.class );
+
+ org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
+
return new Maven31ArtifactDeployer( repositorySystem, session );
}
else
{
- org.sonatype.aether.RepositorySystem repositorySystem =
- container.lookup(
org.sonatype.aether.RepositorySystem.class );
-
- org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest, "getRepositorySession" );
-
+ org.sonatype.aether.RepositorySystem repositorySystem =
container.lookup(
+ org.sonatype.aether.RepositorySystem.class );
+
+ org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
+
return new Maven30ArtifactDeployer( repositorySystem, session );
}
}
diff --git
a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
index 58e3a9e..738f00e 100644
---
a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
+++
b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
@@ -36,19 +36,18 @@ import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
/**
- *
+ *
*/
@Component( role = ArtifactInstaller.class )
-class DefaultArtifactInstaller
- implements ArtifactInstaller, Contextualizable
+class DefaultArtifactInstaller implements ArtifactInstaller, Contextualizable
{
private PlexusContainer container;
-
+
private RepositoryManager repositoryManager;
@Override
public void install( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
- throws ArtifactInstallerException, IllegalArgumentException
+ throws ArtifactInstallerException, IllegalArgumentException
{
validateParameters( request, mavenArtifacts );
try
@@ -63,7 +62,7 @@ class DefaultArtifactInstaller
@Override
public void install( ProjectBuildingRequest request, File localRepositry,
Collection<Artifact> mavenArtifacts )
- throws ArtifactInstallerException
+ throws ArtifactInstallerException
{
validateParameters( request, mavenArtifacts );
if ( localRepositry == null )
@@ -76,7 +75,7 @@ class DefaultArtifactInstaller
}
// TODO: Should we check for exists() ?
-
+
// update local repo in request
ProjectBuildingRequest newRequest =
repositoryManager.setLocalRepositoryBasedir( request, localRepositry );
@@ -134,30 +133,31 @@ class DefaultArtifactInstaller
* @param context Plexus context to inject.
* @throws ContextException if the PlexusContainer could not be located.
*/
- public void contextualize( Context context )
- throws ContextException
+ public void contextualize( Context context ) throws ContextException
{
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
}
-
+
private MavenArtifactInstaller getMavenArtifactInstaller(
ProjectBuildingRequest buildingRequest )
- throws ComponentLookupException, ArtifactInstallerException
+ throws ComponentLookupException, ArtifactInstallerException
{
if ( isMaven31() )
{
- org.eclipse.aether.RepositorySystem repositorySystem =
- container.lookup(
org.eclipse.aether.RepositorySystem.class );
-
- org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest, "getRepositorySession" );
+ org.eclipse.aether.RepositorySystem repositorySystem =
container.lookup(
+ org.eclipse.aether.RepositorySystem.class );
+
+ org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
return new Maven31ArtifactInstaller( repositorySystem, session );
}
else
{
- org.sonatype.aether.RepositorySystem repositorySystem =
- container.lookup(
org.sonatype.aether.RepositorySystem.class );
-
- org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest, "getRepositorySession" );
+ org.sonatype.aether.RepositorySystem repositorySystem =
container.lookup(
+ org.sonatype.aether.RepositorySystem.class );
+
+ org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
return new Maven30ArtifactInstaller( repositorySystem, session );
}
diff --git
a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
index 12c3ece..00f6600 100644
---
a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
+++
b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
@@ -38,17 +38,16 @@ import
org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
/**
- *
+ *
*/
@Component( role = ArtifactResolver.class, hint = "default" )
-class DefaultArtifactResolver
- implements ArtifactResolver, Contextualizable
+class DefaultArtifactResolver implements ArtifactResolver, Contextualizable
{
private PlexusContainer container;
@Override
public ArtifactResult resolveArtifact( ProjectBuildingRequest
buildingRequest, Artifact mavenArtifact )
- throws ArtifactResolverException, IllegalArgumentException
+ throws ArtifactResolverException, IllegalArgumentException
{
validateParameters( buildingRequest, mavenArtifact );
try
@@ -63,7 +62,7 @@ class DefaultArtifactResolver
@Override
public ArtifactResult resolveArtifact( ProjectBuildingRequest
buildingRequest, ArtifactCoordinate coordinate )
- throws ArtifactResolverException, IllegalArgumentException
+ throws ArtifactResolverException, IllegalArgumentException
{
validateParameters( buildingRequest, coordinate );
try
@@ -128,40 +127,39 @@ class DefaultArtifactResolver
* @param context Plexus context to inject.
* @throws ContextException if the PlexusContainer could not be located.
*/
- public void contextualize( Context context )
- throws ContextException
+ public void contextualize( Context context ) throws ContextException
{
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
}
-
+
private MavenArtifactResolver getMavenArtifactResolver(
ProjectBuildingRequest buildingRequest )
- throws ComponentLookupException, ArtifactResolverException
+ throws ComponentLookupException, ArtifactResolverException
{
if ( isMaven31() )
{
- org.eclipse.aether.RepositorySystem repositorySystem =
- container.lookup(
org.eclipse.aether.RepositorySystem.class );
-
- List<org.eclipse.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke( RepositoryUtils.class, "toRepos",
-
List.class,
-
buildingRequest.getRemoteRepositories() );
-
- org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest, "getRepositorySession" );
-
+ org.eclipse.aether.RepositorySystem repositorySystem =
container.lookup(
+ org.eclipse.aether.RepositorySystem.class );
+
+ List<org.eclipse.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke(
+ RepositoryUtils.class, "toRepos", List.class,
buildingRequest.getRemoteRepositories() );
+
+ org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
+
return new Maven31ArtifactResolver( repositorySystem,
aetherRepositories, session );
-
+
}
else
{
- org.sonatype.aether.RepositorySystem repositorySystem =
- container.lookup(
org.sonatype.aether.RepositorySystem.class );
-
- List<org.sonatype.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke( RepositoryUtils.class,
-
"toRepos", List.class,
-
buildingRequest.getRemoteRepositories() );
-
- org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest, "getRepositorySession" );
-
+ org.sonatype.aether.RepositorySystem repositorySystem =
container.lookup(
+ org.sonatype.aether.RepositorySystem.class );
+
+ List<org.sonatype.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke(
+ RepositoryUtils.class, "toRepos", List.class,
buildingRequest.getRemoteRepositories() );
+
+ org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
+
return new Maven30ArtifactResolver( repositorySystem,
aetherRepositories, session );
}
diff --git
a/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
b/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
index 449eb99..bf5966d 100644
---
a/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
+++
b/src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java
@@ -27,10 +27,10 @@ import
org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
import org.apache.maven.shared.transfer.collection.CollectResult;
import
org.apache.maven.shared.transfer.collection.DependencyCollectionException;
import org.apache.maven.shared.transfer.collection.DependencyCollector;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
@@ -51,7 +51,7 @@ class DefaultDependencyCollector implements
DependencyCollector, Contextualizabl
@Override
public CollectResult collectDependencies( ProjectBuildingRequest
buildingRequest, Dependency root )
- throws DependencyCollectionException
+ throws DependencyCollectionException
{
validateParameters( buildingRequest, root );
@@ -67,7 +67,7 @@ class DefaultDependencyCollector implements
DependencyCollector, Contextualizabl
@Override
public CollectResult collectDependencies( ProjectBuildingRequest
buildingRequest, DependableCoordinate root )
- throws DependencyCollectionException
+ throws DependencyCollectionException
{
validateParameters( buildingRequest, root );
@@ -83,7 +83,7 @@ class DefaultDependencyCollector implements
DependencyCollector, Contextualizabl
@Override
public CollectResult collectDependencies( ProjectBuildingRequest
buildingRequest, Model root )
- throws DependencyCollectionException
+ throws DependencyCollectionException
{
validateParameters( buildingRequest, root );
@@ -95,99 +95,98 @@ class DefaultDependencyCollector implements
DependencyCollector, Contextualizabl
{
throw new DependencyCollectionException( e.getMessage(), e );
}
- }
-
- private void validateParameters( ProjectBuildingRequest buildingRequest,
DependableCoordinate root )
- {
- validateBuildingRequest( buildingRequest );
- Objects.requireNonNull( root, "The parameter root is not allowed to be
null." );
- }
-
- private void validateParameters( ProjectBuildingRequest buildingRequest,
Dependency root )
- {
- validateBuildingRequest( buildingRequest );
- Objects.requireNonNull( root, "The parameter root is not allowed to be
null." );
- }
-
- private void validateParameters( ProjectBuildingRequest buildingRequest,
Model root )
- {
- validateBuildingRequest( buildingRequest );
- Objects.requireNonNull( root, "The parameter root is not allowed to be
null." );
- }
-
- private void validateBuildingRequest( ProjectBuildingRequest buildingRequest
)
- {
- Objects.requireNonNull( buildingRequest, "The parameter buildingRequest is
not allowed to be null." );
- }
-
- /**
- * @return true if the current Maven version is Maven 3.1.
- */
- private boolean isMaven31()
- {
- return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); //
Maven 3.1 specific
- }
-
- private boolean canFindCoreClass( String className )
- {
- try
+ }
+
+ private void validateParameters( ProjectBuildingRequest buildingRequest,
DependableCoordinate root )
{
- Thread.currentThread().getContextClassLoader().loadClass( className );
+ validateBuildingRequest( buildingRequest );
+ Objects.requireNonNull( root, "The parameter root is not allowed to be
null." );
+ }
- return true;
+ private void validateParameters( ProjectBuildingRequest buildingRequest,
Dependency root )
+ {
+ validateBuildingRequest( buildingRequest );
+ Objects.requireNonNull( root, "The parameter root is not allowed to be
null." );
}
- catch ( ClassNotFoundException e )
+
+ private void validateParameters( ProjectBuildingRequest buildingRequest,
Model root )
{
- return false;
+ validateBuildingRequest( buildingRequest );
+ Objects.requireNonNull( root, "The parameter root is not allowed to be
null." );
}
- }
-
- /**
- * Injects the Plexus content.
- *
- * @param context Plexus context to inject.
- * @throws ContextException if the PlexusContainer could not be located.
- */
- public void contextualize( Context context )
- throws ContextException
- {
- container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
- }
-
- private MavenDependencyCollector getMavenDependencyCollector(
ProjectBuildingRequest buildingRequest )
- throws ComponentLookupException, DependencyCollectionException
- {
- ArtifactHandlerManager artifactHandlerManager = container.lookup(
ArtifactHandlerManager.class );
-
- if ( isMaven31() )
+
+ private void validateBuildingRequest( ProjectBuildingRequest
buildingRequest )
{
- org.eclipse.aether.RepositorySystem m31RepositorySystem =
- container.lookup( org.eclipse.aether.RepositorySystem.class );
+ Objects.requireNonNull( buildingRequest, "The parameter
buildingRequest is not allowed to be null." );
+ }
- org.eclipse.aether.RepositorySystemSession session = Invoker.invoke(
buildingRequest, "getRepositorySession" );
+ /**
+ * @return true if the current Maven version is Maven 3.1.
+ */
+ private boolean isMaven31()
+ {
+ return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); //
Maven 3.1 specific
+ }
- List<org.eclipse.aether.repository.RemoteRepository> aetherRepositories
= Invoker.invoke( RepositoryUtils.class, "toRepos",
- List.class,
- buildingRequest.getRemoteRepositories() );
+ private boolean canFindCoreClass( String className )
+ {
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass(
className );
- return new Maven31DependencyCollector( m31RepositorySystem,
artifactHandlerManager, session,
- aetherRepositories );
+ return true;
+ }
+ catch ( ClassNotFoundException e )
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Injects the Plexus content.
+ *
+ * @param context Plexus context to inject.
+ * @throws ContextException if the PlexusContainer could not be located.
+ */
+ public void contextualize( Context context ) throws ContextException
+ {
+ container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
}
- else
+
+ private MavenDependencyCollector getMavenDependencyCollector(
ProjectBuildingRequest buildingRequest )
+ throws ComponentLookupException, DependencyCollectionException
{
- org.sonatype.aether.RepositorySystem m30RepositorySystem =
- container.lookup( org.sonatype.aether.RepositorySystem.class );
+ ArtifactHandlerManager artifactHandlerManager = container.lookup(
ArtifactHandlerManager.class );
- org.sonatype.aether.RepositorySystemSession session = Invoker.invoke(
buildingRequest, "getRepositorySession" );
+ if ( isMaven31() )
+ {
+ org.eclipse.aether.RepositorySystem m31RepositorySystem =
container.lookup(
+ org.eclipse.aether.RepositorySystem.class );
- List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories
= Invoker.invoke( RepositoryUtils.class,
- "toRepos", List.class,
- buildingRequest.getRemoteRepositories() );
+ org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
- return new Maven30DependencyCollector( m30RepositorySystem,
artifactHandlerManager, session,
- aetherRepositories );
- }
+ List<org.eclipse.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke(
+ RepositoryUtils.class, "toRepos", List.class,
buildingRequest.getRemoteRepositories() );
- }
+ return new Maven31DependencyCollector( m31RepositorySystem,
artifactHandlerManager, session,
+ aetherRepositories );
+ }
+ else
+ {
+ org.sonatype.aether.RepositorySystem m30RepositorySystem =
container.lookup(
+ org.sonatype.aether.RepositorySystem.class );
+
+ org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
+
+ List<org.sonatype.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke(
+ RepositoryUtils.class, "toRepos", List.class,
buildingRequest.getRemoteRepositories() );
+
+ return new Maven30DependencyCollector( m30RepositorySystem,
artifactHandlerManager, session,
+ aetherRepositories );
+ }
+
+ }
}
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 405c446..5e07349 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
@@ -20,6 +20,7 @@ package org.apache.maven.shared.transfer.collection.internal;
*/
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import
org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException;
import
org.apache.maven.shared.transfer.collection.DependencyCollectionException;
@@ -69,7 +70,10 @@ final class Invoker
{
try
{
- return (T) objectClazz.getMethod( staticMethod, argClazz ).invoke(
null, arg );
+ Method method = objectClazz.getMethod( staticMethod, argClazz );
+ @SuppressWarnings( "unchecked" )
+ T invoke = (T) method.invoke( null, arg );
+ return invoke;
}
catch ( IllegalAccessException e )
{
@@ -100,7 +104,9 @@ final class Invoker
{
try
{
- return (T) objectClazz.getMethod( staticMethod, argClasses
).invoke( null, args );
+ @SuppressWarnings( "unchecked" )
+ T invoke = (T) objectClazz.getMethod( staticMethod, argClasses
).invoke( null, args );
+ return invoke;
}
catch ( IllegalAccessException e )
{
diff --git
a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyCollector.java
b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyCollector.java
index 037d021..5d9032d 100644
---
a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyCollector.java
+++
b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyCollector.java
@@ -26,10 +26,10 @@ import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.model.Model;
-import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
import org.apache.maven.shared.transfer.collection.CollectResult;
import
org.apache.maven.shared.transfer.collection.DependencyCollectionException;
import org.apache.maven.shared.transfer.collection.DependencyCollector;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.artifact.Artifact;
@@ -162,7 +162,6 @@ class Maven30DependencyCollector
Object[] args = new Object[] { mavenDependency, typeRegistry };
- return Invoker
- .invoke( RepositoryUtils.class, "toDependency", argClasses, args );
+ return Invoker.invoke( RepositoryUtils.class, "toDependency",
argClasses, args );
}
}
diff --git
a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
index b2676f5..872c5ff 100644
---
a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
+++
b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
@@ -40,17 +40,17 @@ import
org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
/**
* This DependencyCollector passes the request to the proper Maven 3.x
implementation
- *
+ *
* @author Robert Scholte
*/
@Component( role = DependencyCollector.class, hint = "default" )
-class DefaultDependencyCollector implements DependencyCollector,
Contextualizable
+class DefaultDependencyCollector implements DependencyCollector,
Contextualizable
{
private PlexusContainer container;
@Override
public CollectorResult collectDependencies( ProjectBuildingRequest
buildingRequest, Dependency root )
- throws DependencyCollectorException
+ throws DependencyCollectorException
{
validateParameters( buildingRequest, root );
@@ -66,7 +66,7 @@ class DefaultDependencyCollector implements
DependencyCollector, Contextualizabl
@Override
public CollectorResult collectDependencies( ProjectBuildingRequest
buildingRequest, DependableCoordinate root )
- throws DependencyCollectorException
+ throws DependencyCollectorException
{
validateParameters( buildingRequest, root );
@@ -82,7 +82,7 @@ class DefaultDependencyCollector implements
DependencyCollector, Contextualizabl
@Override
public CollectorResult collectDependencies( ProjectBuildingRequest
buildingRequest, Model root )
- throws DependencyCollectorException
+ throws DependencyCollectorException
{
validateParameters( buildingRequest, root );
@@ -159,45 +159,44 @@ class DefaultDependencyCollector implements
DependencyCollector, Contextualizabl
* @param context Plexus context to inject.
* @throws ContextException if the PlexusContainer could not be located.
*/
- public void contextualize( Context context )
- throws ContextException
+ public void contextualize( Context context ) throws ContextException
{
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
}
-
+
private MavenDependencyCollector getMavenDependencyCollector(
ProjectBuildingRequest buildingRequest )
- throws ComponentLookupException, DependencyCollectorException
+ throws ComponentLookupException, DependencyCollectorException
{
ArtifactHandlerManager artifactHandlerManager = container.lookup(
ArtifactHandlerManager.class );
-
+
if ( isMaven31() )
{
- org.eclipse.aether.RepositorySystem m31RepositorySystem =
- container.lookup( org.eclipse.aether.RepositorySystem.class );
+ org.eclipse.aether.RepositorySystem m31RepositorySystem =
container.lookup(
+ org.eclipse.aether.RepositorySystem.class );
- org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest, "getRepositorySession" );
+ org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
- List<org.eclipse.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke( RepositoryUtils.class, "toRepos",
-
List.class,
-
buildingRequest.getRemoteRepositories() );
+ List<org.eclipse.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke(
+ RepositoryUtils.class, "toRepos", List.class,
buildingRequest.getRemoteRepositories() );
return new Maven31DependencyCollector( m31RepositorySystem,
artifactHandlerManager, session,
- aetherRepositories );
+ aetherRepositories );
}
else
{
- org.sonatype.aether.RepositorySystem m30RepositorySystem =
- container.lookup(
org.sonatype.aether.RepositorySystem.class );
+ org.sonatype.aether.RepositorySystem m30RepositorySystem =
container.lookup(
+ org.sonatype.aether.RepositorySystem.class );
- org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest, "getRepositorySession" );
+ org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
- List<org.sonatype.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke( RepositoryUtils.class,
-
"toRepos", List.class,
-
buildingRequest.getRemoteRepositories() );
+ List<org.sonatype.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke(
+ RepositoryUtils.class, "toRepos", List.class,
buildingRequest.getRemoteRepositories() );
return new Maven30DependencyCollector( m30RepositorySystem,
artifactHandlerManager, session,
- aetherRepositories );
+ aetherRepositories );
}
}
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 efc59a6..5a03346 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
@@ -36,7 +36,8 @@ final class Invoker
public static <T> T invoke( Object object, String method )
throws DependencyCollectorException
{
- return (T) invoke( object.getClass(), object, method );
+ T invoke = invoke( object.getClass(), object, method );
+ return (T) invoke;
}
public static <T> T invoke( Class<?> objectClazz, Object object, String
method )
@@ -44,7 +45,9 @@ final class Invoker
{
try
{
- return (T) objectClazz.getMethod( method ).invoke( object );
+ @SuppressWarnings( "unchecked" )
+ T invoke = (T) objectClazz.getMethod( method ).invoke( object );
+ return invoke;
}
catch ( IllegalAccessException e )
{
@@ -134,32 +137,4 @@ final class Invoker
}
}
- public static Object newInstance( Class<?> objectClazz, Class<?> argClazz,
Object arg )
- throws DependencyCollectorException
- {
- try
- {
- return objectClazz.getConstructor( argClazz ).newInstance( arg );
- }
- catch ( InstantiationException e )
- {
- throw new DependencyCollectorException( e.getMessage(), e );
- }
- catch ( IllegalAccessException e )
- {
- throw new DependencyCollectorException( e.getMessage(), e );
- }
- catch ( IllegalArgumentException 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 );
- }
- }
}
diff --git
a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
index d4a6049..05a63c8 100644
---
a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
+++
b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
@@ -41,27 +41,24 @@ import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
/**
- *
+ *
*/
@Component( role = DependencyResolver.class, hint = "default" )
-class DefaultDependencyResolver
- implements DependencyResolver, Contextualizable
+class DefaultDependencyResolver implements DependencyResolver, Contextualizable
{
private PlexusContainer container;
@Override
public Iterable<ArtifactResult> resolveDependencies(
ProjectBuildingRequest buildingRequest,
-
Collection<Dependency> coordinates,
-
Collection<Dependency> managedDependencies,
- TransformableFilter
filter )
- throws DependencyResolverException
+ Collection<Dependency> coordinates, Collection<Dependency>
managedDependencies, TransformableFilter filter )
+ throws DependencyResolverException
{
validateBuildingRequest( buildingRequest );
-
+
try
{
return getMavenDependencyResolver( buildingRequest
).resolveDependencies( coordinates, managedDependencies,
-
filter );
+ filter );
}
catch ( ComponentLookupException e )
{
@@ -71,8 +68,7 @@ class DefaultDependencyResolver
@Override
public Iterable<ArtifactResult> resolveDependencies(
ProjectBuildingRequest buildingRequest,
- DependableCoordinate
coordinate, TransformableFilter filter )
- throws DependencyResolverException
+ DependableCoordinate coordinate, TransformableFilter filter )
throws DependencyResolverException
{
validateParameters( buildingRequest, coordinate );
try
@@ -87,8 +83,7 @@ class DefaultDependencyResolver
@Override
public Iterable<ArtifactResult> resolveDependencies(
ProjectBuildingRequest buildingRequest, Model model,
- TransformableFilter
filter )
- throws DependencyResolverException
+ TransformableFilter filter ) throws DependencyResolverException
{
validateParameters( buildingRequest, model );
try
@@ -129,8 +124,7 @@ class DefaultDependencyResolver
* @param context Plexus context to inject.
* @throws ContextException if the PlexusContainer could not be located.
*/
- public void contextualize( Context context )
- throws ContextException
+ public void contextualize( Context context ) throws ContextException
{
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY
);
}
@@ -153,43 +147,39 @@ class DefaultDependencyResolver
}
}
-
+
private MavenDependencyResolver getMavenDependencyResolver(
ProjectBuildingRequest buildingRequest )
- throws ComponentLookupException, DependencyResolverException
+ throws ComponentLookupException, DependencyResolverException
{
ArtifactHandlerManager artifactHandlerManager = container.lookup(
ArtifactHandlerManager.class );
-
+
if ( isMaven31() )
{
- org.eclipse.aether.RepositorySystem m31RepositorySystem =
- container.lookup( org.eclipse.aether.RepositorySystem.class );
+ org.eclipse.aether.RepositorySystem m31RepositorySystem =
container.lookup(
+ org.eclipse.aether.RepositorySystem.class );
- org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest, "getRepositorySession" );
+ org.eclipse.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
- List<org.eclipse.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke( RepositoryUtils.class,
-
"toRepos",
-
List.class,
-
buildingRequest.getRemoteRepositories() );
+ List<org.eclipse.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke(
+ RepositoryUtils.class, "toRepos", List.class,
buildingRequest.getRemoteRepositories() );
return new Maven31DependencyResolver( m31RepositorySystem,
artifactHandlerManager, session,
- aetherRepositories );
+ aetherRepositories );
}
else
{
- org.sonatype.aether.RepositorySystem m30RepositorySystem =
- container.lookup( org.sonatype.aether.RepositorySystem.class );
+ org.sonatype.aether.RepositorySystem m30RepositorySystem =
container.lookup(
+ org.sonatype.aether.RepositorySystem.class );
- org.sonatype.aether.RepositorySystemSession session =
- (org.sonatype.aether.RepositorySystemSession) Invoker.invoke(
buildingRequest, "getRepositorySession" );
+ org.sonatype.aether.RepositorySystemSession session =
Invoker.invoke( buildingRequest,
+ "getRepositorySession" );
- List<org.sonatype.aether.repository.RemoteRepository>
aetherRepositories =
- (List<org.sonatype.aether.repository.RemoteRepository>)
Invoker.invoke( RepositoryUtils.class,
-
"toRepos",
-
List.class,
-
buildingRequest.getRemoteRepositories() );
+ List<org.sonatype.aether.repository.RemoteRepository>
aetherRepositories = Invoker.invoke(
+ RepositoryUtils.class, "toRepos", List.class,
buildingRequest.getRemoteRepositories() );
return new Maven30DependencyResolver( m30RepositorySystem,
artifactHandlerManager, session,
- aetherRepositories );
+ aetherRepositories );
}
}
