You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/10/11 18:58:44 UTC
[maven] branch master updated: [MNG-7297] Remove redundant type
arguments (#581)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 0080e84 [MNG-7297] Remove redundant type arguments (#581)
0080e84 is described below
commit 0080e845884922814d26914d0ae9f59b084bee35
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Mon Oct 11 20:58:38 2021 +0200
[MNG-7297] Remove redundant type arguments (#581)
---
.../org/apache/maven/repository/MetadataResolutionResult.java | 8 ++++----
maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 2 +-
maven-core/src/main/java/org/apache/maven/RepositoryUtils.java | 2 +-
.../apache/maven/artifact/resolver/ArtifactResolutionResult.java | 8 ++++----
.../org/apache/maven/classrealm/DefaultClassRealmManager.java | 2 +-
.../main/java/org/apache/maven/exception/ExceptionSummary.java | 2 +-
.../maven/execution/scope/internal/MojoExecutionScopeModule.java | 4 ++--
.../java/org/apache/maven/lifecycle/internal/MojoExecutor.java | 4 ++--
.../maven/model/plugin/DefaultLifecycleBindingsInjector.java | 2 +-
.../java/org/apache/maven/plugin/DefaultPluginRealmCache.java | 2 +-
.../apache/maven/plugin/internal/DefaultMavenPluginManager.java | 2 +-
.../apache/maven/project/DefaultDependencyResolutionResult.java | 2 +-
.../java/org/apache/maven/project/DefaultProjectRealmCache.java | 2 +-
.../src/main/java/org/apache/maven/project/MavenProject.java | 2 +-
.../maven/project/artifact/DefaultProjectArtifactsCache.java | 4 ++--
.../java/org/apache/maven/project/artifact/ProjectArtifact.java | 2 +-
.../org/apache/maven/session/scope/internal/SessionScope.java | 2 +-
.../apache/maven/session/scope/internal/SessionScopeModule.java | 2 +-
.../src/main/java/org/apache/maven/model/building/Result.java | 4 ++--
.../java/org/apache/maven/plugin/descriptor/PluginDescriptor.java | 2 +-
20 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
index 7be1d96..2d1c5db 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
@@ -119,7 +119,7 @@ public class MetadataResolutionResult
public List<Artifact> getMissingArtifacts()
{
return missingArtifacts == null
- ? Collections.<Artifact>emptyList()
+ ? Collections.emptyList()
: Collections.unmodifiableList( missingArtifacts );
}
@@ -152,7 +152,7 @@ public class MetadataResolutionResult
public List<Exception> getExceptions()
{
return exceptions == null
- ? Collections.<Exception>emptyList()
+ ? Collections.emptyList()
: Collections.unmodifiableList( exceptions );
}
@@ -192,7 +192,7 @@ public class MetadataResolutionResult
public List<Exception> getVersionRangeViolations()
{
return versionRangeViolations == null
- ? Collections.<Exception>emptyList()
+ ? Collections.emptyList()
: Collections.unmodifiableList( versionRangeViolations );
}
@@ -227,7 +227,7 @@ public class MetadataResolutionResult
public List<ArtifactResolutionException> getMetadataResolutionExceptions()
{
return metadataResolutionExceptions == null
- ? Collections.<ArtifactResolutionException>emptyList()
+ ? Collections.emptyList()
: Collections.unmodifiableList( metadataResolutionExceptions );
}
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index cae176d..c0955a7 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -371,7 +371,7 @@ public class DefaultMaven
throws MavenExecutionException
{
// CHECKSTYLE_OFF: LineLength
- for ( AbstractMavenLifecycleParticipant listener : getLifecycleParticipants( Collections.<MavenProject>emptyList() ) )
+ for ( AbstractMavenLifecycleParticipant listener : getLifecycleParticipants( Collections.emptyList() ) )
// CHECKSTYLE_ON: LineLength
{
listener.afterSessionStart( session );
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index ceb6ba3..bafed36 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -121,7 +121,7 @@ public class RepositoryUtils
nodeTrail.addAll( trail );
nodeTrail.add( artifact.getId() );
- if ( filter == null || filter.accept( node, Collections.<DependencyNode>emptyList() ) )
+ if ( filter == null || filter.accept( node, Collections.emptyList() ) )
{
artifact.setDependencyTrail( nodeTrail );
artifacts.add( artifact );
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
index 27690da..06739b4 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
@@ -133,7 +133,7 @@ public class ArtifactResolutionResult
public List<Artifact> getMissingArtifacts()
{
return missingArtifacts == null
- ? Collections.<Artifact>emptyList()
+ ? Collections.emptyList()
: Collections.unmodifiableList( missingArtifacts );
}
@@ -171,7 +171,7 @@ public class ArtifactResolutionResult
public List<Exception> getExceptions()
{
return exceptions == null
- ? Collections.<Exception>emptyList()
+ ? Collections.emptyList()
: Collections.unmodifiableList( exceptions );
}
@@ -211,7 +211,7 @@ public class ArtifactResolutionResult
public List<Exception> getVersionRangeViolations()
{
return versionRangeViolations == null
- ? Collections.<Exception>emptyList()
+ ? Collections.emptyList()
: Collections.unmodifiableList( versionRangeViolations );
}
@@ -246,7 +246,7 @@ public class ArtifactResolutionResult
public List<ArtifactResolutionException> getMetadataResolutionExceptions()
{
return metadataResolutionExceptions == null
- ? Collections.<ArtifactResolutionException>emptyList()
+ ? Collections.emptyList()
: Collections.unmodifiableList( metadataResolutionExceptions );
}
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index abd4bb6..b9e8d22 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -245,7 +245,7 @@ public class DefaultClassRealmManager
Objects.requireNonNull( plugin, "plugin cannot be null" );
Map<String, ClassLoader> foreignImports =
- Collections.<String, ClassLoader>singletonMap( "", getMavenApiRealm() );
+ Collections.singletonMap( "", getMavenApiRealm() );
return createRealm( getKey( plugin, true ), RealmType.Extension, PARENT_CLASSLOADER, null,
foreignImports, artifacts );
diff --git a/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java b/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
index 6615af6..b72bab6 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
@@ -55,7 +55,7 @@ public class ExceptionSummary
this.reference = ( reference != null ) ? reference : "";
this.children = ( children != null )
? Collections.unmodifiableList( children )
- : Collections.<ExceptionSummary>emptyList();
+ : Collections.emptyList();
}
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java
index b62b590..9b2617f 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java
@@ -52,8 +52,8 @@ public class MojoExecutionScopeModule
bindScope( MojoExecutionScoped.class, scope );
bind( MojoExecutionScope.class ).toInstance( scope );
- bind( MavenProject.class ).toProvider( MojoExecutionScope.<MavenProject>seededKeyProvider() ).in( scope );
- bind( MojoExecution.class ).toProvider( MojoExecutionScope.<MojoExecution>seededKeyProvider() ).in( scope );
+ bind( MavenProject.class ).toProvider( MojoExecutionScope.seededKeyProvider() ).in( scope );
+ bind( MojoExecution.class ).toProvider( MojoExecutionScope.seededKeyProvider() ).in( scope );
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
index c28f218..946bffb 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
@@ -251,7 +251,7 @@ public class MojoExecutor
Collection<String> scopesToResolve = dependencyContext.getScopesToResolveForCurrentProject();
lifeCycleDependencyResolver.resolveProjectDependencies( project, scopesToCollect, scopesToResolve, session,
- aggregating, Collections.<Artifact>emptySet() );
+ aggregating, Collections.emptySet() );
dependencyContext.synchronizeWithProjectState();
}
@@ -269,7 +269,7 @@ public class MojoExecutor
{
lifeCycleDependencyResolver.resolveProjectDependencies( aggregatedProject, scopesToCollect,
scopesToResolve, session, aggregating,
- Collections.<Artifact>emptySet() );
+ Collections.emptySet() );
}
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index 378ebf1..ec0800f 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -104,7 +104,7 @@ public class DefaultLifecycleBindingsInjector
}
Map<Object, Object> context =
- Collections.<Object, Object>singletonMap( PLUGIN_MANAGEMENT, target.getBuild().getPluginManagement() );
+ Collections.singletonMap( PLUGIN_MANAGEMENT, target.getBuild().getPluginManagement() );
mergePluginContainer_Plugins( target.getBuild(), source.getBuild(), false, context );
}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
index b2b1c40..fef5fe1 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
@@ -94,7 +94,7 @@ public class DefaultPluginRealmCache
}
this.parentRealm = parentRealm;
this.foreignImports =
- ( foreignImports != null ) ? foreignImports : Collections.<String, ClassLoader>emptyMap();
+ ( foreignImports != null ) ? foreignImports : Collections.emptyMap();
this.filter = dependencyFilter;
int hash = 17;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 8492451..7da8ea8 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -453,7 +453,7 @@ public class DefaultMavenPluginManager
private List<Artifact> toMavenArtifacts( DependencyNode root, PreorderNodeListGenerator nlg )
{
List<Artifact> artifacts = new ArrayList<>( nlg.getNodes().size() );
- RepositoryUtils.toArtifacts( artifacts, Collections.singleton( root ), Collections.<String>emptyList(), null );
+ RepositoryUtils.toArtifacts( artifacts, Collections.singleton( root ), Collections.emptyList(), null );
artifacts.removeIf( artifact -> artifact.getFile() == null );
return Collections.unmodifiableList( artifacts );
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java b/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
index 509e8b4..8e5a6ba 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
@@ -100,7 +100,7 @@ class DefaultDependencyResolutionResult
List<Exception> errors = resolutionErrors.get( dependency );
return ( errors != null )
? Collections.unmodifiableList( errors )
- : Collections.<Exception>emptyList();
+ : Collections.emptyList();
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
index 6651b62..d67e5a6 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
@@ -56,7 +56,7 @@ public class DefaultProjectRealmCache
{
this.extensionRealms = ( extensionRealms != null )
? Collections.unmodifiableList( extensionRealms )
- : Collections.<ClassRealm>emptyList();
+ : Collections.emptyList();
this.hashCode = this.extensionRealms.hashCode();
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 83b86c3..bbafcdf 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -1422,7 +1422,7 @@ public class MavenProject
*/
public void setResolvedArtifacts( Set<Artifact> artifacts )
{
- this.resolvedArtifacts = ( artifacts != null ) ? artifacts : Collections.<Artifact>emptySet();
+ this.resolvedArtifacts = ( artifacts != null ) ? artifacts : Collections.emptySet();
ArtifactsHolder artifactsHolder = threadLocalArtifactsHolder.get();
artifactsHolder.artifacts = null;
artifactsHolder.artifactMap = null;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
index b4f6b63..b4ec77d 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
@@ -115,10 +115,10 @@ public class DefaultProjectArtifactsCache
}
}
collect = scopesToCollect == null
- ? Collections.<String>emptySet()
+ ? Collections.emptySet()
: Collections.unmodifiableSet( new HashSet<>( scopesToCollect ) );
resolve = scopesToResolve == null
- ? Collections.<String>emptySet()
+ ? Collections.emptySet()
: Collections.unmodifiableSet( new HashSet<>( scopesToResolve ) );
this.aggregating = aggregating;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
index af63596..a3a8dd6 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
@@ -61,7 +61,7 @@ public class ProjectArtifact
DependencyManagement depMngt = project.getDependencyManagement();
return ( depMngt != null )
? Collections.unmodifiableList( depMngt.getDependencies() )
- : Collections.<Dependency>emptyList();
+ : Collections.emptyList();
}
diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
index 31c2900..de97d44 100644
--- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
+++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
@@ -116,7 +116,7 @@ public class SessionScope
public Memento memento()
{
LinkedList<ScopeState> stack = values.get();
- return new Memento( stack != null ? stack.getFirst().seeded : Collections.<Key<?>, Provider<?>>emptyMap() );
+ return new Memento( stack != null ? stack.getFirst().seeded : Collections.emptyMap() );
}
public <T> void seed( Class<T> clazz, Provider<T> value )
diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
index cd88104..b00c588 100644
--- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
+++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
@@ -61,6 +61,6 @@ public class SessionScopeModule
bindScope( SessionScoped.class, scope );
bind( SessionScope.class ).toInstance( scope );
- bind( MavenSession.class ).toProvider( SessionScope.<MavenSession>seededKeyProvider() ).in( scope );
+ bind( MavenSession.class ).toProvider( SessionScope.seededKeyProvider() ).in( scope );
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java
index df0c797..15d9958 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java
@@ -51,7 +51,7 @@ public class Result<T>
*/
public static <T> Result<T> success( T model )
{
- return success( model, Collections.<ModelProblem>emptyList() );
+ return success( model, Collections.emptyList() );
}
/**
@@ -99,7 +99,7 @@ public class Result<T>
public static <T> Result<T> error( T model )
{
- return error( model, Collections.<ModelProblem>emptyList() );
+ return error( model, Collections.emptyList() );
}
public static <T> Result<T> error( Result<?> result )
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
index 01ead82..2d4e1ef 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
@@ -318,7 +318,7 @@ public class PluginDescriptor
{
return ( introducedDependencyArtifacts != null )
? introducedDependencyArtifacts
- : Collections.<Artifact>emptySet();
+ : Collections.emptySet();
}
public void setName( String name )