You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/03/21 20:08:33 UTC
[maven-artifact-transfer] branch MSHARED-864 updated (bb4dd33 ->
24359e0)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MSHARED-864
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git.
discard bb4dd33 Continued refactoring -> Generics ?
discard 6e544b3 Make interfaces package private cause no need to make them public.
discard b46ae26 Removed casts.
discard fcc3831 Removed not needed null check.
discard 449326a Improved type handling via generics
discard 8f59440 Fixed Checkstyle issues.
discard 5e8e07d Furthermore refactoring.
discard 0fdf03a Refactored Step I
add 48fc4e3 Add JDK 14 and JDK 15
new 05af87b Refactored Step I
new 6cb1714 Furthermore refactoring.
new 6347be4 Fixed Checkstyle issues.
new af33274 Improved type handling via generics
new cb7ee7d Removed not needed null check.
new 1c93c34 Removed casts.
new 600176e Make interfaces package private cause no need to make them public.
new d11c9c0 Continued refactoring -> Generics ?
new 24359e0 Reformatting
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (bb4dd33)
\
N -- N -- N refs/heads/MSHARED-864 (24359e0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 2 +-
.../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 ++++----
10 files changed, 211 insertions(+), 246 deletions(-)
[maven-artifact-transfer] 09/09: Reformatting
Posted by kh...@apache.org.
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 <kh...@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 );
}
}
[maven-artifact-transfer] 04/09: Improved type handling via generics
Posted by kh...@apache.org.
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 af3327430b1e545856adecc486b7251a837eaf01
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Mar 14 23:14:57 2020 +0100
Improved type handling via generics
---
.../transfer/dependencies/resolve/internal/Invoker.java | 12 ++++++------
.../dependencies/resolve/internal/Maven30ArtifactResult.java | 2 +-
.../resolve/internal/Maven30DependencyResolver.java | 4 ++--
.../dependencies/resolve/internal/Maven31ArtifactResult.java | 2 +-
.../resolve/internal/Maven31DependencyResolver.java | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
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 3c8619f..f98a0ce 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
@@ -33,10 +33,10 @@ final class Invoker
// do not instantiate
}
- public static Object invoke( Object object, String method )
+ public static <T> T invoke( Object object, String method )
throws DependencyResolverException
{
- return invoke( object.getClass(), object, method );
+ return (T) invoke( object.getClass(), object, method );
}
public static Object invoke( Class<?> objectClazz, Object object, String method )
@@ -82,12 +82,12 @@ final class Invoker
}
}
- public static Object invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
+ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
throws DependencyResolverException
{
try
{
- return objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
+ return (T) objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
}
catch ( IllegalAccessException e )
{
@@ -113,12 +113,12 @@ final class Invoker
* @return the result of the method invocation
* @throws DependencyResolverException if any checked exception occurs
*/
- public static Object invoke( Class<?> objectClazz, String staticMethod, Class<?>[] argClasses, Object[] args )
+ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?>[] argClasses, Object[] args )
throws DependencyResolverException
{
try
{
- return objectClazz.getMethod( staticMethod, argClasses ).invoke( null, args );
+ return (T) objectClazz.getMethod( staticMethod, argClasses ).invoke( null, args );
}
catch ( IllegalAccessException e )
{
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30ArtifactResult.java
index ce1f497..9ba5af8 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30ArtifactResult.java
@@ -48,7 +48,7 @@ class Maven30ArtifactResult
{
try
{
- return (org.apache.maven.artifact.Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ return Invoker.invoke( RepositoryUtils.class, "toArtifact",
Artifact.class, artifactResult.getArtifact() );
}
catch ( DependencyResolverException e )
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
index b50cd56..6210566 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
@@ -95,7 +95,7 @@ class Maven30DependencyResolver
private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
{
- return (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
+ return Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
ArtifactHandlerManager.class, artifactHandlerManager );
}
@@ -254,6 +254,6 @@ class Maven30DependencyResolver
{
Object[] args = new Object[] { mavenDependency, typeRegistry };
- return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", ARG_CLASSES, args );
+ return Invoker.invoke( RepositoryUtils.class, "toDependency", ARG_CLASSES, args );
}
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31ArtifactResult.java
index dba4e8e..fe26ce4 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31ArtifactResult.java
@@ -48,7 +48,7 @@ class Maven31ArtifactResult
{
try
{
- return (org.apache.maven.artifact.Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ return Invoker.invoke( RepositoryUtils.class, "toArtifact",
Artifact.class, artifactResult.getArtifact() );
}
catch ( DependencyResolverException e )
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
index 7a58765..e349cc7 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
@@ -96,7 +96,7 @@ class Maven31DependencyResolver
private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
{
- return (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
+ return Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
ArtifactHandlerManager.class, artifactHandlerManager );
}
@@ -249,6 +249,6 @@ class Maven31DependencyResolver
{
Object[] args = new Object[] { root, typeRegistry };
- return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", ARG_CLASSES, args );
+ return Invoker.invoke( RepositoryUtils.class, "toDependency", ARG_CLASSES, args );
}
}
[maven-artifact-transfer] 02/09: Furthermore refactoring.
Posted by kh...@apache.org.
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 6cb1714cd568c7f365e654681bd32ccdf6c485f4
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Mar 14 22:22:54 2020 +0100
Furthermore refactoring.
---
.../internal/Maven30DependencyResolver.java | 41 ++++---
.../internal/Maven31DependencyResolver.java | 120 +++++++++------------
2 files changed, 71 insertions(+), 90 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
index f1d62e5..b2eac62 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
@@ -58,11 +58,11 @@ class Maven30DependencyResolver
private final RepositorySystem repositorySystem;
private final ArtifactHandlerManager artifactHandlerManager;
-
+
private final RepositorySystemSession session;
-
+
private final List<RemoteRepository> aetherRepositories;
-
+
Maven30DependencyResolver( RepositorySystem repositorySystem, ArtifactHandlerManager artifactHandlerManager,
RepositorySystemSession session, List<RemoteRepository> aetherRepositories )
{
@@ -88,7 +88,15 @@ class Maven30DependencyResolver
return resolveDependencies( dependencyFilter, request );
}
-
+
+ private static final Class<?>[] ARG_CLASSES = new Class<?>[] {org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class};
+
+ private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
+ {
+ return (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
+ ArtifactHandlerManager.class, artifactHandlerManager );
+ }
+
@Override
// CHECKSTYLE_OFF: LineLength
public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( Model model,
@@ -108,11 +116,9 @@ class Maven30DependencyResolver
CollectRequest request = new CollectRequest( aetherRoot, aetherRepositories );
- List<org.apache.maven.model.Dependency> dependencies = model.getDependencies();
- if ( dependencies != null )
+ if ( model.getDependencies() != null )
{
- List<Dependency> aetherDependencies = resolveDependencies( dependencies );
- request.setDependencies( aetherDependencies );
+ request.setDependencies( resolveDependencies( model.getDependencies() ) );
}
DependencyManagement mavenDependencyManagement = model.getDependencyManagement();
@@ -124,15 +130,6 @@ class Maven30DependencyResolver
return resolveDependencies( dependencyFilter, request );
}
- private static final Class<?>[] ARG_CLASSES =
- new Class<?>[] { org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
-
- private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
- {
- return (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class,
- "newArtifactTypeRegistry", ArtifactHandlerManager.class, artifactHandlerManager );
- }
-
/**
* @param mavenDependencies {@link org.apache.maven.model.Dependency} can be {@code null}.
* @return List of resolved dependencies.
@@ -204,8 +201,8 @@ class Maven30DependencyResolver
public Iterator<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> iterator()
{
// CHECKSTYLE_OFF: LineLength
- Collection<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> artResults =
- new ArrayList<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult>( dependencyResults.size() );
+ Collection<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> artResults = new ArrayList<>(
+ dependencyResults.size() );
// CHECKSTYLE_ON: LineLength
for ( ArtifactResult artifactResult : dependencyResults )
@@ -229,9 +226,9 @@ class Maven30DependencyResolver
/**
* Based on RepositoryUtils#toDependency(org.apache.maven.model.Dependency, ArtifactTypeRegistry)
- *
- * @param coordinate
- * @param stereotypes
+ *
+ * @param coordinate {@link DependableCoordinate}
+ * @param stereotypes {@link org.eclipse.aether.artifact.ArtifactTypeRegistry
* @return as Aether Dependency
*/
private static Dependency toDependency( DependableCoordinate coordinate, ArtifactTypeRegistry stereotypes )
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
index 3d23f08..6ac0ff4 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
@@ -19,10 +19,11 @@ package org.apache.maven.shared.transfer.dependencies.resolve.internal;
* under the License.
*/
-import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.ArtifactHandler;
@@ -48,6 +49,7 @@ import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.resolution.DependencyRequest;
import org.eclipse.aether.resolution.DependencyResolutionException;
import org.eclipse.aether.resolution.DependencyResult;
+import org.sonatype.aether.resolution.ArtifactResolutionException;
/**
*
@@ -55,9 +57,9 @@ import org.eclipse.aether.resolution.DependencyResult;
class Maven31DependencyResolver
implements MavenDependencyResolver
{
- private RepositorySystem repositorySystem;
+ private final RepositorySystem repositorySystem;
- private ArtifactHandlerManager artifactHandlerManager;
+ private final ArtifactHandlerManager artifactHandlerManager;
private final RepositorySystemSession session;
@@ -77,12 +79,10 @@ class Maven31DependencyResolver
// CHECKSTYLE_OFF: LineLength
public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( DependableCoordinate coordinate,
TransformableFilter dependencyFilter )
- throws DependencyResolverException
// CHECKSTYLE_ON: LineLength
+ throws DependencyResolverException
{
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
+ ArtifactTypeRegistry typeRegistry = createTypeRegistry();
Dependency aetherRoot = toDependency( coordinate, typeRegistry );
@@ -90,7 +90,15 @@ class Maven31DependencyResolver
return resolveDependencies( dependencyFilter, request );
}
-
+
+ private static final Class<?>[] ARG_CLASSES = new Class<?>[] {org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class};
+
+ private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
+ {
+ return (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
+ ArtifactHandlerManager.class, artifactHandlerManager );
+ }
+
@Override
// CHECKSTYLE_OFF: LineLength
public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( Model model,
@@ -109,83 +117,60 @@ class Maven31DependencyResolver
Dependency aetherRoot = new Dependency( aetherArtifact, null );
CollectRequest request = new CollectRequest( aetherRoot, aetherRepositories );
-
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
-
- List<Dependency> aetherDependencies = new ArrayList<Dependency>( model.getDependencies().size() );
- for ( org.apache.maven.model.Dependency mavenDependency : model.getDependencies() )
+
+ if ( model.getDependencies() != null )
{
- aetherDependencies.add( toDependency( mavenDependency, typeRegistry ) );
+ request.setDependencies( resolveDependencies( model.getDependencies() ) );
}
- request.setDependencies( aetherDependencies );
DependencyManagement mavenDependencyManagement = model.getDependencyManagement();
if ( mavenDependencyManagement != null )
{
- List<Dependency> aetherManagerDependencies =
- new ArrayList<Dependency>( mavenDependencyManagement.getDependencies().size() );
-
- for ( org.apache.maven.model.Dependency mavenDependency : mavenDependencyManagement.getDependencies() )
- {
- aetherManagerDependencies.add( toDependency( mavenDependency, typeRegistry ) );
- }
-
- request.setManagedDependencies( aetherManagerDependencies );
+ request.setManagedDependencies( resolveDependencies( model.getDependencyManagement().getDependencies() ) );
}
return resolveDependencies( dependencyFilter, request );
}
- @Override
+ /**
+ * @param mavenDependencies {@link org.apache.maven.model.Dependency} can be {@code null}.
+ * @return List of resolved dependencies.
+ * @throws DependencyResolverException in case of a failure of the typeRegistry error.
+ */
// CHECKSTYLE_OFF: LineLength
- public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( Collection<org.apache.maven.model.Dependency> mavenDependencies,
- Collection<org.apache.maven.model.Dependency> managedMavenDependencies,
- TransformableFilter filter )
- throws DependencyResolverException
+ private List<Dependency> resolveDependencies(Collection<org.apache.maven.model.Dependency> mavenDependencies) throws
+ DependencyResolverException
// CHECKSTYLE_ON: LineLength
{
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
-
- final Class<?>[] argClasses =
- new Class<?>[] { org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
-
- List<Dependency> aetherDeps = null;
-
- if ( mavenDependencies != null )
+ if ( mavenDependencies == null )
{
- aetherDeps = new ArrayList<Dependency>( mavenDependencies.size() );
+ return Collections.emptyList();
+ }
- for ( org.apache.maven.model.Dependency mavenDependency : mavenDependencies )
- {
- Object[] args = new Object[] { mavenDependency, typeRegistry };
+ ArtifactTypeRegistry typeRegistry = createTypeRegistry();
- Dependency aetherDependency =
- (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
+ List<Dependency> aetherDependencies = new ArrayList<>( mavenDependencies.size() );
- aetherDeps.add( aetherDependency );
- }
+ for ( org.apache.maven.model.Dependency mavenDependency : mavenDependencies )
+ {
+ aetherDependencies.add( toDependency( mavenDependency, typeRegistry ) );
}
- List<Dependency> aetherManagedDependencies = null;
-
- if ( managedMavenDependencies != null )
- {
- aetherManagedDependencies = new ArrayList<Dependency>( managedMavenDependencies.size() );
+ return aetherDependencies;
+ }
- for ( org.apache.maven.model.Dependency mavenDependency : managedMavenDependencies )
- {
- Object[] args = new Object[] { mavenDependency, typeRegistry };
+ @Override
+ // CHECKSTYLE_OFF: LineLength
+ public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( Collection<org.apache.maven.model.Dependency> mavenDependencies,
+ Collection<org.apache.maven.model.Dependency> managedMavenDependencies,
+ TransformableFilter filter )
+ // CHECKSTYLE_ON: LineLength
+ throws DependencyResolverException
+ {
- Dependency aetherDependency =
- (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
+ List<Dependency> aetherDeps = resolveDependencies( mavenDependencies );
- aetherManagedDependencies.add( aetherDependency );
- }
- }
+ List<Dependency> aetherManagedDependencies = resolveDependencies( managedMavenDependencies );
CollectRequest request = new CollectRequest( aetherDeps, aetherManagedDependencies, aetherRepositories );
@@ -193,9 +178,10 @@ class Maven31DependencyResolver
}
// CHECKSTYLE_OFF: LineLength
- private Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( TransformableFilter dependencyFilter,
- CollectRequest request )
- throws DependencyResolverException
+ private Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies(
+ TransformableFilter dependencyFilter,
+ CollectRequest request
+ ) throws DependencyResolverException
// CHECKSTYLE_ON: LineLength
{
try
@@ -261,10 +247,8 @@ class Maven31DependencyResolver
private static Dependency toDependency( org.apache.maven.model.Dependency root, ArtifactTypeRegistry typeRegistry )
throws DependencyResolverException
{
- Class<?>[] argClasses = new Class<?>[] { org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
-
Object[] args = new Object[] { root, typeRegistry };
- return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
+ return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", ARG_CLASSES, args );
}
}
[maven-artifact-transfer] 03/09: Fixed Checkstyle issues.
Posted by kh...@apache.org.
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 6347be4cf7dd4199b2d6b620b63c510bbf976da4
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Mar 14 22:49:25 2020 +0100
Fixed Checkstyle issues.
---
.../resolve/internal/Maven30DependencyResolver.java | 16 +++++++++-------
.../resolve/internal/Maven31DependencyResolver.java | 20 ++++++++++----------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
index b2eac62..b50cd56 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
@@ -19,12 +19,6 @@ package org.apache.maven.shared.transfer.dependencies.resolve.internal;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -49,6 +43,12 @@ import org.sonatype.aether.resolution.ArtifactResult;
import org.sonatype.aether.util.artifact.DefaultArtifact;
import org.sonatype.aether.util.artifact.DefaultArtifactType;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
/**
*
*/
@@ -89,7 +89,9 @@ class Maven30DependencyResolver
return resolveDependencies( dependencyFilter, request );
}
- private static final Class<?>[] ARG_CLASSES = new Class<?>[] {org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class};
+ private static final Class<?>[] ARG_CLASSES = new Class<?>[] {
+ org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class
+ };
private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
{
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
index 6ac0ff4..7a58765 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
@@ -19,12 +19,6 @@ package org.apache.maven.shared.transfer.dependencies.resolve.internal;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -49,7 +43,12 @@ import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.resolution.DependencyRequest;
import org.eclipse.aether.resolution.DependencyResolutionException;
import org.eclipse.aether.resolution.DependencyResult;
-import org.sonatype.aether.resolution.ArtifactResolutionException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
/**
*
@@ -91,7 +90,9 @@ class Maven31DependencyResolver
return resolveDependencies( dependencyFilter, request );
}
- private static final Class<?>[] ARG_CLASSES = new Class<?>[] {org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class};
+ private static final Class<?>[] ARG_CLASSES = new Class<?>[] {
+ org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class
+ };
private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
{
@@ -138,8 +139,7 @@ class Maven31DependencyResolver
* @throws DependencyResolverException in case of a failure of the typeRegistry error.
*/
// CHECKSTYLE_OFF: LineLength
- private List<Dependency> resolveDependencies(Collection<org.apache.maven.model.Dependency> mavenDependencies) throws
- DependencyResolverException
+ private List<Dependency> resolveDependencies( Collection<org.apache.maven.model.Dependency> mavenDependencies ) throws DependencyResolverException
// CHECKSTYLE_ON: LineLength
{
if ( mavenDependencies == null )
[maven-artifact-transfer] 07/09: Make interfaces package private
cause no need to make them public.
Posted by kh...@apache.org.
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 600176ee07d5849ab1ba44c27b616d5e5309554a
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 15 17:13:21 2020 +0100
Make interfaces package private cause no need to make them public.
---
.../shared/transfer/artifact/deploy/internal/MavenArtifactDeployer.java | 2 +-
.../transfer/artifact/install/internal/MavenArtifactInstaller.java | 2 +-
.../transfer/artifact/resolve/internal/MavenArtifactResolver.java | 2 +-
.../shared/transfer/collection/internal/MavenDependencyCollector.java | 2 +-
.../dependencies/collect/internal/MavenDependencyCollector.java | 2 +-
.../transfer/dependencies/resolve/internal/MavenDependencyResolver.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/MavenArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/MavenArtifactDeployer.java
index c4f0446..8f9fea1 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/MavenArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/MavenArtifactDeployer.java
@@ -30,7 +30,7 @@ import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerExceptio
* @author Robert Scholte
*
*/
-public interface MavenArtifactDeployer
+interface MavenArtifactDeployer
{
void deploy( Collection<Artifact> mavenArtifacts )
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/MavenArtifactInstaller.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/MavenArtifactInstaller.java
index 7670d57..6d6509d 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/MavenArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/MavenArtifactInstaller.java
@@ -29,7 +29,7 @@ import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerExcept
* @author Robert Scholte
*
*/
-public interface MavenArtifactInstaller
+interface MavenArtifactInstaller
{
void install( Collection<Artifact> mavenArtifacts )
throws ArtifactInstallerException;
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/MavenArtifactResolver.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/MavenArtifactResolver.java
index 2e9fb74..2413968 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/MavenArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/MavenArtifactResolver.java
@@ -29,7 +29,7 @@ import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult;
* @author Robert Scholte
*
*/
-public interface MavenArtifactResolver
+interface MavenArtifactResolver
{
ArtifactResult resolveArtifact( Artifact mavenArtifact ) throws ArtifactResolverException;
diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/MavenDependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/MavenDependencyCollector.java
index 2181380..fc7edb8 100644
--- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/MavenDependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/MavenDependencyCollector.java
@@ -28,7 +28,7 @@ import org.apache.maven.shared.transfer.collection.DependencyCollectionException
/**
* @author Robert Scholte
*/
-public interface MavenDependencyCollector
+interface MavenDependencyCollector
{
CollectResult collectDependencies( Dependency root )
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/MavenDependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/MavenDependencyCollector.java
index 53823f8..ce647f5 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/MavenDependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/MavenDependencyCollector.java
@@ -29,7 +29,7 @@ import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollector
*
* @author Robert Scholte
*/
-public interface MavenDependencyCollector
+interface MavenDependencyCollector
{
CollectorResult collectDependencies( Dependency root )
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/MavenDependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/MavenDependencyResolver.java
index da0222d..8652207 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/MavenDependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/MavenDependencyResolver.java
@@ -33,7 +33,7 @@ import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverE
* @author Robert Scholte
*
*/
-public interface MavenDependencyResolver
+interface MavenDependencyResolver
{
Iterable<ArtifactResult> resolveDependencies( DependableCoordinate coordinate,
[maven-artifact-transfer] 05/09: Removed not needed null check.
Posted by kh...@apache.org.
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 cb7ee7d5ea57d4dcd3e1176a4028b3222a40c2fc
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 15 13:37:27 2020 +0100
Removed not needed null check.
---
.../dependencies/resolve/internal/Maven30DependencyResolver.java | 5 +----
.../dependencies/resolve/internal/Maven31DependencyResolver.java | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
index 6210566..3b04c47 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
@@ -118,10 +118,7 @@ class Maven30DependencyResolver
CollectRequest request = new CollectRequest( aetherRoot, aetherRepositories );
- if ( model.getDependencies() != null )
- {
- request.setDependencies( resolveDependencies( model.getDependencies() ) );
- }
+ request.setDependencies( resolveDependencies( model.getDependencies() ) );
DependencyManagement mavenDependencyManagement = model.getDependencyManagement();
if ( mavenDependencyManagement != null )
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
index e349cc7..ad7c82b 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
@@ -119,10 +119,7 @@ class Maven31DependencyResolver
CollectRequest request = new CollectRequest( aetherRoot, aetherRepositories );
- if ( model.getDependencies() != null )
- {
- request.setDependencies( resolveDependencies( model.getDependencies() ) );
- }
+ request.setDependencies( resolveDependencies( model.getDependencies() ) );
DependencyManagement mavenDependencyManagement = model.getDependencyManagement();
if ( mavenDependencyManagement != null )
[maven-artifact-transfer] 06/09: Removed casts.
Posted by kh...@apache.org.
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 1c93c340d7cc9b49717f392776817f6a35686b5d
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 15 15:18:16 2020 +0100
Removed casts.
---
.../maven/shared/transfer/artifact/resolve/internal/Invoker.java | 4 ++--
.../transfer/artifact/resolve/internal/Maven30ArtifactResolver.java | 2 +-
.../transfer/artifact/resolve/internal/Maven30ArtifactResult.java | 2 +-
.../transfer/artifact/resolve/internal/Maven31ArtifactResolver.java | 2 +-
.../transfer/artifact/resolve/internal/Maven31ArtifactResult.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
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 d3ff34e..a398f9e 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
@@ -82,12 +82,12 @@ final class Invoker
}
}
- public static Object invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
+ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
throws ArtifactResolverException
{
try
{
- return objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
+ return (T) objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
}
catch ( IllegalAccessException 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 e5f820c..cdc3308 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
@@ -61,7 +61,7 @@ class Maven30ArtifactResolver
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
{
- Artifact aetherArtifact = (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ Artifact aetherArtifact = Invoker.invoke( RepositoryUtils.class, "toArtifact",
org.apache.maven.artifact.Artifact.class, mavenArtifact );
return resolveArtifact( aetherArtifact );
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java
index 8358096..d4d1cbe 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java
@@ -48,7 +48,7 @@ class Maven30ArtifactResult
{
try
{
- return (org.apache.maven.artifact.Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ return Invoker.invoke( RepositoryUtils.class, "toArtifact",
Artifact.class, artifactResult.getArtifact() );
}
catch ( ArtifactResolverException 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 888a683..ba1a419 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
@@ -61,7 +61,7 @@ class Maven31ArtifactResolver
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
{
- Artifact aetherArtifact = (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ Artifact aetherArtifact = Invoker.invoke( RepositoryUtils.class, "toArtifact",
org.apache.maven.artifact.Artifact.class, mavenArtifact );
return resolveArtifact( aetherArtifact );
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResult.java
index 055ee22..7b56826 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResult.java
@@ -48,7 +48,7 @@ class Maven31ArtifactResult
{
try
{
- return (org.apache.maven.artifact.Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ return Invoker.invoke( RepositoryUtils.class, "toArtifact",
Artifact.class, artifactResult.getArtifact() );
}
catch ( ArtifactResolverException e )
[maven-artifact-transfer] 08/09: Continued refactoring -> Generics ?
Posted by kh...@apache.org.
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 d11c9c0daa6e6e16b0a4def3e1ac8a90e9cc0d15
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 15 21:47:25 2020 +0100
Continued refactoring -> Generics ?
---
pom.xml | 11 ++++
.../deploy/internal/DefaultArtifactDeployer.java | 6 +-
.../transfer/artifact/deploy/internal/Invoker.java | 34 ++---------
.../deploy/internal/Maven30ArtifactDeployer.java | 7 +--
.../deploy/internal/Maven31ArtifactDeployer.java | 7 +--
.../install/internal/DefaultArtifactInstaller.java | 6 +-
.../artifact/install/internal/Invoker.java | 34 ++---------
.../install/internal/Maven30ArtifactInstaller.java | 5 +-
.../install/internal/Maven31ArtifactInstaller.java | 5 +-
.../resolve/internal/DefaultArtifactResolver.java | 26 ++++----
.../artifact/resolve/internal/Invoker.java | 30 ++--------
.../internal/DefaultDependencyCollector.java | 22 +++----
.../transfer/collection/internal/Invoker.java | 69 ++++------------------
.../internal/Maven30DependencyCollector.java | 16 +++--
.../internal/Maven30DependencyNodeAdapter.java | 2 +-
.../internal/Maven31DependencyCollector.java | 16 +++--
.../internal/Maven31DependencyNodeAdapter.java | 2 +-
.../internal/DefaultDependencyCollector.java | 22 +++----
.../dependencies/collect/internal/Invoker.java | 12 ++--
.../internal/DefaultDependencyResolver.java | 14 ++---
.../dependencies/resolve/internal/Invoker.java | 4 +-
21 files changed, 108 insertions(+), 242 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1bcca0b..371c954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,17 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+<!-- <showDeprecation>true</showDeprecation>-->
+ <compilerArgs>
+<!-- <arg>-Xlint:deprecation</arg>-->
+ <arg>-Xlint:unchecked</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<executions>
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 c6f2858..3d977c3 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
@@ -134,8 +134,7 @@ class DefaultArtifactDeployer
org.eclipse.aether.RepositorySystem repositorySystem =
container.lookup( org.eclipse.aether.RepositorySystem.class );
- org.eclipse.aether.RepositorySystemSession session =
- (org.eclipse.aether.RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
+ org.eclipse.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest, "getRepositorySession" );
return new Maven31ArtifactDeployer( repositorySystem, session );
}
@@ -144,8 +143,7 @@ class DefaultArtifactDeployer
org.sonatype.aether.RepositorySystem repositorySystem =
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" );
return new Maven30ArtifactDeployer( repositorySystem, session );
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Invoker.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Invoker.java
index 1102163..be93619 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Invoker.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Invoker.java
@@ -33,18 +33,18 @@ final class Invoker
// do not instantiate
}
- public static Object invoke( Object object, String method )
+ public static <T> T invoke( Object object, String method )
throws ArtifactDeployerException
{
- return invoke( object.getClass(), object, method );
+ return (T) invoke( object.getClass(), object, method );
}
- public static Object invoke( Class<?> objectClazz, Object object, String method )
+ public static <T> T invoke( Class<?> objectClazz, Object object, String method )
throws ArtifactDeployerException
{
try
{
- return objectClazz.getMethod( method ).invoke( object );
+ return (T) objectClazz.getMethod( method ).invoke( object );
}
catch ( IllegalAccessException e )
{
@@ -60,34 +60,12 @@ final class Invoker
}
}
- public static Object invoke( Object object, String method, Class<?> clazz, Object arg )
- throws ArtifactDeployerException
- {
- try
- {
- 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 )
- {
- throw new ArtifactDeployerException( e.getMessage(), e );
- }
- }
-
- public static Object invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
+ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
throws ArtifactDeployerException
{
try
{
- return objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
+ return (T) objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
}
catch ( IllegalAccessException e )
{
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java
index e8ef395..06a7c93 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java
@@ -78,9 +78,8 @@ class Maven30ArtifactDeployer
// transform artifacts
for ( org.apache.maven.artifact.Artifact mavenArtifact : mavenArtifacts )
{
- Artifact aetherArtifact =
- (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
- org.apache.maven.artifact.Artifact.class, mavenArtifact );
+ Artifact aetherArtifact = Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ org.apache.maven.artifact.Artifact.class, mavenArtifact );
request.addArtifact( aetherArtifact );
RemoteRepository aetherRepository;
@@ -133,7 +132,7 @@ class Maven30ArtifactDeployer
throws ArtifactDeployerException
{
// CHECKSTYLE_OFF: LineLength
- RemoteRepository aetherRepo = (RemoteRepository) Invoker.invoke( RepositoryUtils.class, "toRepo",
+ RemoteRepository aetherRepo = Invoker.invoke( RepositoryUtils.class, "toRepo",
ArtifactRepository.class,
remoteRepository );
// CHECKSTYLE_ON: LineLength
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java
index 52c7295..f3bf542 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java
@@ -79,9 +79,8 @@ class Maven31ArtifactDeployer
// transform artifacts
for ( org.apache.maven.artifact.Artifact mavenArtifact : mavenArtifacts )
{
- Artifact aetherArtifact =
- (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
- org.apache.maven.artifact.Artifact.class, mavenArtifact );
+ Artifact aetherArtifact = Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ org.apache.maven.artifact.Artifact.class, mavenArtifact );
request.addArtifact( aetherArtifact );
RemoteRepository aetherRepository;
@@ -134,7 +133,7 @@ class Maven31ArtifactDeployer
throws ArtifactDeployerException
{
// CHECKSTYLE_OFF: LineLength
- RemoteRepository aetherRepo = (RemoteRepository) Invoker.invoke( RepositoryUtils.class, "toRepo",
+ RemoteRepository aetherRepo = Invoker.invoke( RepositoryUtils.class, "toRepo",
ArtifactRepository.class,
remoteRepository );
// CHECKSTYLE_ON: LineLength
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 f8a56f7..58e3a9e 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
@@ -148,8 +148,7 @@ class DefaultArtifactInstaller
org.eclipse.aether.RepositorySystem repositorySystem =
container.lookup( org.eclipse.aether.RepositorySystem.class );
- org.eclipse.aether.RepositorySystemSession session =
- (org.eclipse.aether.RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
+ org.eclipse.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest, "getRepositorySession" );
return new Maven31ArtifactInstaller( repositorySystem, session );
}
@@ -158,8 +157,7 @@ class DefaultArtifactInstaller
org.sonatype.aether.RepositorySystem repositorySystem =
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" );
return new Maven30ArtifactInstaller( repositorySystem, session );
}
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 f748e04..d1389ec 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
@@ -33,18 +33,18 @@ final class Invoker
// do not instantiate
}
- public static Object invoke( Object object, String method )
+ public static <T> T invoke( Object object, String method )
throws ArtifactInstallerException
{
- return invoke( object.getClass(), object, method );
+ return (T) invoke( object.getClass(), object, method );
}
- public static Object invoke( Class<?> objectClazz, Object object, String method )
+ public static <T> T invoke( Class<?> objectClazz, Object object, String method )
throws ArtifactInstallerException
{
try
{
- return objectClazz.getMethod( method ).invoke( object );
+ return (T) objectClazz.getMethod( method ).invoke( object );
}
catch ( IllegalAccessException e )
{
@@ -60,34 +60,12 @@ final class Invoker
}
}
- public static Object invoke( Object object, String method, Class<?> argClazz, Object arg )
+ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
throws ArtifactInstallerException
{
try
{
- 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 )
- {
- throw new ArtifactInstallerException( e.getMessage(), e );
- }
- }
-
- public static Object invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
- throws ArtifactInstallerException
- {
- try
- {
- return objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
+ return (T) objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
}
catch ( IllegalAccessException e )
{
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstaller.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstaller.java
index 2a15dfd..fbff698 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstaller.java
@@ -60,9 +60,8 @@ class Maven30ArtifactInstaller
// transform artifacts
for ( org.apache.maven.artifact.Artifact mavenArtifact : mavenArtifacts )
{
- Artifact mainArtifact =
- (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
- org.apache.maven.artifact.Artifact.class, mavenArtifact );
+ Artifact mainArtifact = Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ org.apache.maven.artifact.Artifact.class, mavenArtifact );
request.addArtifact( mainArtifact );
for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven31ArtifactInstaller.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven31ArtifactInstaller.java
index e4eae74..aa15504 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven31ArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven31ArtifactInstaller.java
@@ -61,9 +61,8 @@ class Maven31ArtifactInstaller
// transform artifacts
for ( org.apache.maven.artifact.Artifact mavenArtifact : mavenArtifacts )
{
- Artifact mainArtifact =
- (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
- org.apache.maven.artifact.Artifact.class, mavenArtifact );
+ Artifact mainArtifact = Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ org.apache.maven.artifact.Artifact.class, mavenArtifact );
request.addArtifact( mainArtifact );
for ( ArtifactMetadata metadata : mavenArtifact.getMetadataList() )
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 9f1826b..12c3ece 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
@@ -142,14 +142,11 @@ class DefaultArtifactResolver
org.eclipse.aether.RepositorySystem repositorySystem =
container.lookup( org.eclipse.aether.RepositorySystem.class );
- @SuppressWarnings( "unchecked" )
- List<org.eclipse.aether.repository.RemoteRepository> aetherRepositories =
- (List<org.eclipse.aether.repository.RemoteRepository>) Invoker.invoke( RepositoryUtils.class, "toRepos",
- List.class,
- buildingRequest.getRemoteRepositories() );
-
- org.eclipse.aether.RepositorySystemSession session =
- (org.eclipse.aether.RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
+ 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 );
@@ -159,14 +156,11 @@ class DefaultArtifactResolver
org.sonatype.aether.RepositorySystem repositorySystem =
container.lookup( org.sonatype.aether.RepositorySystem.class );
- @SuppressWarnings( "unchecked" )
- List<org.sonatype.aether.repository.RemoteRepository> aetherRepositories =
- (List<org.sonatype.aether.repository.RemoteRepository>) Invoker.invoke( RepositoryUtils.class,
- "toRepos", List.class,
- buildingRequest.getRemoteRepositories() );
-
- org.sonatype.aether.RepositorySystemSession session =
- (org.sonatype.aether.RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
+ 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/artifact/resolve/internal/Invoker.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Invoker.java
index a398f9e..ebbea34 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
@@ -33,40 +33,18 @@ final class Invoker
// do not instantiate
}
- public static Object invoke( Object object, String method )
+ public static <T> T invoke( Object object, String method )
throws ArtifactResolverException
{
- return invoke( object.getClass(), object, method );
+ return (T) invoke( object.getClass(), object, method );
}
- public static Object invoke( Class<?> objectClazz, Object object, String method )
+ public static <T> T invoke( Class<?> objectClazz, Object object, String method )
throws ArtifactResolverException
{
try
{
- 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 )
- {
- throw new ArtifactResolverException( e.getMessage(), e );
- }
- }
-
- public static Object invoke( Object object, String method, Class<?> argClazz, Object arg )
- throws ArtifactResolverException
- {
- try
- {
- final Class<?> objectClazz = object.getClass();
- return objectClazz.getMethod( method, argClazz ).invoke( object, arg );
+ return (T) objectClazz.getMethod( method ).invoke( object );
}
catch ( IllegalAccessException e )
{
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 62a8fb2..449eb99 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
@@ -164,14 +164,11 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
org.eclipse.aether.RepositorySystem m31RepositorySystem =
container.lookup( org.eclipse.aether.RepositorySystem.class );
- org.eclipse.aether.RepositorySystemSession session =
- (org.eclipse.aether.RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
+ org.eclipse.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest, "getRepositorySession" );
- @SuppressWarnings( "unchecked" )
- List<org.eclipse.aether.repository.RemoteRepository> aetherRepositories =
- (List<org.eclipse.aether.repository.RemoteRepository>) 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 );
@@ -181,14 +178,11 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
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" );
- @SuppressWarnings( "unchecked" )
- 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 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 31951f8..405c446 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
@@ -34,18 +34,21 @@ final class Invoker
// do not instantiate
}
- public static Object invoke( Object object, String method )
+ public static <T> T invoke( Object object, String method )
throws DependencyCollectionException
{
- return invoke( object.getClass(), object, method );
+ @SuppressWarnings( "unchecked" )
+ T invoke = (T) invoke( object.getClass(), object, method );
+ return invoke;
}
- public static Object invoke( Class<?> objectClazz, Object object, String method )
+ @SuppressWarnings( "unchecked" )
+ public static <T> T invoke( Class<?> objectClazz, Object object, String method )
throws DependencyCollectionException
{
try
{
- return objectClazz.getMethod( method ).invoke( object );
+ return (T) objectClazz.getMethod( method ).invoke( object );
}
catch ( IllegalAccessException e )
{
@@ -61,34 +64,12 @@ final class Invoker
}
}
- public static Object invoke( Object object, String method, Class<?> argClazz, Object arg )
- throws DependencyCollectionException
- {
- try
- {
- final Class<?> objectClazz = object.getClass();
- return objectClazz.getMethod( method, argClazz ).invoke( object, arg );
- }
- catch ( IllegalAccessException e )
- {
- throw new DependencyCollectionException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new DependencyCollectionException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
- {
- throw new DependencyCollectionException( e.getMessage(), e );
- }
- }
-
- public static Object invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
+ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
throws DependencyCollectionException
{
try
{
- return objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
+ return (T) objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
}
catch ( IllegalAccessException e )
{
@@ -114,12 +95,12 @@ final class Invoker
* @return the result of the method invocation
* @throws DependencyCollectorException if any checked exception occurs
*/
- public static Object invoke( Class<?> objectClazz, String staticMethod, Class<?>[] argClasses, Object[] args )
+ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?>[] argClasses, Object[] args )
throws DependencyCollectionException
{
try
{
- return objectClazz.getMethod( staticMethod, argClasses ).invoke( null, args );
+ return (T) objectClazz.getMethod( staticMethod, argClasses ).invoke( null, args );
}
catch ( IllegalAccessException e )
{
@@ -135,32 +116,4 @@ final class Invoker
}
}
- public static Object newInstance( Class<?> objectClazz, Class<?> argClazz, Object arg )
- throws DependencyCollectionException
- {
- try
- {
- return objectClazz.getConstructor( argClazz ).newInstance( arg );
- }
- catch ( InstantiationException e )
- {
- throw new DependencyCollectionException( e.getMessage(), e );
- }
- catch ( IllegalAccessException e )
- {
- throw new DependencyCollectionException( e.getMessage(), e );
- }
- catch ( IllegalArgumentException e )
- {
- throw new DependencyCollectionException( e.getMessage(), e );
- }
- catch ( InvocationTargetException e )
- {
- throw new DependencyCollectionException( e.getMessage(), e );
- }
- catch ( NoSuchMethodException e )
- {
- throw new DependencyCollectionException( e.getMessage(), 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 67e3556..037d021 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
@@ -70,10 +70,9 @@ class Maven30DependencyCollector
public CollectResult collectDependencies( org.apache.maven.model.Dependency root )
throws DependencyCollectionException
{
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker
- .invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
+ ArtifactTypeRegistry typeRegistry = Invoker
+ .invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
+ ArtifactHandlerManager.class, artifactHandlerManager );
CollectRequest request = new CollectRequest();
request.setRoot( toDependency( root, typeRegistry ) );
@@ -113,10 +112,9 @@ class Maven30DependencyCollector
CollectRequest request = new CollectRequest();
request.setRoot( new Dependency( aetherArtifact, null ) );
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker
- .invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
+ ArtifactTypeRegistry typeRegistry = Invoker
+ .invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
+ ArtifactHandlerManager.class, artifactHandlerManager );
List<Dependency> aetherDependencies = new ArrayList<Dependency>( root.getDependencies().size() );
for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencies() )
@@ -164,7 +162,7 @@ class Maven30DependencyCollector
Object[] args = new Object[] { mavenDependency, typeRegistry };
- return (Dependency) Invoker
+ return Invoker
.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
}
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyNodeAdapter.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyNodeAdapter.java
index 052353f..b8e6ea9 100644
--- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyNodeAdapter.java
+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyNodeAdapter.java
@@ -152,7 +152,7 @@ class Maven30DependencyNodeAdapter implements DependencyNode
{
try
{
- return (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ return Invoker.invoke( RepositoryUtils.class, "toArtifact",
org.sonatype.aether.artifact.Artifact.class, aetherArtifact );
}
catch ( DependencyCollectionException e )
diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyCollector.java
index b6c5744..ef5057b 100644
--- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyCollector.java
@@ -70,10 +70,9 @@ class Maven31DependencyCollector
public CollectResult collectDependencies( org.apache.maven.model.Dependency root )
throws DependencyCollectionException
{
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker
- .invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
+ ArtifactTypeRegistry typeRegistry = Invoker
+ .invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
+ ArtifactHandlerManager.class, artifactHandlerManager );
CollectRequest request = new CollectRequest();
request.setRoot( toDependency( root, typeRegistry ) );
@@ -113,10 +112,9 @@ class Maven31DependencyCollector
CollectRequest request = new CollectRequest();
request.setRoot( new Dependency( aetherArtifact, null ) );
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker
- .invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
+ ArtifactTypeRegistry typeRegistry = Invoker
+ .invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
+ ArtifactHandlerManager.class, artifactHandlerManager );
List<Dependency> aetherDependencies = new ArrayList<Dependency>( root.getDependencies().size() );
for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencies() )
@@ -163,7 +161,7 @@ class Maven31DependencyCollector
Object[] args = new Object[] { root, typeRegistry };
- return (Dependency) Invoker
+ return Invoker
.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyNodeAdapter.java b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyNodeAdapter.java
index 3b3dbb7..5987f7f 100644
--- a/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyNodeAdapter.java
+++ b/src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyNodeAdapter.java
@@ -152,7 +152,7 @@ class Maven31DependencyNodeAdapter implements DependencyNode
{
try
{
- return (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+ return Invoker.invoke( RepositoryUtils.class, "toArtifact",
org.eclipse.aether.artifact.Artifact.class, aetherArtifact );
}
catch ( DependencyCollectionException e )
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 3d50a66..b2676f5 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
@@ -175,14 +175,11 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
org.eclipse.aether.RepositorySystem m31RepositorySystem =
container.lookup( org.eclipse.aether.RepositorySystem.class );
- org.eclipse.aether.RepositorySystemSession session =
- (org.eclipse.aether.RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
+ org.eclipse.aether.RepositorySystemSession session = Invoker.invoke( buildingRequest, "getRepositorySession" );
- @SuppressWarnings( "unchecked" )
- List<org.eclipse.aether.repository.RemoteRepository> aetherRepositories =
- (List<org.eclipse.aether.repository.RemoteRepository>) 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 );
@@ -193,14 +190,11 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl
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" );
- @SuppressWarnings( "unchecked" )
- 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 Maven30DependencyCollector( m30RepositorySystem, artifactHandlerManager, session,
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 01a8410..efc59a6 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
@@ -33,18 +33,18 @@ final class Invoker
// do not instantiate
}
- public static Object invoke( Object object, String method )
+ public static <T> T invoke( Object object, String method )
throws DependencyCollectorException
{
- return invoke( object.getClass(), object, method );
+ return (T) invoke( object.getClass(), object, method );
}
- public static Object invoke( Class<?> objectClazz, Object object, String method )
+ public static <T> T invoke( Class<?> objectClazz, Object object, String method )
throws DependencyCollectorException
{
try
{
- return objectClazz.getMethod( method ).invoke( object );
+ return (T) objectClazz.getMethod( method ).invoke( object );
}
catch ( IllegalAccessException e )
{
@@ -82,12 +82,12 @@ final class Invoker
}
}
- public static Object invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
+ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?> argClazz, Object arg )
throws DependencyCollectorException
{
try
{
- return objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
+ return (T) objectClazz.getMethod( staticMethod, argClazz ).invoke( null, arg );
}
catch ( IllegalAccessException 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 19faa28..d4a6049 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
@@ -164,14 +164,12 @@ class DefaultDependencyResolver
org.eclipse.aether.RepositorySystem m31RepositorySystem =
container.lookup( org.eclipse.aether.RepositorySystem.class );
- org.eclipse.aether.RepositorySystemSession session =
- (org.eclipse.aether.RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" );
-
- List<org.eclipse.aether.repository.RemoteRepository> aetherRepositories =
- (List<org.eclipse.aether.repository.RemoteRepository>) Invoker.invoke( RepositoryUtils.class,
- "toRepos",
- List.class,
- buildingRequest.getRemoteRepositories() );
+ 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() );
return new Maven31DependencyResolver( m31RepositorySystem, artifactHandlerManager, session,
aetherRepositories );
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 f98a0ce..e20ea96 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
@@ -39,12 +39,12 @@ final class Invoker
return (T) invoke( object.getClass(), object, method );
}
- public static Object invoke( Class<?> objectClazz, Object object, String method )
+ public static <T> T invoke( Class<?> objectClazz, Object object, String method )
throws DependencyResolverException
{
try
{
- return objectClazz.getMethod( method ).invoke( object );
+ return (T) objectClazz.getMethod( method ).invoke( object );
}
catch ( IllegalAccessException e )
{
[maven-artifact-transfer] 01/09: Refactored Step I
Posted by kh...@apache.org.
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 05af87bd3cc55c9800d561606399a7d20f6b978f
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Mar 14 19:36:15 2020 +0100
Refactored Step I
---
.../internal/Maven30DependencyResolver.java | 119 +++++++++------------
1 file changed, 52 insertions(+), 67 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
index b70a7f0..f1d62e5 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
@@ -21,6 +21,7 @@ package org.apache.maven.shared.transfer.dependencies.resolve.internal;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -33,7 +34,6 @@ import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
import org.apache.maven.shared.artifact.filter.resolve.transform.SonatypeAetherFilterTransformer;
import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
-
import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.artifact.Artifact;
@@ -80,9 +80,7 @@ class Maven30DependencyResolver
// CHECKSTYLE_ON: LineLength
throws DependencyResolverException
{
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
+ ArtifactTypeRegistry typeRegistry = createTypeRegistry();
Dependency aetherRoot = toDependency( coordinate, typeRegistry );
@@ -109,94 +107,83 @@ class Maven30DependencyResolver
Dependency aetherRoot = new Dependency( aetherArtifact, null );
CollectRequest request = new CollectRequest( aetherRoot, aetherRepositories );
-
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
- List<Dependency> aetherDependencies = new ArrayList<Dependency>( model.getDependencies().size() );
- for ( org.apache.maven.model.Dependency mavenDependency : model.getDependencies() )
+ List<org.apache.maven.model.Dependency> dependencies = model.getDependencies();
+ if ( dependencies != null )
{
- aetherDependencies.add( toDependency( mavenDependency, typeRegistry ) );
+ List<Dependency> aetherDependencies = resolveDependencies( dependencies );
+ request.setDependencies( aetherDependencies );
}
- request.setDependencies( aetherDependencies );
DependencyManagement mavenDependencyManagement = model.getDependencyManagement();
if ( mavenDependencyManagement != null )
{
- List<Dependency> aetherManagerDependencies =
- new ArrayList<Dependency>( mavenDependencyManagement.getDependencies().size() );
-
- for ( org.apache.maven.model.Dependency mavenDependency : mavenDependencyManagement.getDependencies() )
- {
- aetherManagerDependencies.add( toDependency( mavenDependency, typeRegistry ) );
- }
-
- request.setManagedDependencies( aetherManagerDependencies );
+ request.setManagedDependencies( resolveDependencies( mavenDependencyManagement.getDependencies() ) );
}
return resolveDependencies( dependencyFilter, request );
}
- @Override
- // CHECKSTYLE_OFF: LineLength
- public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( Collection<org.apache.maven.model.Dependency> mavenDependencies,
- Collection<org.apache.maven.model.Dependency> managedMavenDependencies,
- TransformableFilter filter )
- // CHECKSTYLE_ON: LineLength
- throws DependencyResolverException
- {
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
- ArtifactHandlerManager.class, artifactHandlerManager );
-
- final Class<?>[] argClasses =
+ private static final Class<?>[] ARG_CLASSES =
new Class<?>[] { org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
- List<Dependency> aetherDependencies = null;
-
- if ( mavenDependencies != null )
- {
- aetherDependencies = new ArrayList<Dependency>( mavenDependencies.size() );
-
- for ( org.apache.maven.model.Dependency mavenDependency : mavenDependencies )
- {
- Object[] args = new Object[] { mavenDependency, typeRegistry };
+ private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
+ {
+ return (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class,
+ "newArtifactTypeRegistry", ArtifactHandlerManager.class, artifactHandlerManager );
+ }
- Dependency aetherDependency =
- (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
+ /**
+ * @param mavenDependencies {@link org.apache.maven.model.Dependency} can be {@code null}.
+ * @return List of resolved dependencies.
+ * @throws DependencyResolverException in case of a failure of the typeRegistry error.
+ */
+ // CHECKSTYLE_OFF: LineLength
+ private List<Dependency> resolveDependencies( Collection<org.apache.maven.model.Dependency> mavenDependencies ) throws
+ DependencyResolverException
+ // CHECKSTYLE_ON: LineLength
+ {
+ if ( mavenDependencies == null )
+ {
+ return Collections.emptyList();
+ }
- aetherDependencies.add( aetherDependency );
- }
- }
+ ArtifactTypeRegistry typeRegistry = createTypeRegistry();
- List<Dependency> aetherManagedDependencies = null;
+ List<Dependency> aetherDependencies = new ArrayList<>( mavenDependencies.size() );
- if ( managedMavenDependencies != null )
+ for ( org.apache.maven.model.Dependency mavenDependency : mavenDependencies )
{
- aetherManagedDependencies = new ArrayList<Dependency>( managedMavenDependencies.size() );
+ aetherDependencies.add( toDependency( mavenDependency, typeRegistry ) );
+ }
- for ( org.apache.maven.model.Dependency mavenDependency : managedMavenDependencies )
- {
- Object[] args = new Object[] { mavenDependency, typeRegistry };
+ return aetherDependencies;
+ }
- Dependency aetherDependency =
- (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
+ @Override
+ // CHECKSTYLE_OFF: LineLength
+ public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies(
+ Collection<org.apache.maven.model.Dependency> mavenDependencies,
+ Collection<org.apache.maven.model.Dependency> managedMavenDependencies, TransformableFilter filter )
+ // CHECKSTYLE_ON: LineLength
+ throws DependencyResolverException
+ {
- aetherManagedDependencies.add( aetherDependency );
- }
- }
+ List<Dependency> aetherDependencies = resolveDependencies( mavenDependencies );
- CollectRequest request =
- new CollectRequest( aetherDependencies, aetherManagedDependencies, aetherRepositories );
+ List<Dependency> aetherManagedDependencies = resolveDependencies( managedMavenDependencies );
+
+ CollectRequest request = new CollectRequest( aetherDependencies, aetherManagedDependencies,
+ aetherRepositories );
return resolveDependencies( filter, request );
}
// CHECKSTYLE_OFF: LineLength
- private Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( TransformableFilter dependencyFilter,
- CollectRequest request )
- throws DependencyResolverException
+ private Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies(
+ TransformableFilter dependencyFilter,
+ CollectRequest request
+ ) throws DependencyResolverException
// CHECKSTYLE_ON :LineLength
{
try
@@ -266,10 +253,8 @@ class Maven30DependencyResolver
ArtifactTypeRegistry typeRegistry )
throws DependencyResolverException
{
- Class<?>[] argClasses = new Class<?>[] { org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
-
Object[] args = new Object[] { mavenDependency, typeRegistry };
- return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
+ return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", ARG_CLASSES, args );
}
}