Skip to content

Commit dfb1e61

Browse files
slachiewiczslachiewicz
committed
Quick fixes for problems reported by the IDE
1 parent 0e1b878 commit dfb1e61

27 files changed

+66
-103
lines changed

‎src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,11 @@ private void validateParameters( ProjectBuildingRequest request, Collection<Arti
9494
* @return true if the current Maven version is Maven 3.1.
9595
*/
9696
private boolean isMaven31()
97-
{
98-
return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific
99-
}
100-
101-
private boolean canFindCoreClass( String className )
10297
{
10398
try
10499
{
105-
Thread.currentThread().getContextClassLoader().loadClass( className );
106-
100+
// Maven 3.1 specific
101+
Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" );
107102
return true;
108103
}
109104
catch ( ClassNotFoundException e )

‎src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,11 @@ private void validateParameters( ProjectBuildingRequest request, Collection<Arti
111111
* @return true if the current Maven version is Maven 3.1.
112112
*/
113113
private boolean isMaven31()
114-
{
115-
return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific
116-
}
117-
118-
private boolean canFindCoreClass( String className )
119114
{
120115
try
121116
{
122-
Thread.currentThread().getContextClassLoader().loadClass( className );
123-
117+
// Maven 3.1 specific
118+
Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" );
124119
return true;
125120
}
126121
catch ( ClassNotFoundException e )

‎src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,11 @@ private void validateParameters( ProjectBuildingRequest buildingRequest, Artifac
103103
* @return true if the current Maven version is Maven 3.1.
104104
*/
105105
private boolean isMaven31()
106-
{
107-
return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific
108-
}
109-
110-
private boolean canFindCoreClass( String className )
111106
{
112107
try
113108
{
114-
Thread.currentThread().getContextClassLoader().loadClass( className );
115-
109+
// Maven 3.1 specific
110+
Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" );
116111
return true;
117112
}
118113
catch ( ClassNotFoundException e )

‎src/main/java/org/apache/maven/shared/transfer/collection/CollectRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public CollectRequest addDependency( Dependency dependency )
194194
{
195195
if ( this.dependencies.isEmpty() )
196196
{
197-
this.dependencies = new ArrayList<Dependency>();
197+
this.dependencies = new ArrayList<>();
198198
}
199199
this.dependencies.add( dependency );
200200
}
@@ -243,7 +243,7 @@ public CollectRequest addManagedDependency( Dependency managedDependency )
243243
{
244244
if ( this.managedDependencies.isEmpty() )
245245
{
246-
this.managedDependencies = new ArrayList<Dependency>();
246+
this.managedDependencies = new ArrayList<>();
247247
}
248248
this.managedDependencies.add( managedDependency );
249249
}
@@ -291,7 +291,7 @@ public CollectRequest addRepository( ArtifactRepository repository )
291291
{
292292
if ( this.repositories.isEmpty() )
293293
{
294-
this.repositories = new ArrayList<ArtifactRepository>();
294+
this.repositories = new ArrayList<>();
295295
}
296296
this.repositories.add( repository );
297297
}

‎src/main/java/org/apache/maven/shared/transfer/collection/internal/DefaultDependencyCollector.java

+10-15
Original file line numberDiff line numberDiff line change
@@ -133,23 +133,18 @@ private void validateRoot( Object root )
133133
*/
134134
private boolean isMaven31()
135135
{
136-
return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific
136+
try
137+
{
138+
// Maven 3.1 specific
139+
Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" );
140+
return true;
141+
}
142+
catch ( ClassNotFoundException e )
143+
{
144+
return false;
145+
}
137146
}
138147

139-
private boolean canFindCoreClass( String className )
140-
{
141-
try
142-
{
143-
Thread.currentThread().getContextClassLoader().loadClass( className );
144-
145-
return true;
146-
}
147-
catch ( ClassNotFoundException e )
148-
{
149-
return false;
150-
}
151-
}
152-
153148
/**
154149
* Injects the Plexus content.
155150
*

‎src/main/java/org/apache/maven/shared/transfer/collection/internal/Invoker.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.lang.reflect.InvocationTargetException;
2323

2424
import org.apache.maven.shared.transfer.collection.DependencyCollectionException;
25-
import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException;
2625

2726
/**
2827
* Invokes method on objects using reflection.
@@ -72,7 +71,7 @@ public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?>
7271
* @param argClasses the classes of the argument, used to select the right static method
7372
* @param args the actual arguments to be passed
7473
* @return the result of the method invocation
75-
* @throws DependencyCollectorException if any checked exception occurs
74+
* @throws DependencyCollectionException if any checked exception occurs
7675
*/
7776
public static <T> T invoke( Class<?> objectClazz, String staticMethod, Class<?>[] argClasses, Object[] args )
7877
throws DependencyCollectionException

‎src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyCollector.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public CollectResult collectDependencies( Model root )
116116
.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
117117
ArtifactHandlerManager.class, artifactHandlerManager );
118118

119-
List<Dependency> aetherDependencies = new ArrayList<Dependency>( root.getDependencies().size() );
119+
List<Dependency> aetherDependencies = new ArrayList<>( root.getDependencies().size() );
120120
for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencies() )
121121
{
122122
aetherDependencies.add( toDependency( mavenDependency, typeRegistry ) );
@@ -125,8 +125,8 @@ public CollectResult collectDependencies( Model root )
125125

126126
if ( root.getDependencyManagement() != null )
127127
{
128-
List<Dependency> aetherManagerDependencies =
129-
new ArrayList<Dependency>( root.getDependencyManagement().getDependencies().size() );
128+
List<Dependency> aetherManagerDependencies = new ArrayList<>(
129+
root.getDependencyManagement().getDependencies().size() );
130130

131131
for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencyManagement().getDependencies() )
132132
{

‎src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven30DependencyNodeAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public List<DependencyNode> getChildren()
7171
public List<ArtifactRepository> getRemoteRepositories()
7272
{
7373
List<RemoteRepository> aetherRepositories = dependencyNode.getRepositories();
74-
List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() );
74+
List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() );
7575

7676
for ( RemoteRepository aetherRepository : aetherRepositories )
7777
{

‎src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyCollector.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public CollectResult collectDependencies( Model root )
116116
.invoke( RepositoryUtils.class, "newArtifactTypeRegistry",
117117
ArtifactHandlerManager.class, artifactHandlerManager );
118118

119-
List<Dependency> aetherDependencies = new ArrayList<Dependency>( root.getDependencies().size() );
119+
List<Dependency> aetherDependencies = new ArrayList<>( root.getDependencies().size() );
120120
for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencies() )
121121
{
122122
aetherDependencies.add( toDependency( mavenDependency, typeRegistry ) );
@@ -125,8 +125,8 @@ public CollectResult collectDependencies( Model root )
125125

126126
if ( root.getDependencyManagement() != null )
127127
{
128-
List<Dependency> aetherManagerDependencies =
129-
new ArrayList<Dependency>( root.getDependencyManagement().getDependencies().size() );
128+
List<Dependency> aetherManagerDependencies = new ArrayList<>(
129+
root.getDependencyManagement().getDependencies().size() );
130130

131131
for ( org.apache.maven.model.Dependency mavenDependency : root.getDependencyManagement().getDependencies() )
132132
{

‎src/main/java/org/apache/maven/shared/transfer/collection/internal/Maven31DependencyNodeAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public List<DependencyNode> getChildren()
7171
public List<ArtifactRepository> getRemoteRepositories()
7272
{
7373
List<RemoteRepository> aetherRepositories = dependencyNode.getRepositories();
74-
List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() );
74+
List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() );
7575

7676
for ( RemoteRepository aetherRepository : aetherRepositories )
7777
{

‎src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,11 @@ private void validateRoot( Object root )
134134
* @return true if the current Maven version is Maven 3.1.
135135
*/
136136
private boolean isMaven31()
137-
{
138-
return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific
139-
}
140-
141-
private boolean canFindCoreClass( String className )
142137
{
143138
try
144139
{
145-
Thread.currentThread().getContextClassLoader().loadClass( className );
146-
140+
// Maven 3.1 specific
141+
Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" );
147142
return true;
148143
}
149144
catch ( ClassNotFoundException e )

‎src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Invoker.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
* under the License.
2020
*/
2121

22-
import java.lang.reflect.InvocationTargetException;
23-
2422
import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException;
2523

24+
import java.lang.reflect.InvocationTargetException;
25+
2626
/**
2727
* Invokes method on objects using reflection.
2828
*/

‎src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30CollectorResult.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Maven30CollectorResult implements CollectorResult
5252
@Override
5353
public List<ArtifactRepository> getRemoteRepositories()
5454
{
55-
final Set<RemoteRepository> aetherRepositories = new HashSet<RemoteRepository>();
55+
final Set<RemoteRepository> aetherRepositories = new HashSet<>();
5656

5757
DependencyVisitor visitor = new DependencyVisitor()
5858
{
@@ -72,7 +72,7 @@ public boolean visitLeave( DependencyNode node )
7272

7373
collectResult.getRoot().accept( visitor );
7474

75-
List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() );
75+
List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() );
7676

7777
for ( RemoteRepository aetherRepository : aetherRepositories )
7878
{

‎src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyCollector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private static Dependency toDependency( org.apache.maven.model.Dependency mavenD
7272

7373
Object[] args = new Object[] {mavenDependency, typeRegistry};
7474

75-
return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
75+
return Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
7676
}
7777

7878
@Override

‎src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyNodeAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public List<DependencyNode> getChildren()
7171
public List<ArtifactRepository> getRemoteRepositories()
7272
{
7373
List<RemoteRepository> aetherRepositories = dependencyNode.getRepositories();
74-
List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() );
74+
List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() );
7575

7676
for ( RemoteRepository aetherRepository : aetherRepositories )
7777
{
@@ -152,7 +152,7 @@ private Artifact getArtifact( org.sonatype.aether.artifact.Artifact aetherArtifa
152152
{
153153
try
154154
{
155-
return (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
155+
return Invoker.invoke( RepositoryUtils.class, "toArtifact",
156156
org.sonatype.aether.artifact.Artifact.class, aetherArtifact );
157157
}
158158
catch ( DependencyCollectorException e )

‎src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31CollectorResult.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Maven31CollectorResult implements CollectorResult
5252
@Override
5353
public List<ArtifactRepository> getRemoteRepositories()
5454
{
55-
final Set<RemoteRepository> aetherRepositories = new HashSet<RemoteRepository>();
55+
final Set<RemoteRepository> aetherRepositories = new HashSet<>();
5656

5757
DependencyVisitor visitor = new DependencyVisitor()
5858
{
@@ -72,7 +72,7 @@ public boolean visitLeave( DependencyNode node )
7272

7373
collectResult.getRoot().accept( visitor );
7474

75-
List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() );
75+
List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() );
7676

7777
for ( RemoteRepository aetherRepository : aetherRepositories )
7878
{

‎src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyCollector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private static Dependency toDependency( org.apache.maven.model.Dependency mavenD
7272

7373
Object[] args = new Object[] {mavenDependency, typeRegistry};
7474

75-
return (Dependency) Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
75+
return Invoker.invoke( RepositoryUtils.class, "toDependency", argClasses, args );
7676
}
7777

7878
@Override

‎src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyNodeAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public List<DependencyNode> getChildren()
7171
public List<ArtifactRepository> getRemoteRepositories()
7272
{
7373
List<RemoteRepository> aetherRepositories = dependencyNode.getRepositories();
74-
List<ArtifactRepository> mavenRepositories = new ArrayList<ArtifactRepository>( aetherRepositories.size() );
74+
List<ArtifactRepository> mavenRepositories = new ArrayList<>( aetherRepositories.size() );
7575

7676
for ( RemoteRepository aetherRepository : aetherRepositories )
7777
{
@@ -152,7 +152,7 @@ private Artifact getArtifact( org.eclipse.aether.artifact.Artifact aetherArtifac
152152
{
153153
try
154154
{
155-
return (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
155+
return Invoker.invoke( RepositoryUtils.class, "toArtifact",
156156
org.eclipse.aether.artifact.Artifact.class, aetherArtifact );
157157
}
158158
catch ( DependencyCollectorException e )

‎src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,11 @@ public Iterable<ArtifactResult> resolveDependencies( ProjectBuildingRequest buil
100100
* @return true if the current Maven version is Maven 3.1.
101101
*/
102102
private boolean isMaven31()
103-
{
104-
return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific
105-
}
106-
107-
private boolean canFindCoreClass( String className )
108103
{
109104
try
110105
{
111-
Thread.currentThread().getContextClassLoader().loadClass( className );
112-
106+
// Maven 3.1 specific
107+
Thread.currentThread().getContextClassLoader().loadClass( "org.eclipse.aether.artifact.Artifact" );
113108
return true;
114109
}
115110
catch ( ClassNotFoundException e )

‎src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,7 @@ private Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResul
222222
public Iterator<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> iterator()
223223
{
224224
// CHECKSTYLE_OFF: LineLength
225-
Collection<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> artResults =
226-
new ArrayList<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult>(
225+
Collection<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> artResults = new ArrayList<>(
227226
dependencyResults.getArtifactResults().size() );
228227
// CHECKSTYLE_ON: LineLength
229228

‎src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void deploy( ProjectBuildingRequest buildingRequest, ProjectDeployerReque
9191

9292
int retryFailedDeploymentCount = projectDeployerRequest.getRetryFailedDeploymentCount();
9393

94-
List<Artifact> deployableArtifacts = new ArrayList<Artifact>();
94+
List<Artifact> deployableArtifacts = new ArrayList<>();
9595
if ( isPomArtifact )
9696
{
9797
deployableArtifacts.add( artifact );
@@ -118,10 +118,7 @@ else if ( !attachedArtifacts.isEmpty() )
118118
}
119119
}
120120

121-
for ( Artifact attached : attachedArtifacts )
122-
{
123-
deployableArtifacts.add( attached );
124-
}
121+
deployableArtifacts.addAll( attachedArtifacts );
125122

126123
deploy( buildingRequest, deployableArtifacts, artifactRepository, retryFailedDeploymentCount );
127124
}

‎src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void install( ProjectBuildingRequest buildingRequest, ProjectInstallerReq
8383

8484
ProjectArtifactMetadata metadata;
8585

86-
Collection<File> metadataFiles = new LinkedHashSet<File>();
86+
Collection<File> metadataFiles = new LinkedHashSet<>();
8787

8888
if ( isPomArtifact )
8989
{
@@ -108,7 +108,7 @@ public void install( ProjectBuildingRequest buildingRequest, ProjectInstallerReq
108108
// but not package). We are designing in a proper solution for Maven 2.1
109109
if ( file != null && file.isFile() )
110110
{
111-
installer.install( buildingRequest, Collections.<Artifact>singletonList( artifact ) );
111+
installer.install( buildingRequest, Collections.singletonList( artifact ) );
112112
addMetaDataFilesForArtifact( buildingRequest, artifact, metadataFiles );
113113
}
114114
else if ( !attachedArtifacts.isEmpty() )

0 commit comments

Comments
 (0)