http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java index a417219..bf053cc 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java @@ -69,7 +69,7 @@ public class MojoExecution * The executions to fork before this execution, indexed by the groupId:artifactId:version of the project on which * the forked execution are to be run and in reactor build order. */ - private Map<String, List<MojoExecution>> forkedExecutions = new LinkedHashMap<String, List<MojoExecution>>(); + private Map<String, List<MojoExecution>> forkedExecutions = new LinkedHashMap<>(); public MojoExecution( Plugin plugin, String goal, String executionId ) {
http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java index f397c1e..bb55eb9 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java @@ -39,7 +39,7 @@ public class DefaultLegacySupport { private static final ThreadLocal<AtomicReference<MavenSession>> SESSION = - new InheritableThreadLocal<AtomicReference<MavenSession>>(); + new InheritableThreadLocal<>(); public void setSession( MavenSession session ) { @@ -55,7 +55,7 @@ public class DefaultLegacySupport } else { - DefaultLegacySupport.SESSION.set( new AtomicReference<MavenSession>( session ) ); + DefaultLegacySupport.SESSION.set( new AtomicReference<>( session ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java index 5b0c271..b79b15f 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java @@ -107,7 +107,7 @@ public class DefaultPluginDependenciesResolver String requiredMavenVersion = (String) result.getProperties().get( "prerequisites.maven" ); if ( requiredMavenVersion != null ) { - Map<String, String> props = new LinkedHashMap<String, String>( pluginArtifact.getProperties() ); + Map<String, String> props = new LinkedHashMap<>( pluginArtifact.getProperties() ); props.put( "requiredMavenVersion", requiredMavenVersion ); pluginArtifact = pluginArtifact.setProperties( props ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java index 015060f..e2f4526 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java @@ -248,11 +248,7 @@ public class DefaultPluginManager { throw new PluginNotFoundException( plugin, project.getPluginArtifactRepositories() ); } - catch ( PluginDescriptorParsingException e ) - { - throw new PluginManagerException( plugin, e.getMessage(), e ); - } - catch ( InvalidPluginDescriptorException e ) + catch ( PluginDescriptorParsingException | InvalidPluginDescriptorException e ) { throw new PluginManagerException( plugin, e.getMessage(), e ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java index 533920a..18756f3 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java @@ -46,11 +46,11 @@ class PluginDependencyResolutionListener private ArtifactFilter coreFilter; - private LinkedList<Artifact> coreArtifacts = new LinkedList<Artifact>(); + private LinkedList<Artifact> coreArtifacts = new LinkedList<>(); private Artifact wagonProvider; - private Map<Artifact, Object> bannedArtifacts = new IdentityHashMap<Artifact, Object>(); + private Map<Artifact, Object> bannedArtifacts = new IdentityHashMap<>(); public PluginDependencyResolutionListener( ArtifactFilter coreFilter ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java index 706694b..e9c08be 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java @@ -47,7 +47,7 @@ class ValidatingConfigurationListener { this.mojo = mojo; this.delegate = delegate; - this.missingParameters = new HashMap<String, Parameter>(); + this.missingParameters = new HashMap<>(); if ( mojoDescriptor.getParameters() != null ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java index 8d2ad0f..25a5bc8 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java @@ -164,7 +164,7 @@ public class DefaultPluginPrefixResolver { RequestTrace trace = RequestTrace.newChild( null, request ); - List<MetadataRequest> requests = new ArrayList<MetadataRequest>(); + List<MetadataRequest> requests = new ArrayList<>(); for ( String pluginGroup : request.getPluginGroups() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java index 76b6bfd..f11ee95 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java @@ -121,7 +121,7 @@ public class DefaultPluginVersionResolver new DefaultMetadata( request.getGroupId(), request.getArtifactId(), "maven-metadata.xml", DefaultMetadata.Nature.RELEASE_OR_SNAPSHOT ); - List<MetadataRequest> requests = new ArrayList<MetadataRequest>(); + List<MetadataRequest> requests = new ArrayList<>(); requests.add( new MetadataRequest( metadata, null, REPOSITORY_CONTEXT ).setTrace( trace ) ); @@ -176,8 +176,8 @@ public class DefaultPluginVersionResolver { VersionScheme versionScheme = new GenericVersionScheme(); - TreeSet<Version> releases = new TreeSet<Version>( Collections.reverseOrder() ); - TreeSet<Version> snapshots = new TreeSet<Version>( Collections.reverseOrder() ); + TreeSet<Version> releases = new TreeSet<>( Collections.reverseOrder() ); + TreeSet<Version> snapshots = new TreeSet<>( Collections.reverseOrder() ); for ( String ver : versions.versions.keySet() ) { @@ -401,7 +401,7 @@ public class DefaultPluginVersionResolver ArtifactRepository latestRepository; - Map<String, ArtifactRepository> versions = new LinkedHashMap<String, ArtifactRepository>(); + Map<String, ArtifactRepository> versions = new LinkedHashMap<>(); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java ---------------------------------------------------------------------- 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 07c6a2f..dbdf252 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 @@ -37,15 +37,15 @@ class DefaultDependencyResolutionResult private DependencyNode root; - private List<Dependency> dependencies = new ArrayList<Dependency>(); + private List<Dependency> dependencies = new ArrayList<>(); - private List<Dependency> resolvedDependencies = new ArrayList<Dependency>(); + private List<Dependency> resolvedDependencies = new ArrayList<>(); - private List<Dependency> unresolvedDependencies = new ArrayList<Dependency>(); + private List<Dependency> unresolvedDependencies = new ArrayList<>(); - private List<Exception> collectionErrors = new ArrayList<Exception>(); + private List<Exception> collectionErrors = new ArrayList<>(); - private Map<Dependency, List<Exception>> resolutionErrors = new IdentityHashMap<Dependency, List<Exception>>(); + private Map<Dependency, List<Exception>> resolutionErrors = new IdentityHashMap<>(); public DependencyNode getDependencyGraph() { @@ -91,7 +91,7 @@ class DefaultDependencyResolutionResult } else { - this.collectionErrors = new ArrayList<Exception>(); + this.collectionErrors = new ArrayList<>(); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java index a536562..632ee1b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java @@ -114,19 +114,7 @@ public class DefaultModelBuildingListener project.setClassRealm( record.realm ); project.setExtensionDependencyFilter( record.extensionArtifactFilter ); } - catch ( PluginResolutionException e ) - { - event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ) - .setMessage( "Unresolveable build extension: " + e.getMessage() ) - .setException( e ) ); - } - catch ( PluginVersionResolutionException e ) - { - event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ) - .setMessage( "Unresolveable build extension: " + e.getMessage() ) - .setException( e ) ); - } - catch ( PluginManagerException e ) + catch ( PluginResolutionException | PluginManagerException | PluginVersionResolutionException e ) { event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ) .setMessage( "Unresolveable build extension: " + e.getMessage() ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index 99edc80..9d51a6d 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -219,7 +219,7 @@ public class DefaultProjectBuilder resolutionResult = e.getResult(); } - Set<Artifact> artifacts = new LinkedHashSet<Artifact>(); + Set<Artifact> artifacts = new LinkedHashSet<>(); if ( resolutionResult.getDependencyGraph() != null ) { RepositoryUtils.toArtifacts( artifacts, resolutionResult.getDependencyGraph().getChildren(), @@ -244,7 +244,7 @@ public class DefaultProjectBuilder private List<String> getProfileIds( List<Profile> profiles ) { - List<String> ids = new ArrayList<String>( profiles.size() ); + List<String> ids = new ArrayList<>( profiles.size() ); for ( Profile profile : profiles ) { @@ -388,15 +388,15 @@ public class DefaultProjectBuilder public List<ProjectBuildingResult> build( List<File> pomFiles, boolean recursive, ProjectBuildingRequest request ) throws ProjectBuildingException { - List<ProjectBuildingResult> results = new ArrayList<ProjectBuildingResult>(); + List<ProjectBuildingResult> results = new ArrayList<>(); - List<InterimResult> interimResults = new ArrayList<InterimResult>(); + List<InterimResult> interimResults = new ArrayList<>(); ReactorModelPool modelPool = new ReactorModelPool(); InternalConfig config = new InternalConfig( request, modelPool ); - Map<String, MavenProject> projectIndex = new HashMap<String, MavenProject>( 256 ); + Map<String, MavenProject> projectIndex = new HashMap<>( 256 ); boolean noErrors = build( results, interimResults, projectIndex, pomFiles, new LinkedHashSet<File>(), true, recursive, @@ -479,7 +479,7 @@ public class DefaultProjectBuilder { File basedir = pomFile.getParentFile(); - List<File> moduleFiles = new ArrayList<File>(); + List<File> moduleFiles = new ArrayList<>(); for ( String module : model.getModules() ) { @@ -550,7 +550,7 @@ public class DefaultProjectBuilder moduleFiles.add( moduleFile ); } - interimResult.modules = new ArrayList<InterimResult>(); + interimResult.modules = new ArrayList<>(); if ( !build( results, interimResult.modules, projectIndex, moduleFiles, aggregatorFiles, false, recursive, config ) ) @@ -622,7 +622,7 @@ public class DefaultProjectBuilder MavenProject project = interimResult.listener.getProject(); initProject( project, projectIndex, result, profilesXmls, request ); - List<MavenProject> modules = new ArrayList<MavenProject>(); + List<MavenProject> modules = new ArrayList<>(); noErrors = build( results, modules, projectIndex, interimResult.modules, request, profilesXmls ) && noErrors; @@ -714,7 +714,7 @@ public class DefaultProjectBuilder project.addTestCompileSourceRoot( build.getTestSourceDirectory() ); } - List<Profile> activeProfiles = new ArrayList<Profile>(); + List<Profile> activeProfiles = new ArrayList<>(); activeProfiles.addAll( result.getActivePomProfiles( result.getModelIds().get( 0 ) ) ); activeProfiles.addAll( result.getActiveExternalProfiles() ); project.setActiveProfiles( activeProfiles ); @@ -742,7 +742,7 @@ public class DefaultProjectBuilder project.setProjectBuildingRequest( projectBuildingRequest ); // pluginArtifacts - Set<Artifact> pluginArtifacts = new HashSet<Artifact>(); + Set<Artifact> pluginArtifacts = new HashSet<>(); for ( Plugin plugin : project.getBuildPlugins() ) { Artifact artifact = repositorySystem.createPluginArtifact( plugin ); @@ -755,7 +755,7 @@ public class DefaultProjectBuilder project.setPluginArtifacts( pluginArtifacts ); // reportArtifacts - Set<Artifact> reportArtifacts = new HashSet<Artifact>(); + Set<Artifact> reportArtifacts = new HashSet<>(); for ( ReportPlugin report : project.getReportPlugins() ) { Plugin pp = new Plugin(); @@ -773,7 +773,7 @@ public class DefaultProjectBuilder project.setReportArtifacts( reportArtifacts ); // extensionArtifacts - Set<Artifact> extensionArtifacts = new HashSet<Artifact>(); + Set<Artifact> extensionArtifacts = new HashSet<>(); List<Extension> extensions = project.getBuildExtensions(); if ( extensions != null ) { @@ -809,7 +809,7 @@ public class DefaultProjectBuilder if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null ) && ( deps.size() > 0 ) ) { - map = new HashMap<String, Artifact>(); + map = new HashMap<>(); for ( Dependency d : dependencyManagement.getDependencies() ) { Artifact artifact = repositorySystem.createDependencyArtifact( d ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java index aea8fdb..7004feb 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java @@ -88,7 +88,7 @@ public class DefaultProjectBuildingHelper ProjectBuildingRequest request ) throws InvalidRepositoryException { - List<ArtifactRepository> internalRepositories = new ArrayList<ArtifactRepository>(); + List<ArtifactRepository> internalRepositories = new ArrayList<>(); for ( Repository repository : pomRepositories ) { @@ -115,8 +115,8 @@ public class DefaultProjectBuildingHelper recessiveRepositories = externalRepositories; } - List<ArtifactRepository> artifactRepositories = new ArrayList<ArtifactRepository>(); - Collection<String> repoIds = new HashSet<String>(); + List<ArtifactRepository> artifactRepositories = new ArrayList<>(); + Collection<String> repoIds = new HashSet<>(); if ( dominantRepositories != null ) { @@ -149,7 +149,7 @@ public class DefaultProjectBuildingHelper { ClassRealm projectRealm; - List<Plugin> extensionPlugins = new ArrayList<Plugin>(); + List<Plugin> extensionPlugins = new ArrayList<>(); Build build = model.getBuild(); @@ -183,13 +183,13 @@ public class DefaultProjectBuildingHelper return new ProjectRealmCache.CacheRecord( null, null ); } - List<ClassRealm> extensionRealms = new ArrayList<ClassRealm>(); + List<ClassRealm> extensionRealms = new ArrayList<>(); - Map<ClassRealm, List<String>> exportedPackages = new HashMap<ClassRealm, List<String>>(); + Map<ClassRealm, List<String>> exportedPackages = new HashMap<>(); - Map<ClassRealm, List<String>> exportedArtifacts = new HashMap<ClassRealm, List<String>>(); + Map<ClassRealm, List<String>> exportedArtifacts = new HashMap<>(); - List<Artifact> publicArtifacts = new ArrayList<Artifact>(); + List<Artifact> publicArtifacts = new ArrayList<>(); for ( Plugin plugin : extensionPlugins ) { @@ -232,7 +232,7 @@ public class DefaultProjectBuildingHelper { projectRealm = classRealmManager.createProjectRealm( model, toAetherArtifacts( publicArtifacts ) ); - Set<String> exclusions = new LinkedHashSet<String>(); + Set<String> exclusions = new LinkedHashSet<>(); for ( ClassRealm extensionRealm : extensionRealms ) { @@ -289,7 +289,7 @@ public class DefaultProjectBuildingHelper private List<org.eclipse.aether.artifact.Artifact> toAetherArtifacts( final List<Artifact> pluginArtifacts ) { - return new ArrayList<org.eclipse.aether.artifact.Artifact>( RepositoryUtils.toArtifacts( pluginArtifacts ) ); + return new ArrayList<>( RepositoryUtils.toArtifacts( pluginArtifacts ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java index 185e4ca..579bd45 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java @@ -68,13 +68,13 @@ public class DefaultProjectBuildingRequest public DefaultProjectBuildingRequest() { processPlugins = true; - profiles = new ArrayList<Profile>(); - activeProfileIds = new ArrayList<String>(); - inactiveProfileIds = new ArrayList<String>(); + profiles = new ArrayList<>(); + activeProfileIds = new ArrayList<>(); + inactiveProfileIds = new ArrayList<>(); systemProperties = new Properties(); userProperties = new Properties(); - remoteRepositories = new ArrayList<ArtifactRepository>(); - pluginArtifactRepositories = new ArrayList<ArtifactRepository>(); + remoteRepositories = new ArrayList<>(); + pluginArtifactRepositories = new ArrayList<>(); } public DefaultProjectBuildingRequest( ProjectBuildingRequest request ) @@ -126,7 +126,7 @@ public class DefaultProjectBuildingRequest { if ( remoteRepositories != null ) { - this.remoteRepositories = new ArrayList<ArtifactRepository>( remoteRepositories ); + this.remoteRepositories = new ArrayList<>( remoteRepositories ); } else { @@ -145,7 +145,7 @@ public class DefaultProjectBuildingRequest { if ( pluginArtifactRepositories != null ) { - this.pluginArtifactRepositories = new ArrayList<ArtifactRepository>( pluginArtifactRepositories ); + this.pluginArtifactRepositories = new ArrayList<>( pluginArtifactRepositories ); } else { @@ -253,7 +253,7 @@ public class DefaultProjectBuildingRequest { if ( activeProfileIds != null ) { - this.activeProfileIds = new ArrayList<String>( activeProfileIds ); + this.activeProfileIds = new ArrayList<>( activeProfileIds ); } else { @@ -270,7 +270,7 @@ public class DefaultProjectBuildingRequest { if ( inactiveProfileIds != null ) { - this.inactiveProfileIds = new ArrayList<String>( inactiveProfileIds ); + this.inactiveProfileIds = new ArrayList<>( inactiveProfileIds ); } else { @@ -282,7 +282,7 @@ public class DefaultProjectBuildingRequest { if ( profiles != null ) { - this.profiles = new ArrayList<Profile>( profiles ); + this.profiles = new ArrayList<>( profiles ); } else { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java index b64a395..7d02810 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java @@ -96,7 +96,7 @@ class DefaultProjectBuildingResult { if ( problems == null ) { - problems = new ArrayList<ModelProblem>(); + problems = new ArrayList<>(); } return problems; http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java index 1287eb1..50c9e35 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java @@ -119,7 +119,7 @@ public class DefaultProjectDependenciesResolver } else { - Map<String, Dependency> dependencies = new HashMap<String, Dependency>(); + Map<String, Dependency> dependencies = new HashMap<>(); for ( Dependency dependency : project.getDependencies() ) { String classifier = dependency.getClassifier(); @@ -298,7 +298,7 @@ public class DefaultProjectDependenciesResolver { if ( managed == null ) { - managed = new HashMap<String, Dependency>(); + managed = new HashMap<>(); if ( project.getDependencyManagement() != null ) { for ( Dependency dep : project.getDependencyManagement().getDependencies() ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java ---------------------------------------------------------------------- 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 53b82bc..a5eef44 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 @@ -84,7 +84,7 @@ public class DefaultProjectRealmCache } } - protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<Key, CacheRecord>(); + protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<>(); @Override public Key createKey( List<? extends ClassRealm> extensionRealms ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java index 062b8b7..9602c00 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java +++ b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java @@ -45,7 +45,7 @@ public class ExtensionDescriptor { if ( exportedPackages == null ) { - exportedPackages = new ArrayList<String>(); + exportedPackages = new ArrayList<>(); } return exportedPackages; @@ -59,7 +59,7 @@ public class ExtensionDescriptor } else { - this.exportedPackages = new ArrayList<String>( exportedPackages ); + this.exportedPackages = new ArrayList<>( exportedPackages ); } } @@ -67,7 +67,7 @@ public class ExtensionDescriptor { if ( exportedArtifacts == null ) { - exportedArtifacts = new ArrayList<String>(); + exportedArtifacts = new ArrayList<>(); } return exportedArtifacts; @@ -81,7 +81,7 @@ public class ExtensionDescriptor } else { - this.exportedArtifacts = new ArrayList<String>( exportedArtifacts ); + this.exportedArtifacts = new ArrayList<>( exportedArtifacts ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java index c835eff..d990880 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java @@ -19,6 +19,12 @@ package org.apache.maven.project; * under the License. */ +import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.ReaderFactory; +import org.codehaus.plexus.util.xml.Xpp3Dom; +import org.codehaus.plexus.util.xml.Xpp3DomBuilder; +import org.codehaus.plexus.util.xml.pull.XmlPullParserException; + import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -29,12 +35,6 @@ import java.util.List; import java.util.jar.JarFile; import java.util.zip.ZipEntry; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.ReaderFactory; -import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.codehaus.plexus.util.xml.Xpp3DomBuilder; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; - /** * Creates an extension descriptor from some XML stream. * @@ -44,7 +44,7 @@ public class ExtensionDescriptorBuilder { /** - * @since 3.3.0 + * @since 3.3.0 */ public String getExtensionDescriptorLocation() { @@ -65,8 +65,7 @@ public class ExtensionDescriptorBuilder if ( extensionJar.isFile() ) { - JarFile pluginJar = new JarFile( extensionJar, false ); - try + try ( JarFile pluginJar = new JarFile( extensionJar, false ) ) { ZipEntry pluginDescriptorEntry = pluginJar.getEntry( getExtensionDescriptorLocation() ); @@ -84,10 +83,6 @@ public class ExtensionDescriptorBuilder } } } - finally - { - pluginJar.close(); - } } else { @@ -146,7 +141,7 @@ public class ExtensionDescriptorBuilder if ( dom != null ) { - strings = new ArrayList<String>(); + strings = new ArrayList<>(); for ( Xpp3Dom child : dom.getChildren() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java ---------------------------------------------------------------------- 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 32fcae1..952622f 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 @@ -127,19 +127,19 @@ public class MavenProject private List<MavenProject> collectedProjects; - private List<String> compileSourceRoots = new ArrayList<String>(); + private List<String> compileSourceRoots = new ArrayList<>(); - private List<String> testCompileSourceRoots = new ArrayList<String>(); + private List<String> testCompileSourceRoots = new ArrayList<>(); - private List<String> scriptSourceRoots = new ArrayList<String>(); + private List<String> scriptSourceRoots = new ArrayList<>(); private ArtifactRepository releaseArtifactRepository; private ArtifactRepository snapshotArtifactRepository; - private List<Profile> activeProfiles = new ArrayList<Profile>(); + private List<Profile> activeProfiles = new ArrayList<>(); - private Map<String, List<String>> injectedProfileIds = new LinkedHashMap<String, List<String>>(); + private Map<String, List<String>> injectedProfileIds = new LinkedHashMap<>(); private Set<Artifact> dependencyArtifacts; @@ -162,7 +162,7 @@ public class MavenProject private Map<String, Artifact> managedVersionMap; - private Map<String, MavenProject> projectReferences = new HashMap<String, MavenProject>(); + private Map<String, MavenProject> projectReferences = new HashMap<>(); private boolean executionRoot; @@ -340,7 +340,7 @@ public class MavenProject public List<String> getCompileClasspathElements() throws DependencyResolutionRequiredException { - List<String> list = new ArrayList<String>( getArtifacts().size() + 1 ); + List<String> list = new ArrayList<>( getArtifacts().size() + 1 ); String d = getBuild().getOutputDirectory(); if ( d != null ) @@ -369,7 +369,7 @@ public class MavenProject public List<String> getTestClasspathElements() throws DependencyResolutionRequiredException { - List<String> list = new ArrayList<String>( getArtifacts().size() + 2 ); + List<String> list = new ArrayList<>( getArtifacts().size() + 2 ); String d = getBuild().getTestOutputDirectory(); if ( d != null ) @@ -397,7 +397,7 @@ public class MavenProject public List<String> getRuntimeClasspathElements() throws DependencyResolutionRequiredException { - List<String> list = new ArrayList<String>( getArtifacts().size() + 1 ); + List<String> list = new ArrayList<>( getArtifacts().size() + 1 ); String d = getBuild().getOutputDirectory(); if ( d != null ) @@ -705,11 +705,11 @@ public class MavenProject { if ( artifactFilter == null || resolvedArtifacts == null ) { - artifacts = new LinkedHashSet<Artifact>(); + artifacts = new LinkedHashSet<>(); } else { - artifacts = new LinkedHashSet<Artifact>( resolvedArtifacts.size() * 2 ); + artifacts = new LinkedHashSet<>( resolvedArtifacts.size() * 2 ); for ( Artifact artifact : resolvedArtifacts ) { if ( artifactFilter.include( artifact ) ) @@ -823,7 +823,7 @@ public class MavenProject { if ( remoteArtifactRepositories == null ) { - remoteArtifactRepositories = new ArrayList<ArtifactRepository>(); + remoteArtifactRepositories = new ArrayList<>(); } return remoteArtifactRepositories; @@ -843,7 +843,7 @@ public class MavenProject { if ( pluginArtifactRepositories == null ) { - pluginArtifactRepositories = new ArrayList<ArtifactRepository>(); + pluginArtifactRepositories = new ArrayList<>(); } return pluginArtifactRepositories; @@ -885,7 +885,7 @@ public class MavenProject { if ( injectedProfileIds != null ) { - this.injectedProfileIds.put( source, new ArrayList<String>( injectedProfileIds ) ); + this.injectedProfileIds.put( source, new ArrayList<>( injectedProfileIds ) ); } else { @@ -928,7 +928,7 @@ public class MavenProject { if ( attachedArtifacts == null ) { - attachedArtifacts = new ArrayList<Artifact>(); + attachedArtifacts = new ArrayList<>(); } return attachedArtifacts; } @@ -1262,23 +1262,23 @@ public class MavenProject if ( project.getAttachedArtifacts() != null ) { // clone properties modifyable by plugins in a forked lifecycle - setAttachedArtifacts( new ArrayList<Artifact>( project.getAttachedArtifacts() ) ); + setAttachedArtifacts( new ArrayList<>( project.getAttachedArtifacts() ) ); } if ( project.getCompileSourceRoots() != null ) { // clone source roots - setCompileSourceRoots( ( new ArrayList<String>( project.getCompileSourceRoots() ) ) ); + setCompileSourceRoots( ( new ArrayList<>( project.getCompileSourceRoots() ) ) ); } if ( project.getTestCompileSourceRoots() != null ) { - setTestCompileSourceRoots( ( new ArrayList<String>( project.getTestCompileSourceRoots() ) ) ); + setTestCompileSourceRoots( ( new ArrayList<>( project.getTestCompileSourceRoots() ) ) ); } if ( project.getScriptSourceRoots() != null ) { - setScriptSourceRoots( ( new ArrayList<String>( project.getScriptSourceRoots() ) ) ); + setScriptSourceRoots( ( new ArrayList<>( project.getScriptSourceRoots() ) ) ); } if ( project.getModel() != null ) @@ -1300,7 +1300,7 @@ public class MavenProject if ( project.getManagedVersionMap() != null ) { - setManagedVersionMap( new HashMap<String, Artifact>( project.getManagedVersionMap() ) ); + setManagedVersionMap( new HashMap<>( project.getManagedVersionMap() ) ); } lifecyclePhases.addAll( project.lifecyclePhases ); @@ -1331,7 +1331,7 @@ public class MavenProject { if ( context == null ) { - context = new HashMap<String, Object>(); + context = new HashMap<>(); } if ( value != null ) { @@ -1495,7 +1495,7 @@ public class MavenProject if ( moduleAdjustments == null ) { - moduleAdjustments = new HashMap<String, String>(); + moduleAdjustments = new HashMap<>(); List<String> modules = getModules(); if ( modules != null ) @@ -1571,7 +1571,7 @@ public class MavenProject @Deprecated public List<Artifact> getCompileArtifacts() { - List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() ); + List<Artifact> list = new ArrayList<>( getArtifacts().size() ); for ( Artifact a : getArtifacts() ) { @@ -1599,7 +1599,7 @@ public class MavenProject return Collections.emptyList(); } - List<Dependency> list = new ArrayList<Dependency>( artifacts.size() ); + List<Dependency> list = new ArrayList<>( artifacts.size() ); for ( Artifact a : getArtifacts() ) { @@ -1625,7 +1625,7 @@ public class MavenProject @Deprecated public List<Artifact> getTestArtifacts() { - List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() ); + List<Artifact> list = new ArrayList<>( getArtifacts().size() ); for ( Artifact a : getArtifacts() ) { @@ -1648,7 +1648,7 @@ public class MavenProject return Collections.emptyList(); } - List<Dependency> list = new ArrayList<Dependency>( artifacts.size() ); + List<Dependency> list = new ArrayList<>( artifacts.size() ); for ( Artifact a : getArtifacts() ) { @@ -1676,7 +1676,7 @@ public class MavenProject return Collections.emptyList(); } - List<Dependency> list = new ArrayList<Dependency>( artifacts.size() ); + List<Dependency> list = new ArrayList<>( artifacts.size() ); for ( Artifact a : getArtifacts() ) { @@ -1701,7 +1701,7 @@ public class MavenProject @Deprecated public List<Artifact> getRuntimeArtifacts() { - List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() ); + List<Artifact> list = new ArrayList<>( getArtifacts().size() ); for ( Artifact a : getArtifacts() ) { @@ -1720,7 +1720,7 @@ public class MavenProject public List<String> getSystemClasspathElements() throws DependencyResolutionRequiredException { - List<String> list = new ArrayList<String>( getArtifacts().size() ); + List<String> list = new ArrayList<>( getArtifacts().size() ); String d = getBuild().getOutputDirectory(); if ( d != null ) @@ -1745,7 +1745,7 @@ public class MavenProject @Deprecated public List<Artifact> getSystemArtifacts() { - List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() ); + List<Artifact> list = new ArrayList<>( getArtifacts().size() ); for ( Artifact a : getArtifacts() ) { @@ -1772,7 +1772,7 @@ public class MavenProject return Collections.emptyList(); } - List<Dependency> list = new ArrayList<Dependency>( artifacts.size() ); + List<Dependency> list = new ArrayList<>( artifacts.size() ); for ( Artifact a : getArtifacts() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java index 3e33eb5..184be70 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java @@ -91,14 +91,14 @@ public class ProjectModelResolver this.trace = trace; this.resolver = resolver; this.remoteRepositoryManager = remoteRepositoryManager; - this.pomRepositories = new ArrayList<RemoteRepository>(); - List<RemoteRepository> externalRepositories = new ArrayList<RemoteRepository>(); + this.pomRepositories = new ArrayList<>(); + List<RemoteRepository> externalRepositories = new ArrayList<>(); externalRepositories.addAll( repositories ); this.externalRepositories = Collections.unmodifiableList( externalRepositories ); - this.repositories = new ArrayList<RemoteRepository>(); + this.repositories = new ArrayList<>(); this.repositories.addAll( externalRepositories ); this.repositoryMerging = repositoryMerging; - this.repositoryIds = new HashSet<String>(); + this.repositoryIds = new HashSet<>(); this.modelPool = modelPool; } @@ -108,11 +108,11 @@ public class ProjectModelResolver this.trace = original.trace; this.resolver = original.resolver; this.remoteRepositoryManager = original.remoteRepositoryManager; - this.pomRepositories = new ArrayList<RemoteRepository>( original.pomRepositories ); + this.pomRepositories = new ArrayList<>( original.pomRepositories ); this.externalRepositories = original.externalRepositories; - this.repositories = new ArrayList<RemoteRepository>( original.repositories ); + this.repositories = new ArrayList<>( original.repositories ); this.repositoryMerging = original.repositoryMerging; - this.repositoryIds = new HashSet<String>( original.repositoryIds ); + this.repositoryIds = new HashSet<>( original.repositoryIds ); this.modelPool = original.modelPool; } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java index 16985e2..504097f 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java @@ -77,10 +77,10 @@ public class ProjectSorter dag = new DAG(); // groupId:artifactId:version -> project - projectMap = new HashMap<String, MavenProject>( projects.size() * 2 ); + projectMap = new HashMap<>( projects.size() * 2 ); // groupId:artifactId -> (version -> vertex) - Map<String, Map<String, Vertex>> vertexMap = new HashMap<String, Map<String, Vertex>>( projects.size() * 2 ); + Map<String, Map<String, Vertex>> vertexMap = new HashMap<>( projects.size() * 2 ); for ( MavenProject project : projects ) { @@ -99,7 +99,7 @@ public class ProjectSorter Map<String, Vertex> vertices = vertexMap.get( projectKey ); if ( vertices == null ) { - vertices = new HashMap<String, Vertex>( 2, 1 ); + vertices = new HashMap<>( 2, 1 ); vertexMap.put( projectKey, vertices ); } vertices.put( project.getVersion(), dag.addVertex( projectId ) ); @@ -154,7 +154,7 @@ public class ProjectSorter } } - List<MavenProject> sortedProjects = new ArrayList<MavenProject>( projects.size() ); + List<MavenProject> sortedProjects = new ArrayList<>( projects.size() ); List<String> sortedProjectLabels = TopologicalSorter.sort( dag ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java index 24425da..9b7c84f 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java @@ -33,7 +33,7 @@ class ReactorModelCache implements ModelCache { - private final Map<CacheKey, Object> models = new HashMap<CacheKey, Object>( 256 ); + private final Map<CacheKey, Object> models = new HashMap<>( 256 ); public Object get( String groupId, String artifactId, String version, String tag ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java index 294fccd..318dc19 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java +++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java @@ -32,7 +32,7 @@ import java.util.Map; class ReactorModelPool { - private final Map<CacheKey, File> pomFiles = new HashMap<CacheKey, File>(); + private final Map<CacheKey, File> pomFiles = new HashMap<>(); public File get( String groupId, String artifactId, String version ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java index 07fd11d..f52b540 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java @@ -41,14 +41,14 @@ public class DefaultMavenMetadataCache implements MavenMetadataCache { - protected final Map<CacheKey, CacheRecord> cache = new ConcurrentHashMap<CacheKey, CacheRecord>(); + protected final Map<CacheKey, CacheRecord> cache = new ConcurrentHashMap<>(); public static class CacheKey { private final Artifact artifact; private final long pomHash; private final boolean resolveManagedVersions; - private final List<ArtifactRepository> repositories = new ArrayList<ArtifactRepository>(); + private final List<ArtifactRepository> repositories = new ArrayList<>(); private final int hashCode; public CacheKey( Artifact artifact, boolean resolveManagedVersions, ArtifactRepository localRepository, @@ -215,7 +215,7 @@ public class DefaultMavenMetadataCache this.pomArtifact = ArtifactUtils.copyArtifact( pomArtifact ); this.relocatedArtifact = ArtifactUtils.copyArtifactSafe( relocatedArtifact ); this.artifacts = ArtifactUtils.copyArtifacts( artifacts, new ArrayList<Artifact>() ); - this.remoteRepositories = new ArrayList<ArtifactRepository>( remoteRepositories ); + this.remoteRepositories = new ArrayList<>( remoteRepositories ); this.managedVersions = managedVersions; if ( managedVersions != null ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 1fb5c54..05fba19 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -215,11 +215,11 @@ public class MavenMetadataSource } } - Set<Artifact> artifacts = Collections.<Artifact>emptySet(); + Set<Artifact> artifacts = Collections.emptySet(); if ( !artifact.getArtifactHandler().isIncludesDependencies() ) { - artifacts = new LinkedHashSet<Artifact>(); + artifacts = new LinkedHashSet<>(); for ( Dependency dependency : dependencies ) { @@ -236,7 +236,7 @@ public class MavenMetadataSource if ( managedDependencies != null && request.isResolveManagedVersions() ) { - managedVersions = new HashMap<String, Artifact>(); + managedVersions = new HashMap<>(); for ( Dependency managedDependency : managedDependencies ) { @@ -270,7 +270,7 @@ public class MavenMetadataSource if ( pomRepositories != null && !pomRepositories.isEmpty() ) { - Map<String, ArtifactRepository> repos = new LinkedHashMap<String, ArtifactRepository>(); + Map<String, ArtifactRepository> repos = new LinkedHashMap<>(); for ( ArtifactRepository repo : requestRepositories ) { @@ -288,7 +288,7 @@ public class MavenMetadataSource } } - repositories = new ArrayList<ArtifactRepository>( repos.values() ); + repositories = new ArrayList<>( repos.values() ); } return repositories; @@ -394,7 +394,7 @@ public class MavenMetadataSource if ( !dependency.getExclusions().isEmpty() ) { - List<String> exclusions = new ArrayList<String>(); + List<String> exclusions = new ArrayList<>(); for ( Exclusion e : dependency.getExclusions() ) { @@ -467,7 +467,7 @@ public class MavenMetadataSource private List<ArtifactVersion> retrieveAvailableVersionsFromMetadata( Metadata repoMetadata, List<String> availableVersions ) { - Collection<String> versions = new LinkedHashSet<String>(); + Collection<String> versions = new LinkedHashSet<>(); if ( ( repoMetadata != null ) && ( repoMetadata.getVersioning() != null ) ) { @@ -476,7 +476,7 @@ public class MavenMetadataSource versions.addAll( availableVersions ); - List<ArtifactVersion> artifactVersions = new ArrayList<ArtifactVersion>( versions.size() ); + List<ArtifactVersion> artifactVersions = new ArrayList<>( versions.size() ); for ( String version : versions ) { @@ -493,7 +493,7 @@ public class MavenMetadataSource MavenProject project ) throws InvalidDependencyVersionException { - Set<Artifact> artifacts = new LinkedHashSet<Artifact>(); + Set<Artifact> artifacts = new LinkedHashSet<>(); for ( Dependency d : dependencies ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java index f47cb4b..90c1fa9 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java @@ -90,7 +90,7 @@ public class DelegatingLocalArtifactRepository @Override public List<String> findVersions( Artifact artifact ) { - Collection<String> versions = new LinkedHashSet<String>(); + Collection<String> versions = new LinkedHashSet<>(); if ( buildReactor != null ) { @@ -104,7 +104,7 @@ public class DelegatingLocalArtifactRepository versions.addAll( userLocalArtifactRepository.findVersions( artifact ) ); - return Collections.unmodifiableList( new ArrayList<String>( versions ) ); + return Collections.unmodifiableList( new ArrayList<>( versions ) ); } public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java ---------------------------------------------------------------------- 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 6d8913f..7ca63ab 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 @@ -62,14 +62,14 @@ public class SessionScope public final Map<Key<?>, Object> provided = Maps.newHashMap(); } - private final ThreadLocal<LinkedList<ScopeState>> values = new ThreadLocal<LinkedList<ScopeState>>(); + private final ThreadLocal<LinkedList<ScopeState>> values = new ThreadLocal<>(); public void enter() { LinkedList<ScopeState> stack = values.get(); if ( stack == null ) { - stack = new LinkedList<ScopeState>(); + stack = new LinkedList<>(); values.set( stack ); } stack.addFirst( new ScopeState() ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java index 043e5e6..59f5e13 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java @@ -40,7 +40,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain... private String type; - private Map<String, RequirementMatcher> provides = new HashMap<String, RequirementMatcher>(); + private Map<String, RequirementMatcher> provides = new HashMap<>(); public static final String KEY_TYPE = "type"; //NOI18N http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java index 8093bbd..9f7a26b 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java @@ -77,7 +77,7 @@ public class DefaultToolchainManager private List<Toolchain> selectToolchains( List<ToolchainModel> models, String type, Map<String, String> requirements ) { - List<Toolchain> toolchains = new ArrayList<Toolchain>(); + List<Toolchain> toolchains = new ArrayList<>(); if ( models != null ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java index cac8e29..40db389 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java @@ -41,7 +41,7 @@ public class DefaultToolchainManagerPrivate public ToolchainPrivate[] getToolchainsForType( String type, MavenSession context ) throws MisconfiguredToolchainException { - List<ToolchainPrivate> toRet = new ArrayList<ToolchainPrivate>(); + List<ToolchainPrivate> toRet = new ArrayList<>(); ToolchainFactory fact = factories.get( type ); if ( fact == null ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java index 56ed1d3..ccd354b 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java @@ -45,7 +45,7 @@ public class ToolchainsBuildingException { super( toMessage( problems ) ); - this.problems = new ArrayList<Problem>(); + this.problems = new ArrayList<>(); if ( problems != null ) { this.problems.addAll( problems ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java b/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java index 538f79b..ca910d8 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java @@ -50,7 +50,7 @@ public class MavenToolchainMerger private void shallowMerge( List<ToolchainModel> dominant, List<ToolchainModel> recessive, String recessiveSourceLevel ) { - Map<Object, ToolchainModel> merged = new LinkedHashMap<Object, ToolchainModel>(); + Map<Object, ToolchainModel> merged = new LinkedHashMap<>(); for ( ToolchainModel dominantModel : dominant ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java index 17aeab3..7d02856 100644 --- a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java +++ b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java @@ -115,7 +115,7 @@ public class MavenLifecycleParticipantTest PlexusContainer container = getContainer(); ComponentDescriptor<? extends AbstractMavenLifecycleParticipant> cd = - new ComponentDescriptor<InjectDependencyLifecycleListener>( InjectDependencyLifecycleListener.class, + new ComponentDescriptor<>( InjectDependencyLifecycleListener.class, container.getContainerRealm() ); cd.setRoleClass( AbstractMavenLifecycleParticipant.class ); container.addComponentDescriptor( cd ); @@ -132,7 +132,7 @@ public class MavenLifecycleParticipantTest assertEquals( "bar", project.getProperties().getProperty( "foo" ) ); - ArrayList<Artifact> artifacts = new ArrayList<Artifact>( project.getArtifacts() ); + ArrayList<Artifact> artifacts = new ArrayList<>( project.getArtifacts() ); assertEquals( 1, artifacts.size() ); assertEquals( INJECTED_ARTIFACT_ID, artifacts.get( 0 ).getArtifactId() ); @@ -151,7 +151,7 @@ public class MavenLifecycleParticipantTest { PlexusContainer container = getContainer(); - ComponentDescriptor<T> cd = new ComponentDescriptor<T>( participant, container.getContainerRealm() ); + ComponentDescriptor<T> cd = new ComponentDescriptor<>( participant, container.getContainerRealm() ); cd.setRoleClass( AbstractMavenLifecycleParticipant.class ); container.addComponentDescriptor( cd ); @@ -163,7 +163,7 @@ public class MavenLifecycleParticipantTest assertFalse( result.getExceptions().toString(), result.hasExceptions() ); - List<String> order = new ArrayList<String>(); + List<String> order = new ArrayList<>(); for ( MavenProject project : result.getTopologicallySortedProjects() ) { order.add( project.getArtifactId() ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java index 33673e3..1134fc5 100644 --- a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java +++ b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java @@ -61,11 +61,7 @@ public class DefaultBeanConfiguratorTest { return Xpp3DomBuilder.build( new StringReader( "<configuration>" + xml + "</configuration>" ) ); } - catch ( XmlPullParserException e ) - { - throw new IllegalArgumentException( e ); - } - catch ( IOException e ) + catch ( XmlPullParserException | IOException e ) { throw new IllegalArgumentException( e ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java index 873cc7d..b111969 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java @@ -34,7 +34,7 @@ import org.apache.maven.plugin.MojoExecutionException; public class DelegatingMojoExecutionListener implements MojoExecutionListener { - private final List<MojoExecutionListener> listeners = new CopyOnWriteArrayList<MojoExecutionListener>(); + private final List<MojoExecutionListener> listeners = new CopyOnWriteArrayList<>(); public void beforeMojoExecution( MojoExecutionEvent event ) throws MojoExecutionException http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java index 233ae25..4266c15 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java @@ -33,7 +33,7 @@ import org.apache.maven.execution.ProjectExecutionListener; public class DelegatingProjectExecutionListener implements ProjectExecutionListener { - private final List<ProjectExecutionListener> listeners = new CopyOnWriteArrayList<ProjectExecutionListener>(); + private final List<ProjectExecutionListener> listeners = new CopyOnWriteArrayList<>(); public void beforeProjectExecution( ProjectExecutionEvent event ) throws LifecycleExecutionException http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java b/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java index f9bbb2b..a812c26 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java @@ -39,7 +39,7 @@ public class EmptyLifecyclePluginAnalyzer // NOTE: The upper-case packaging name is intentional, that's a special hinting mode used for certain tests if ( "JAR".equals( packaging ) ) { - plugins = new LinkedHashSet<Plugin>(); + plugins = new LinkedHashSet<>(); plugins.add( newPlugin( "maven-compiler-plugin", "compile", "testCompile" ) ); plugins.add( newPlugin( "maven-resources-plugin", "resources", "testResources" ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java index 99b07e3..951f133 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java @@ -150,7 +150,7 @@ public class LifecycleExecutorTest List<MojoExecution> getExecutions( MavenExecutionPlan mavenExecutionPlan ) { - List<MojoExecution> result = new ArrayList<MojoExecution>(); + List<MojoExecution> result = new ArrayList<>(); for ( ExecutionPlanItem executionPlanItem : mavenExecutionPlan ) { result.add( executionPlanItem.getMojoExecution() ); @@ -285,7 +285,7 @@ public class LifecycleExecutorTest throws Exception { List<Plugin> plugins = - new ArrayList<Plugin>( lifecycleExecutor.getPluginsBoundByDefaultToAllLifecycles( "jar" ) ); + new ArrayList<>( lifecycleExecutor.getPluginsBoundByDefaultToAllLifecycles( "jar" ) ); assertEquals( 8, plugins.size() ); } @@ -416,7 +416,7 @@ public class LifecycleExecutorTest } } ); - final List<String> log = new ArrayList<String>(); + final List<String> log = new ArrayList<>(); MojoExecutionListener mojoListener = new MojoExecutionListener() { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java index 4901a65..ffd9f0d 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java @@ -18,12 +18,9 @@ package org.apache.maven.lifecycle; import junit.framework.TestCase; import org.apache.maven.lifecycle.internal.ExecutionPlanItem; -import org.apache.maven.lifecycle.internal.stub.DefaultLifecyclesStub; import org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub; import org.apache.maven.model.Plugin; -import java.util.Iterator; -import java.util.List; import java.util.Set; /** http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java index dc75a94..32ce9ba 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxerTest.java @@ -101,9 +101,9 @@ public class ThreadOutputMuxerTest Iterator<String> lyrics = stringList.iterator(); ExecutorService executor = Executors.newFixedThreadPool( 10 ); - CompletionService<ProjectSegment> service = new ExecutorCompletionService<ProjectSegment>( executor ); + CompletionService<ProjectSegment> service = new ExecutorCompletionService<>( executor ); - List<Future<ProjectSegment>> futures = new ArrayList<Future<ProjectSegment>>(); + List<Future<ProjectSegment>> futures = new ArrayList<>(); for ( ProjectSegment projectBuild : projectBuildList ) { final Future<ProjectSegment> buildFuture = http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java index 10a113e..8d4a04b 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java @@ -50,7 +50,7 @@ public class CompletionServiceStub public Future<ProjectSegment> submit( Callable<ProjectSegment> task ) { - FutureTask<ProjectSegment> projectBuildFutureTask = new FutureTask<ProjectSegment>( task ); + FutureTask<ProjectSegment> projectBuildFutureTask = new FutureTask<>( task ); projectBuildFutureTasks.add( projectBuildFutureTask ); if ( finishImmediately ) { @@ -61,7 +61,7 @@ public class CompletionServiceStub public Future<ProjectSegment> submit( Runnable task, ProjectSegment result ) { - FutureTask<ProjectSegment> projectBuildFutureTask = new FutureTask<ProjectSegment>( task, result ); + FutureTask<ProjectSegment> projectBuildFutureTask = new FutureTask<>( task, result ); projectBuildFutureTasks.add( projectBuildFutureTask ); if ( finishImmediately ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java index b366953..1dc2b6b 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java @@ -50,7 +50,7 @@ public class DefaultLifecyclesStub @SuppressWarnings( "unchecked" ) Iterator<List<String>> lcs = Arrays.asList( stubDefaultCycle, stubCleanCycle, stubSiteCycle ).iterator(); - Map<String, Lifecycle> lifeCycles = new HashMap<String, Lifecycle>(); + Map<String, Lifecycle> lifeCycles = new HashMap<>(); for ( String s : DefaultLifecycles.STANDARD_LIFECYCLES ) { final Lifecycle lifecycle = new Lifecycle( s, lcs.next(), null ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java index 930f5e9..b067e24 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java @@ -36,7 +36,7 @@ public class LifeCyclePluginAnalyzerStub // NOTE: The upper-case packaging name is intentional, that's a special hinting mode used for certain tests if ( "JAR".equals( packaging ) ) { - plugins = new LinkedHashSet<Plugin>(); + plugins = new LinkedHashSet<>(); plugins.add( newPlugin( "maven-compiler-plugin", "compile", "testCompile" ) ); plugins.add( newPlugin( "maven-resources-plugin", "resources", "testResources" ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java index cd33a35..ad08549 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java @@ -126,7 +126,7 @@ public class LifecycleExecutionPlanCalculatorStub return getProjectBExecutionPlan(); } // The remaining are basically "for future expansion" - List<MojoExecution> me = new ArrayList<MojoExecution>(); + List<MojoExecution> me = new ArrayList<>(); me.add( createMojoExecution( "resources", "default-resources", PROCESS_RESOURCES ) ); me.add( createMojoExecution( "compile", "default-compile", COMPILE ) ); return createExecutionPlan( project, me ); @@ -152,7 +152,7 @@ public class LifecycleExecutionPlanCalculatorStub PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException, NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException { - List<MojoExecution> me = new ArrayList<MojoExecution>(); + List<MojoExecution> me = new ArrayList<>(); me.add( createMojoExecution( "initialize", "default-initialize", INITIALIZE ) ); me.add( createMojoExecution( "resources", "default-resources", PROCESS_RESOURCES ) ); me.add( createMojoExecution( "compile", "default-compile", COMPILE ) ); @@ -169,7 +169,7 @@ public class LifecycleExecutionPlanCalculatorStub PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException, NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException { - List<MojoExecution> me = new ArrayList<MojoExecution>(); + List<MojoExecution> me = new ArrayList<>(); me.add( createMojoExecution( "enforce", "enforce-versions", VALIDATE ) ); me.add( createMojoExecution( "resources", "default-resources", PROCESS_RESOURCES ) ); me.add( createMojoExecution( "compile", "default-compile", COMPILE ) ); @@ -225,7 +225,7 @@ public class LifecycleExecutionPlanCalculatorStub public static Set<String> getScopes() { - return new HashSet<String>( Arrays.asList( "compile" ) ); + return new HashSet<>( Arrays.asList( "compile" ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java index 695d66d..ae613cc 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java @@ -49,7 +49,7 @@ public class LifecycleTaskSegmentCalculatorStub MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, PluginVersionResolutionException { - List<TaskSegment> taskSegments = new ArrayList<TaskSegment>( tasks.size() ); + List<TaskSegment> taskSegments = new ArrayList<>( tasks.size() ); TaskSegment currentSegment = null; http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java index 4147b36..8d01bc1 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java @@ -43,21 +43,21 @@ public class ProjectDependenciesResolverStub public Set<Artifact> resolve( MavenProject project, Collection<String> scopesToResolve, MavenSession session ) throws ArtifactResolutionException, ArtifactNotFoundException { - return new HashSet<Artifact>(); + return new HashSet<>(); } public Set<Artifact> resolve( MavenProject project, Collection<String> scopesToCollect, Collection<String> scopesToResolve, MavenSession session ) throws ArtifactResolutionException, ArtifactNotFoundException { - return new HashSet<Artifact>(); + return new HashSet<>(); } public Set<Artifact> resolve( Collection<? extends MavenProject> projects, Collection<String> scopes, MavenSession session ) throws ArtifactResolutionException, ArtifactNotFoundException { - return new HashSet<Artifact>(); + return new HashSet<>(); } public Set<Artifact> resolve( MavenProject project, Collection<String> scopesToCollect, @@ -65,7 +65,7 @@ public class ProjectDependenciesResolverStub Set<Artifact> ignoreableArtifacts ) throws ArtifactResolutionException, ArtifactNotFoundException { - return new HashSet<Artifact>(); + return new HashSet<>(); } public DependencyResolutionResult resolve( DependencyResolutionRequest request ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java index 38e9fca..92c3adb 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java @@ -97,7 +97,7 @@ public class ProjectDependencyGraphStub NoPluginFoundForPrefixException, PluginNotFoundException, MojoNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException, LifecycleNotFoundException { - List<ProjectSegment> projectBuilds = new ArrayList<ProjectSegment>(); + List<ProjectSegment> projectBuilds = new ArrayList<>(); TaskSegment segment = createTaskSegment(); projectBuilds.add( createProjectBuild( A, session, segment ) ); @@ -159,7 +159,7 @@ public class ProjectDependencyGraphStub private List<Dependency> getDependencies() { - List<Dependency> dependencies = new ArrayList<Dependency>(); + List<Dependency> dependencies = new ArrayList<>(); dependencies.add( new Dependency( B, A ) ); dependencies.add( new Dependency( C, A ) ); dependencies.add( new Dependency( X, B ) ); @@ -180,7 +180,7 @@ public class ProjectDependencyGraphStub { throw new RuntimeException( "Not implemented yet" ); } - List<MavenProject> result = new ArrayList<MavenProject>(); + List<MavenProject> result = new ArrayList<>(); for ( Dependency dependency : getDependencies() ) { dependency.addIfDownstream( project, result ); @@ -194,7 +194,7 @@ public class ProjectDependencyGraphStub { throw new RuntimeException( "Not implemented yet" ); }*/ - List<MavenProject> result = new ArrayList<MavenProject>(); + List<MavenProject> result = new ArrayList<>(); final List<Dependency> dependencies = getDependencies(); for ( Dependency dependency : dependencies ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java index 5f6744c..e380949 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java @@ -95,7 +95,7 @@ public class PluginParameterExpressionEvaluatorTest Artifact depArtifact = createArtifact( "group", "artifact", "1" ); - List<Artifact> deps = new ArrayList<Artifact>(); + List<Artifact> deps = new ArrayList<>(); deps.add( depArtifact ); exec.getMojoDescriptor().getPluginDescriptor().setArtifacts( deps ); @@ -120,7 +120,7 @@ public class PluginParameterExpressionEvaluatorTest Artifact depArtifact = createArtifact( "group", "artifact", "1" ); - List<Artifact> deps = new ArrayList<Artifact>(); + List<Artifact> deps = new ArrayList<>(); deps.add( depArtifact ); exec.getMojoDescriptor().getPluginDescriptor().setArtifacts( deps ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index 13c32ab..d61fc6e 100644 --- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -21,7 +21,6 @@ package org.apache.maven.project; import java.io.File; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.apache.maven.artifact.Artifact; @@ -33,7 +32,7 @@ public class DefaultMavenProjectBuilderTest extends AbstractMavenProjectTestCase { - private List<File> filesToDelete = new ArrayList<File>(); + private List<File> filesToDelete = new ArrayList<>(); private File localRepoDir;
