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/15 12:20:14 UTC
[maven-artifact-transfer] branch MSHARED-864 created (now eeaf548)
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.
at eeaf548 Improved type handling via generics
This branch includes the following new commits:
new 9290acb Refactored Step I
new 7deb648 Furthermore refactoring.
new b3cde0a Fixed Checkstyle issues.
new eeaf548 Improved type handling via generics
The 4 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.
[maven-artifact-transfer] 01/04: 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 9290acbf935e8642b381255179039631e8652ec6
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 f27ceff..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 = new ArrayList<Dependency>( mavenDependencies.size() );
-
- 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 );
}
}
[maven-artifact-transfer] 02/04: 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 7deb648b43a4473a269291a5d83f55bb3de41636
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] 04/04: 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 eeaf5486a82bd679dfaa0a6061d63a518517eb5d
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] 03/04: 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 b3cde0a092c015e4d0d5ce99ea23884d7d153b3a
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 )