This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch fix in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git
commit dfb1e61c4f5db6fe167b3d879a37ab5e25c8475c Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Thu Sep 24 01:05:18 2020 +0200 Quick fixes for problems reported by the IDE --- .../deploy/internal/DefaultArtifactDeployer.java | 9 ++------ .../install/internal/DefaultArtifactInstaller.java | 9 ++------ .../resolve/internal/DefaultArtifactResolver.java | 9 ++------ .../shared/transfer/collection/CollectRequest.java | 6 +++--- .../internal/DefaultDependencyCollector.java | 25 +++++++++------------- .../transfer/collection/internal/Invoker.java | 3 +-- .../internal/Maven30DependencyCollector.java | 6 +++--- .../internal/Maven30DependencyNodeAdapter.java | 2 +- .../internal/Maven31DependencyCollector.java | 6 +++--- .../internal/Maven31DependencyNodeAdapter.java | 2 +- .../internal/DefaultDependencyCollector.java | 9 ++------ .../dependencies/collect/internal/Invoker.java | 4 ++-- .../collect/internal/Maven30CollectorResult.java | 4 ++-- .../internal/Maven30DependencyCollector.java | 2 +- .../internal/Maven30DependencyNodeAdapter.java | 4 ++-- .../collect/internal/Maven31CollectorResult.java | 4 ++-- .../internal/Maven31DependencyCollector.java | 2 +- .../internal/Maven31DependencyNodeAdapter.java | 4 ++-- .../internal/DefaultDependencyResolver.java | 9 ++------ .../internal/Maven31DependencyResolver.java | 3 +-- .../deploy/internal/DefaultProjectDeployer.java | 7 ++---- .../install/internal/DefaultProjectInstaller.java | 4 ++-- .../internal/DefaultRepositoryManager.java | 8 +++---- .../internal/Maven30RepositoryManager.java | 2 +- .../internal/DefaultArtifactResolverTest.java | 10 ++++----- .../internal/DefaultDependencyCollectorTest.java | 12 +++++------ .../internal/Maven30RepositoryManagerTest.java | 4 ++-- 27 files changed, 66 insertions(+), 103 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 ff2b097..11a268c 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 @@ -95,15 +95,10 @@ class DefaultArtifactDeployer implements ArtifactDeployer, Contextualizable */ private boolean isMaven31() { - return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific - } - - private boolean canFindCoreClass( String className ) - { try { - Thread.currentThread().getContextClassLoader().loadClass( className ); - + // Maven 3.1 specific + Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" ); return true; } catch ( ClassNotFoundException e ) 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 6076790..238e814 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 @@ -112,15 +112,10 @@ class DefaultArtifactInstaller implements ArtifactInstaller, Contextualizable */ private boolean isMaven31() { - return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific - } - - private boolean canFindCoreClass( String className ) - { try { - Thread.currentThread().getContextClassLoader().loadClass( className ); - + // Maven 3.1 specific + Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" ); return true; } catch ( ClassNotFoundException e ) 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 00f6600..83d7517 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 @@ -104,15 +104,10 @@ class DefaultArtifactResolver implements ArtifactResolver, Contextualizable */ private boolean isMaven31() { - return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific - } - - private boolean canFindCoreClass( String className ) - { try { - Thread.currentThread().getContextClassLoader().loadClass( className ); - + // Maven 3.1 specific + Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" ); return true; } catch ( ClassNotFoundException e ) diff --git a/src/main/java/org/apache/maven/shared/transfer/collection/CollectRequest.java b/src/main/java/org/apache/maven/shared/transfer/collection/CollectRequest.java index 89272d5..8049c3a 100644 --- a/src/main/java/org/apache/maven/shared/transfer/collection/CollectRequest.java +++ b/src/main/java/org/apache/maven/shared/transfer/collection/CollectRequest.java @@ -194,7 +194,7 @@ public final class CollectRequest { if ( this.dependencies.isEmpty() ) { - this.dependencies = new ArrayList<Dependency>(); + this.dependencies = new ArrayList<>(); } this.dependencies.add( dependency ); } @@ -243,7 +243,7 @@ public final class CollectRequest { if ( this.managedDependencies.isEmpty() ) { - this.managedDependencies = new ArrayList<Dependency>(); + this.managedDependencies = new ArrayList<>(); } this.managedDependencies.add( managedDependency ); } @@ -291,7 +291,7 @@ public final class CollectRequest { if ( this.repositories.isEmpty() ) { - this.repositories = new ArrayList<ArtifactRepository>(); + this.repositories = new ArrayList<>(); } this.repositories.add( repository ); } 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 962fd0a..e6ce50e 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 @@ -133,23 +133,18 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl */ private boolean isMaven31() { - return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific + try + { + // Maven 3.1 specific + Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" ); + return true; + } + catch ( ClassNotFoundException e ) + { + return false; + } } - private boolean canFindCoreClass( String className ) - { - try - { - Thread.currentThread().getContextClassLoader().loadClass( className ); - - return true; - } - catch ( ClassNotFoundException e ) - { - return false; - } - } - /** * Injects the Plexus content. * 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 c78b5af..642c4b6 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 @@ -22,7 +22,6 @@ package org.apache.maven.shared.transfer.collection.internal; import java.lang.reflect.InvocationTargetException; import org.apache.maven.shared.transfer.collection.DependencyCollectionException; -import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException; /** * Invokes method on objects using reflection. @@ -72,7 +71,7 @@ final class Invoker * @param argClasses the classes of the argument, used to select the right static method * @param args the actual arguments to be passed * @return the result of the method invocation - * @throws DependencyCollectorException if any checked exception occurs + * @throws DependencyCollectionException if any checked exception occurs */ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?>[] argClasses, Object[] args ) throws DependencyCollectionException 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 5d9032d..108db21 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 @@ -116,7 +116,7 @@ class Maven30DependencyCollector .invoke( RepositoryUtils.class, "newArtifactTypeRegistry", ArtifactHandlerManager.class, artifactHandlerManager ); - List<Dependency> aetherDependencies = new ArrayList<Dependency>( root.getDependencies().size() ); + List<Dependency> aetherDependencies = new ArrayList<>( root.getDependencies().size() ); for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencies() ) { aetherDependencies.add( toDependency( mavenDependency, typeRegistry ) ); @@ -125,8 +125,8 @@ class Maven30DependencyCollector if ( root.getDependencyManagement() != null ) { - List<Dependency> aetherManagerDependencies = - new ArrayList<Dependency>( root.getDependencyManagement().getDependencies().size() ); + List<Dependency> aetherManagerDependencies = new ArrayList<>( + root.getDependencyManagement().getDependencies().size() ); for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencyManagement().getDependencies() ) { 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 b8e6ea9..fa96b35 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 @@ -71,7 +71,7 @@ class Maven30DependencyNodeAdapter implements DependencyNode public List<ArtifactRepository> getRemoteRepositories() { List<RemoteRepository> aetherRepositories = dependencyNode.getRepositories(); - List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() ); + List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() ); for ( RemoteRepository aetherRepository : aetherRepositories ) { 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 ef5057b..43846ab 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 @@ -116,7 +116,7 @@ class Maven31DependencyCollector .invoke( RepositoryUtils.class, "newArtifactTypeRegistry", ArtifactHandlerManager.class, artifactHandlerManager ); - List<Dependency> aetherDependencies = new ArrayList<Dependency>( root.getDependencies().size() ); + List<Dependency> aetherDependencies = new ArrayList<>( root.getDependencies().size() ); for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencies() ) { aetherDependencies.add( toDependency( mavenDependency, typeRegistry ) ); @@ -125,8 +125,8 @@ class Maven31DependencyCollector if ( root.getDependencyManagement() != null ) { - List<Dependency> aetherManagerDependencies = - new ArrayList<Dependency>( root.getDependencyManagement().getDependencies().size() ); + List<Dependency> aetherManagerDependencies = new ArrayList<>( + root.getDependencyManagement().getDependencies().size() ); for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencyManagement().getDependencies() ) { 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 5987f7f..eae1542 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 @@ -71,7 +71,7 @@ class Maven31DependencyNodeAdapter implements DependencyNode public List<ArtifactRepository> getRemoteRepositories() { List<RemoteRepository> aetherRepositories = dependencyNode.getRepositories(); - List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() ); + List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() ); for ( RemoteRepository aetherRepository : aetherRepositories ) { 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 ca416ec..fb1e498 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 @@ -135,15 +135,10 @@ class DefaultDependencyCollector implements DependencyCollector, Contextualizabl */ private boolean isMaven31() { - return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific - } - - private boolean canFindCoreClass( String className ) - { try { - Thread.currentThread().getContextClassLoader().loadClass( className ); - + // Maven 3.1 specific + Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" ); return true; } catch ( ClassNotFoundException e ) 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 17c7432..45872e9 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 @@ -19,10 +19,10 @@ package org.apache.maven.shared.transfer.dependencies.collect.internal; * under the License. */ -import java.lang.reflect.InvocationTargetException; - import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException; +import java.lang.reflect.InvocationTargetException; + /** * Invokes method on objects using reflection. */ diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30CollectorResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30CollectorResult.java index f07c10f..081dd66 100644 --- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30CollectorResult.java +++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30CollectorResult.java @@ -52,7 +52,7 @@ class Maven30CollectorResult implements CollectorResult @Override public List<ArtifactRepository> getRemoteRepositories() { - final Set<RemoteRepository> aetherRepositories = new HashSet<RemoteRepository>(); + final Set<RemoteRepository> aetherRepositories = new HashSet<>(); DependencyVisitor visitor = new DependencyVisitor() { @@ -72,7 +72,7 @@ class Maven30CollectorResult implements CollectorResult collectResult.getRoot().accept( visitor ); - List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() ); + List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() ); for ( RemoteRepository aetherRepository : aetherRepositories ) { diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyCollector.java index 1a33fbc..8a85003 100644 --- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyCollector.java +++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyCollector.java @@ -72,7 +72,7 @@ class Maven30DependencyCollector implements MavenDependencyCollector Object[] args = new Object[] {mavenDependency, typeRegistry}; - return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args ); + return Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args ); } @Override diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyNodeAdapter.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyNodeAdapter.java index 339c3ea..87a10f8 100644 --- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyNodeAdapter.java +++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyNodeAdapter.java @@ -71,7 +71,7 @@ class Maven30DependencyNodeAdapter implements DependencyNode public List<ArtifactRepository> getRemoteRepositories() { List<RemoteRepository> aetherRepositories = dependencyNode.getRepositories(); - List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() ); + List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() ); for ( RemoteRepository aetherRepository : aetherRepositories ) { @@ -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 ( DependencyCollectorException e ) diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31CollectorResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31CollectorResult.java index 8d46390..dbf8717 100644 --- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31CollectorResult.java +++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31CollectorResult.java @@ -52,7 +52,7 @@ class Maven31CollectorResult implements CollectorResult @Override public List<ArtifactRepository> getRemoteRepositories() { - final Set<RemoteRepository> aetherRepositories = new HashSet<RemoteRepository>(); + final Set<RemoteRepository> aetherRepositories = new HashSet<>(); DependencyVisitor visitor = new DependencyVisitor() { @@ -72,7 +72,7 @@ class Maven31CollectorResult implements CollectorResult collectResult.getRoot().accept( visitor ); - List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() ); + List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() ); for ( RemoteRepository aetherRepository : aetherRepositories ) { diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyCollector.java index de98210..50f3700 100644 --- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyCollector.java +++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyCollector.java @@ -72,7 +72,7 @@ class Maven31DependencyCollector implements MavenDependencyCollector Object[] args = new Object[] {mavenDependency, typeRegistry}; - return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args ); + return Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args ); } @Override diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyNodeAdapter.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyNodeAdapter.java index 0a5ec8e..f0cccc4 100644 --- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyNodeAdapter.java +++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyNodeAdapter.java @@ -71,7 +71,7 @@ class Maven31DependencyNodeAdapter implements DependencyNode public List<ArtifactRepository> getRemoteRepositories() { List<RemoteRepository> aetherRepositories = dependencyNode.getRepositories(); - List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() ); + List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() ); for ( RemoteRepository aetherRepository : aetherRepositories ) { @@ -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 ( DependencyCollectorException 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 05a63c8..7718c19 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 @@ -101,15 +101,10 @@ class DefaultDependencyResolver implements DependencyResolver, Contextualizable */ private boolean isMaven31() { - return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific - } - - private boolean canFindCoreClass( String className ) - { try { - Thread.currentThread().getContextClassLoader().loadClass( className ); - + // Maven 3.1 specific + Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" ); return true; } catch ( ClassNotFoundException 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 94d7bb4..ea35bc5 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 @@ -222,8 +222,7 @@ class Maven31DependencyResolver implements MavenDependencyResolver 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>( + Collection<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> artResults = new ArrayList<>( dependencyResults.getArtifactResults().size() ); // CHECKSTYLE_ON: LineLength diff --git a/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java b/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java index 166ca24..16d1d1b 100644 --- a/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java +++ b/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java @@ -91,7 +91,7 @@ class DefaultProjectDeployer int retryFailedDeploymentCount = projectDeployerRequest.getRetryFailedDeploymentCount(); - List<Artifact> deployableArtifacts = new ArrayList<Artifact>(); + List<Artifact> deployableArtifacts = new ArrayList<>(); if ( isPomArtifact ) { deployableArtifacts.add( artifact ); @@ -118,10 +118,7 @@ class DefaultProjectDeployer } } - for ( Artifact attached : attachedArtifacts ) - { - deployableArtifacts.add( attached ); - } + deployableArtifacts.addAll( attachedArtifacts ); deploy( buildingRequest, deployableArtifacts, artifactRepository, retryFailedDeploymentCount ); } diff --git a/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java b/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java index 94701ea..675b55c 100644 --- a/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java +++ b/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java @@ -83,7 +83,7 @@ class DefaultProjectInstaller ProjectArtifactMetadata metadata; - Collection<File> metadataFiles = new LinkedHashSet<File>(); + Collection<File> metadataFiles = new LinkedHashSet<>(); if ( isPomArtifact ) { @@ -108,7 +108,7 @@ class DefaultProjectInstaller // but not package). We are designing in a proper solution for Maven 2.1 if ( file != null && file.isFile() ) { - installer.install( buildingRequest, Collections.<Artifact>singletonList( artifact ) ); + installer.install( buildingRequest, Collections.singletonList( artifact ) ); addMetaDataFilesForArtifact( buildingRequest, artifact, metadataFiles ); } else if ( !attachedArtifacts.isEmpty() ) diff --git a/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java index a38dce6..c29cc08 100644 --- a/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java +++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java @@ -159,8 +159,8 @@ class DefaultRepositoryManager 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" ); return new Maven31RepositoryManager( m31RepositorySystem, session ); } @@ -169,8 +169,8 @@ class DefaultRepositoryManager 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" ); if ( isMaven302() ) { diff --git a/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManager.java index 936ea12..b7b9214 100644 --- a/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManager.java +++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManager.java @@ -104,7 +104,7 @@ class Maven30RepositoryManager RepositorySystemSession session; try { - session = (RepositorySystemSession) Invoker.invoke( buildingRequest, "getRepositorySession" ); + session = Invoker.invoke( buildingRequest, "getRepositorySession" ); } catch ( RepositoryManagerException e ) { diff --git a/src/test/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolverTest.java b/src/test/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolverTest.java index d36340b..9f12a7a 100644 --- a/src/test/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolverTest.java +++ b/src/test/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolverTest.java @@ -24,10 +24,8 @@ import static org.mockito.Mockito.mock; import org.apache.maven.artifact.Artifact; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate; -import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException; import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; -import org.apache.maven.shared.transfer.artifact.resolve.internal.DefaultArtifactResolver; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -54,7 +52,7 @@ public class DefaultArtifactResolverTest @Test public void resolveArtifactWithArtifactShouldFaileWithIAEWhenParameterBuildingRequestIsNull() - throws ArtifactDeployerException, ArtifactResolverException + throws ArtifactResolverException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter buildingRequest is not allowed to be null." ); @@ -64,7 +62,7 @@ public class DefaultArtifactResolverTest @Test public void resolveArtifactWithArtifactShouldFaileWithIAEWhenArtifactIsNull() - throws ArtifactDeployerException, ArtifactResolverException + throws ArtifactResolverException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter mavenArtifact is not allowed to be null." ); @@ -76,7 +74,7 @@ public class DefaultArtifactResolverTest @Test public void resolveArtifactWithCoordinateShouldFaileWithIAEWhenParameterBuildingRequestIsNull() - throws ArtifactDeployerException, ArtifactResolverException + throws ArtifactResolverException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter buildingRequest is not allowed to be null." ); @@ -86,7 +84,7 @@ public class DefaultArtifactResolverTest @Test public void resolveArtifactWithCoordinateShouldFaileWithIAEWhenArtifactIsNull() - throws ArtifactDeployerException, ArtifactResolverException + throws ArtifactResolverException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter coordinate is not allowed to be null." ); diff --git a/src/test/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollectorTest.java b/src/test/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollectorTest.java index a54af31..213435b 100644 --- a/src/test/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollectorTest.java +++ b/src/test/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollectorTest.java @@ -50,7 +50,7 @@ public class DefaultDependencyCollectorTest @Test public void collectDependenciesWithDependableCoordinatShouldFailWithIAEWhenParameterBuildingRequestIsNull() - throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException + throws DependencyCollectorException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter buildingRequest is not allowed to be null." ); @@ -60,7 +60,7 @@ public class DefaultDependencyCollectorTest @Test public void collectDependenciesWithDependableCoordinatShouldFailWithIAEWhenParameterRootIsNull() - throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException + throws DependencyCollectorException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter root is not allowed to be null." ); @@ -71,7 +71,7 @@ public class DefaultDependencyCollectorTest @Test public void collectDependenciesWithDependencyShouldFailWithIAEWhenParameterBuildingRequestIsNull() - throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException + throws DependencyCollectorException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter buildingRequest is not allowed to be null." ); @@ -81,7 +81,7 @@ public class DefaultDependencyCollectorTest @Test public void collectDependenciesWithDependencyShouldFailWithIAEWhenParameterRootIsNull() - throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException + throws DependencyCollectorException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter root is not allowed to be null." ); @@ -92,7 +92,7 @@ public class DefaultDependencyCollectorTest @Test public void collectDependenciesWithModelShouldFailWithIAEWhenParameterBuildingRequestIsNull() - throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException + throws DependencyCollectorException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter buildingRequest is not allowed to be null." ); @@ -102,7 +102,7 @@ public class DefaultDependencyCollectorTest @Test public void collectDependenciesWithModelShouldFailWithIAEWhenParameterRootIsNull() - throws ArtifactDeployerException, ArtifactResolverException, DependencyCollectorException + throws DependencyCollectorException { thrown.expect( IllegalArgumentException.class ); thrown.expectMessage( "The parameter root is not allowed to be null." ); diff --git a/src/test/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManagerTest.java b/src/test/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManagerTest.java index b426316..6e20cb4 100644 --- a/src/test/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManagerTest.java +++ b/src/test/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManagerTest.java @@ -44,7 +44,7 @@ public class Maven30RepositoryManagerTest extends PlexusTestCase repositorySystem = lookup( RepositorySystem.class ); } - public void testSetLocalRepositoryBasedirSimple() throws Exception + public void testSetLocalRepositoryBasedirSimple() { DefaultProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest(); MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession(); @@ -62,7 +62,7 @@ public class Maven30RepositoryManagerTest extends PlexusTestCase } - public void testSetLocalRepositoryBasedirEnhanced() throws Exception + public void testSetLocalRepositoryBasedirEnhanced() { DefaultProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest(); MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
