Author: rfscholte
Date: Thu Dec 24 14:43:03 2015
New Revision: 1721630
URL: http://svn.apache.org/viewvc?rev=1721630&view=rev
Log:
Fix checkstyle reported errors
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java?rev=1721630&r1=1721629&r2=1721630&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
Thu Dec 24 14:43:03 2015
@@ -168,8 +168,8 @@ public class DefaultArtifactCoordinate
@Override
public String toString()
{
- StringBuilder sb =
- new StringBuilder().append( groupId ).append( ':' ).append(
artifactId ).append( ':' ).append( getExtension() );
+ StringBuilder sb = new StringBuilder().append( groupId ).append( ':' )
+ .append( artifactId ).append( ':' ).append(
getExtension() );
if ( classifier != null )
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java?rev=1721630&r1=1721629&r2=1721630&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java
Thu Dec 24 14:43:03 2015
@@ -35,7 +35,6 @@ import org.eclipse.aether.DefaultReposit
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.ArtifactType;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.LocalRepositoryManager;
@@ -176,7 +175,6 @@ public class Maven31RepositoryManager
/**
* @param coordinate {@link ArtifactCoordinate}
- * @param typeRegistry {@link ArtifactType}
* @return {@link Artifact}
*/
protected Artifact toArtifact( ArtifactCoordinate coordinate )
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java?rev=1721630&r1=1721629&r2=1721630&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
Thu Dec 24 14:43:03 2015
@@ -19,13 +19,9 @@ package org.apache.maven.shared.artifact
* under the License.
*/
-import java.util.Collection;
-
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Dependency;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
/**
*
@@ -52,8 +48,8 @@ public interface ArtifactResolver
throws ArtifactResolverException;
// /**
-// * This will resolve the dependencies of the coordinate, not resolving
the the artifact of the coordinate itself. If
-// * the coordinate needs to be resolved too, use
+// * This will resolve the dependencies of the coordinate, not resolving
the the artifact of the coordinate itself.
+// * If the coordinate needs to be resolved too, use
// * {@link #resolveDependencies(ProjectBuildingRequest, Collection,
Collection, TransformableFilter)} passing
// * {@code Collections.singletonList(coordinate)}
// *
@@ -63,7 +59,7 @@ public interface ArtifactResolver
// * @return the resolved dependencies.
// * @throws ArtifactResolverException in case of an error.
// */
-// Iterable<ArtifactResult> resolveDependencies( ProjectBuildingRequest
buildingRequest, ArtifactCoordinate coordinate,
+// Iterable<ArtifactResult> resolveDependencies( ProjectBuildingRequest
buildingRequest, ArtifactCoordinate coordinate,
// TransformableFilter filter
)
// throws
ArtifactResolverException;
//
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java?rev=1721630&r1=1721629&r2=1721630&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
Thu Dec 24 14:43:03 2015
@@ -19,13 +19,9 @@ package org.apache.maven.shared.artifact
* under the License.
*/
-import java.util.Collection;
-
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Dependency;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
import org.apache.maven.shared.artifact.resolve.ArtifactResult;
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java?rev=1721630&r1=1721629&r2=1721630&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
Thu Dec 24 14:43:03 2015
@@ -19,17 +19,12 @@ package org.apache.maven.shared.artifact
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
-import
org.apache.maven.shared.artifact.filter.resolve.transform.SonatypeAetherFilterTransformer;
import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.component.annotations.Component;
@@ -37,21 +32,13 @@ import org.codehaus.plexus.component.ann
import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.artifact.ArtifactType;
-import org.sonatype.aether.artifact.ArtifactTypeRegistry;
-import org.sonatype.aether.collection.CollectRequest;
-import org.sonatype.aether.collection.DependencyCollectionException;
-import org.sonatype.aether.graph.Dependency;
-import org.sonatype.aether.graph.DependencyFilter;
import org.sonatype.aether.repository.RemoteRepository;
import org.sonatype.aether.resolution.ArtifactDescriptorException;
import org.sonatype.aether.resolution.ArtifactDescriptorRequest;
import org.sonatype.aether.resolution.ArtifactDescriptorResult;
import org.sonatype.aether.resolution.ArtifactRequest;
import org.sonatype.aether.resolution.ArtifactResolutionException;
-import org.sonatype.aether.resolution.ArtifactResult;
import org.sonatype.aether.util.artifact.DefaultArtifact;
-import org.sonatype.aether.util.artifact.DefaultArtifactType;
/**
*
@@ -86,13 +73,11 @@ public class Maven30ArtifactResolver
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
{
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class,
"newArtifactTypeRegistry",
-
ArtifactHandlerManager.class, artifactHandlerManager );
+ Artifact aetherArtifact =
+ new DefaultArtifact( coordinate.getGroupId(),
coordinate.getArtifactId(), coordinate.getClassifier(),
+ coordinate.getExtension(),
coordinate.getVersion() );
- Dependency aetherDependency = toDependency( coordinate, typeRegistry );
-
- return resolveArtifact( buildingRequest,
aetherDependency.getArtifact() );
+ return resolveArtifact( buildingRequest, aetherArtifact );
}
// CHECKSTYLE_OFF: LineLength
@@ -268,25 +253,25 @@ public class Maven30ArtifactResolver
// }
// }
- /**
- * Based on
RepositoryUtils#toDependency(org.apache.maven.model.Dependency,
ArtifactTypeRegistry)
- *
- * @param coordinate
- * @param stereotypes
- * @return as Aether Dependency
- */
- private static Dependency toDependency( ArtifactCoordinate coordinate,
ArtifactTypeRegistry stereotypes )
- {
- ArtifactType stereotype = stereotypes.get( coordinate.getExtension() );
- if ( stereotype == null )
- {
- stereotype = new DefaultArtifactType( coordinate.getExtension() );
- }
-
- Artifact artifact =
- new DefaultArtifact( coordinate.getGroupId(),
coordinate.getArtifactId(), coordinate.getClassifier(), null,
- coordinate.getVersion(), null, stereotype );
-
- return new Dependency( artifact, null );
- }
+// /**
+// * Based on
RepositoryUtils#toDependency(org.apache.maven.model.Dependency,
ArtifactTypeRegistry)
+// *
+// * @param coordinate
+// * @param stereotypes
+// * @return as Aether Dependency
+// */
+// private static Dependency toDependency( ArtifactCoordinate coordinate,
ArtifactTypeRegistry stereotypes )
+// {
+// ArtifactType stereotype = stereotypes.get( coordinate.getExtension()
);
+// if ( stereotype == null )
+// {
+// stereotype = new DefaultArtifactType( coordinate.getExtension()
);
+// }
+//
+// Artifact artifact =
+// new DefaultArtifact( coordinate.getGroupId(),
coordinate.getArtifactId(), coordinate.getClassifier(), null,
+// coordinate.getVersion(), null, stereotype );
+//
+// return new Dependency( artifact, null );
+// }
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java?rev=1721630&r1=1721629&r2=1721630&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
Thu Dec 24 14:43:03 2015
@@ -19,17 +19,12 @@ package org.apache.maven.shared.artifact
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
-import
org.apache.maven.shared.artifact.filter.resolve.transform.EclipseAetherFilterTransformer;
import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.component.annotations.Component;
@@ -37,23 +32,13 @@ import org.codehaus.plexus.component.ann
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.ArtifactType;
-import org.eclipse.aether.artifact.ArtifactTypeRegistry;
import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.artifact.DefaultArtifactType;
-import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.ArtifactDescriptorException;
import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
import org.eclipse.aether.resolution.ArtifactDescriptorResult;
import org.eclipse.aether.resolution.ArtifactRequest;
import org.eclipse.aether.resolution.ArtifactResolutionException;
-import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.DependencyRequest;
-import org.eclipse.aether.resolution.DependencyResolutionException;
-import org.eclipse.aether.resolution.DependencyResult;
/**
*
@@ -88,13 +73,11 @@ public class Maven31ArtifactResolver
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
{
- ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class,
"newArtifactTypeRegistry",
-
ArtifactHandlerManager.class, artifactHandlerManager );
+ Artifact aetherArtifact =
+ new DefaultArtifact( coordinate.getGroupId(),
coordinate.getArtifactId(), coordinate.getClassifier(),
+ coordinate.getExtension(),
coordinate.getVersion() );
- Dependency aetherDependency = toDependency( coordinate, typeRegistry );
-
- return resolveArtifact( buildingRequest,
aetherDependency.getArtifact() );
+ return resolveArtifact( buildingRequest, aetherArtifact );
}
// CHECKSTYLE_OFF: LineLength
@@ -239,7 +222,7 @@ public class Maven31ArtifactResolver
// artifactRequests.add( new ArtifactRequest(
artifactResult.getArtifact(), aetherRepositories, null ) );
// }
//
-// final List<ArtifactResult> artifactResults =
repositorySystem.resolveArtifacts( session, artifactRequests );
+// final List<ArtifactResult> artifactResults =
repositorySystem.resolveArtifacts( session, artifactRequests );
//
// // Keep it lazy! Often artifactsResults aren't used, so
transforming up front is too expensive
// return new
Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>()
@@ -249,7 +232,7 @@ public class Maven31ArtifactResolver
// {
// // CHECKSTYLE_OFF: LineLength
//
Collection<org.apache.maven.shared.artifact.resolve.ArtifactResult> artResults =
-// new
ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>(
artifactResults.size() );
+// new
ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>(
artifactResults.size() );
// // CHECKSTYLE_ON: LineLength
//
// for ( ArtifactResult artifactResult : artifactResults )
@@ -271,25 +254,25 @@ public class Maven31ArtifactResolver
// }
// }
- /**
- * Based on
RepositoryUtils#toDependency(org.apache.maven.model.Dependency,
ArtifactTypeRegistry)
- *
- * @param coordinate {@link ArtifactCoordinate}
- * @param stereotypes {@link ArtifactTypeRegistry
- * @return as Aether Dependency
- */
- private static Dependency toDependency( ArtifactCoordinate coordinate,
ArtifactTypeRegistry stereotypes )
- {
- ArtifactType stereotype = stereotypes.get( coordinate.getExtension() );
- if ( stereotype == null )
- {
- stereotype = new DefaultArtifactType( coordinate.getExtension() );
- }
-
- Artifact artifact =
- new DefaultArtifact( coordinate.getGroupId(),
coordinate.getArtifactId(), coordinate.getClassifier(), null,
- coordinate.getVersion(), null, stereotype );
-
- return new Dependency( artifact, null );
- }
+// /**
+// * Based on
RepositoryUtils#toDependency(org.apache.maven.model.Dependency,
ArtifactTypeRegistry)
+// *
+// * @param coordinate {@link ArtifactCoordinate}
+// * @param stereotypes {@link ArtifactTypeRegistry
+// * @return as Aether Dependency
+// */
+// private static Dependency toDependency( ArtifactCoordinate coordinate,
ArtifactTypeRegistry stereotypes )
+// {
+// ArtifactType stereotype = stereotypes.get( coordinate.getExtension()
);
+// if ( stereotype == null )
+// {
+// stereotype = new DefaultArtifactType( coordinate.getExtension()
);
+// }
+//
+// Artifact artifact =
+// new DefaultArtifact( coordinate.getGroupId(),
coordinate.getArtifactId(), coordinate.getClassifier(), null,
+// coordinate.getVersion(), null, stereotype );
+//
+// return new Dependency( artifact, null );
+// }
}
