http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java index 8ff912f..55b29b6 100644 --- a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java +++ b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java @@ -62,7 +62,7 @@ public class EmptyLifecycleExecutor // 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/project/EmptyProjectBuildingHelper.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java index 21e37f1..fb5c4c0 100644 --- a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java +++ b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java @@ -45,7 +45,7 @@ public class EmptyProjectBuildingHelper } else { - return new ArrayList<ArtifactRepository>(); + return new ArrayList<>(); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java index 0c5cd07..1bc75ab 100644 --- a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java @@ -23,9 +23,7 @@ import java.io.File; import java.io.IOException; import java.util.List; import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; -import org.apache.maven.lifecycle.internal.stub.LoggerStub; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index f17539b..988df76 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -1741,7 +1741,7 @@ public class PomConstructionTest { PomTestWrapper pom = buildPom( "plugin-inheritance-merge-order/sub" ); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add( "maven-it-plugin-error" ); expected.add( "maven-it-plugin-configuration" ); expected.add( "maven-it-plugin-dependency-resolution" ); @@ -1751,7 +1751,7 @@ public class PomConstructionTest expected.add( "maven-it-plugin-fork" ); expected.add( "maven-it-plugin-touch" ); - List<String> actual = new ArrayList<String>(); + List<String> actual = new ArrayList<>(); @SuppressWarnings( "unchecked" ) List<Plugin> plugins = (List<Plugin>) pom.getValue( "build/plugins" ); for ( Plugin plugin : plugins ) @@ -1770,7 +1770,7 @@ public class PomConstructionTest { PomTestWrapper pom = buildPom( "plugin-injection-merge-order" ); - List<String> expected = new ArrayList<String>(); + List<String> expected = new ArrayList<>(); expected.add( "maven-it-plugin-error" ); expected.add( "maven-it-plugin-configuration" ); expected.add( "maven-it-plugin-dependency-resolution" ); @@ -1780,7 +1780,7 @@ public class PomConstructionTest expected.add( "maven-it-plugin-fork" ); expected.add( "maven-it-plugin-touch" ); - List<String> actual = new ArrayList<String>(); + List<String> actual = new ArrayList<>(); @SuppressWarnings( "unchecked" ) List<Plugin> plugins = (List<Plugin>) pom.getValue( "build/plugins" ); for ( Plugin plugin : plugins ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java index 5cb4527..eda9010 100644 --- a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java @@ -161,7 +161,7 @@ public class ProjectSorterTest public void testMatchingArtifactIdsDifferentGroupIds() throws CycleDetectedException, DuplicateProjectException { - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); MavenProject project1 = createProject( "groupId1", "artifactId", "1.0" ); projects.add( project1 ); MavenProject project2 = createProject( "groupId2", "artifactId", "1.0" ); @@ -177,7 +177,7 @@ public class ProjectSorterTest public void testMatchingGroupIdsDifferentArtifactIds() throws CycleDetectedException, DuplicateProjectException { - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); MavenProject project1 = createProject( "groupId", "artifactId1", "1.0" ); projects.add( project1 ); MavenProject project2 = createProject( "groupId", "artifactId2", "1.0" ); @@ -193,7 +193,7 @@ public class ProjectSorterTest public void testMatchingIdsAndVersions() throws CycleDetectedException { - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); MavenProject project1 = createProject( "groupId", "artifactId", "1.0" ); projects.add( project1 ); MavenProject project2 = createProject( "groupId", "artifactId", "1.0" ); @@ -214,7 +214,7 @@ public class ProjectSorterTest public void testMatchingIdsAndDifferentVersions() throws CycleDetectedException, DuplicateProjectException { - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); MavenProject project1 = createProject( "groupId", "artifactId", "1.0" ); projects.add( project1 ); MavenProject project2 = createProject( "groupId", "artifactId", "2.0" ); @@ -228,7 +228,7 @@ public class ProjectSorterTest public void testPluginDependenciesInfluenceSorting() throws Exception { - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); MavenProject parentProject = createProject( "groupId", "parent", "1.0" ); projects.add( parentProject ); @@ -271,7 +271,7 @@ public class ProjectSorterTest public void testPluginDependenciesInfluenceSorting_DeclarationInParent() throws Exception { - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); MavenProject parentProject = createProject( "groupId", "parent-declarer", "1.0" ); projects.add( parentProject ); @@ -308,7 +308,7 @@ public class ProjectSorterTest public void testPluginVersionsAreConsidered() throws Exception { - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); MavenProject pluginProjectA = createProject( "group", "plugin-a", "2.0-SNAPSHOT" ); projects.add( pluginProjectA ); @@ -327,7 +327,7 @@ public class ProjectSorterTest public void testDependencyPrecedesProjectThatUsesSpecificDependencyVersion() throws Exception { - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); MavenProject usingProject = createProject( "group", "project", "1.0" ); projects.add( usingProject ); @@ -345,7 +345,7 @@ public class ProjectSorterTest public void testDependencyPrecedesProjectThatUsesUnresolvedDependencyVersion() throws Exception { - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); MavenProject usingProject = createProject( "group", "project", "1.0" ); projects.add( usingProject ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java index 2811a84..9b204b2 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java @@ -53,7 +53,7 @@ class Xpp3DomAttributeIterator this.parent = parent; this.node = (Xpp3Dom) parent.getNode(); - Map<String, String> map = new LinkedHashMap<String, String>(); + Map<String, String> map = new LinkedHashMap<>(); for ( String name : this.node.getAttributeNames() ) { if ( name.equals( qname.getName() ) || "*".equals( qname.getName() ) ) @@ -62,7 +62,7 @@ class Xpp3DomAttributeIterator map.put( name, value ); } } - this.attributes = new ArrayList<Map.Entry<String, String>>( map.entrySet() ); + this.attributes = new ArrayList<>( map.entrySet() ); } public NodePointer getNodePointer() http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java index 796a5ca..d137af5 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java @@ -48,7 +48,7 @@ class Xpp3DomNodeIterator private Xpp3Dom[] children; - private List<Xpp3Dom> filteredChildren = new ArrayList<Xpp3Dom>(); + private List<Xpp3Dom> filteredChildren = new ArrayList<>(); private int filteredIndex; http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java index f93bd89..19defa1 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java @@ -89,7 +89,7 @@ class Xpp3DomNodePointer } else { - List<Object> children = new ArrayList<Object>(); + List<Object> children = new ArrayList<>(); for ( int i = 0; i < node.getChildCount(); i++ ) { children.add( getValue( node.getChild( i ) ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java index c4afc7a..0e054c6 100644 --- a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java +++ b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java @@ -213,7 +213,7 @@ public class TestRepositorySystem if ( request.isResolveTransitively() ) { - Map<String, Artifact> artifacts = new LinkedHashMap<String, Artifact>(); + Map<String, Artifact> artifacts = new LinkedHashMap<>(); if ( request.getArtifactDependencies() != null ) { @@ -223,7 +223,7 @@ public class TestRepositorySystem } } - List<Dependency> dependencies = new ArrayList<Dependency>(); + List<Dependency> dependencies = new ArrayList<>(); if ( request.getArtifact() instanceof ArtifactWithDependencies ) { dependencies = ( (ArtifactWithDependencies) request.getArtifact() ).getDependencies(); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java b/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java index f2231b3..78818c5 100644 --- a/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java +++ b/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java @@ -82,7 +82,7 @@ public class SettingsUtilsTest } p.setProperties( props ); count = entropy.nextInt( 3 ); - List<Repository> repos = new ArrayList<Repository>(); + List<Repository> repos = new ArrayList<>(); for ( int i = 0; i < count; i++ ) { Repository r = new Repository(); @@ -93,7 +93,7 @@ public class SettingsUtilsTest } p.setRepositories( repos ); count = entropy.nextInt( 3 ); - repos = new ArrayList<Repository>(); + repos = new ArrayList<>(); for ( int i = 0; i < count; i++ ) { Repository r = new Repository(); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java index 28a13bb..1e48441 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java @@ -65,7 +65,7 @@ public class DefaultToolchainManagerPrivateTest MockitoAnnotations.initMocks( this ); - toolchainManager.factories = new HashMap<String, ToolchainFactory>(); + toolchainManager.factories = new HashMap<>(); toolchainManager.factories.put( "basic", toolchainFactory_basicType ); toolchainManager.factories.put( "rare", toolchainFactory_rareType ); } @@ -122,17 +122,17 @@ public class DefaultToolchainManagerPrivateTest MavenSession session = mock( MavenSession.class ); MavenExecutionRequest req = new DefaultMavenExecutionRequest(); when( session.getRequest() ).thenReturn( req ); - Map<String, List<ToolchainModel>> groupedToolchains = new HashMap<String, List<ToolchainModel>>(); + Map<String, List<ToolchainModel>> groupedToolchains = new HashMap<>(); req.setToolchains( groupedToolchains ); - List<ToolchainModel> basicToolchains = new ArrayList<ToolchainModel>(); + List<ToolchainModel> basicToolchains = new ArrayList<>(); ToolchainModel basicToolchainModel = new ToolchainModel(); basicToolchainModel.setType( "basic" ); basicToolchains.add( basicToolchainModel ); basicToolchains.add( basicToolchainModel ); groupedToolchains.put( "basic", basicToolchains ); - List<ToolchainModel> rareToolchains = new ArrayList<ToolchainModel>(); + List<ToolchainModel> rareToolchains = new ArrayList<>(); ToolchainModel rareToolchainModel = new ToolchainModel(); rareToolchainModel.setType( "rare" ); rareToolchains.add( rareToolchainModel ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java index d464502..6e85c42 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java @@ -65,7 +65,7 @@ public class DefaultToolchainManagerTest MockitoAnnotations.initMocks( this ); - toolchainManager.factories = new HashMap<String, ToolchainFactory>(); + toolchainManager.factories = new HashMap<>(); toolchainManager.factories.put( "basic", toolchainFactory_basicType ); toolchainManager.factories.put( "rare", toolchainFactory_rareType ); } @@ -87,7 +87,7 @@ public class DefaultToolchainManagerTest { MavenSession session = mock( MavenSession.class ); MavenExecutionRequest executionRequest = new DefaultMavenExecutionRequest(); - Map<String, List<ToolchainModel>> toolchainModels = new HashMap<String, List<ToolchainModel>>(); + Map<String, List<ToolchainModel>> toolchainModels = new HashMap<>(); toolchainModels.put( "unknown", Collections.singletonList( new ToolchainModel() ) ); executionRequest.setToolchains( toolchainModels ); when( session.getRequest() ).thenReturn( executionRequest ); @@ -103,7 +103,7 @@ public class DefaultToolchainManagerTest { MavenSession session = mock( MavenSession.class ); MavenExecutionRequest executionRequest = new DefaultMavenExecutionRequest(); - Map<String, List<ToolchainModel>> toolchainModels = new HashMap<String, List<ToolchainModel>>(); + Map<String, List<ToolchainModel>> toolchainModels = new HashMap<>(); toolchainModels.put( "basic", Arrays.asList( new ToolchainModel(), new ToolchainModel() ) ); toolchainModels.put( "rare", Collections.singletonList( new ToolchainModel() ) ); executionRequest.setToolchains( toolchainModels ); @@ -119,7 +119,7 @@ public class DefaultToolchainManagerTest { MavenSession session = mock( MavenSession.class ); MavenExecutionRequest executionRequest = new DefaultMavenExecutionRequest(); - Map<String, List<ToolchainModel>> toolchainModels = new HashMap<String, List<ToolchainModel>>(); + Map<String, List<ToolchainModel>> toolchainModels = new HashMap<>(); toolchainModels.put( "basic", Arrays.asList( new ToolchainModel(), new ToolchainModel() ) ); toolchainModels.put( "rare", Collections.singletonList( new ToolchainModel() ) ); executionRequest.setToolchains( toolchainModels ); @@ -136,7 +136,7 @@ public class DefaultToolchainManagerTest { MavenSession session = mock( MavenSession.class ); MavenExecutionRequest executionRequest = new DefaultMavenExecutionRequest(); - Map<String, List<ToolchainModel>> toolchainModels = new HashMap<String, List<ToolchainModel>>(); + Map<String, List<ToolchainModel>> toolchainModels = new HashMap<>(); toolchainModels.put( "basic", Arrays.asList( new ToolchainModel(), new ToolchainModel() ) ); toolchainModels.put( "rare", Collections.singletonList( new ToolchainModel() ) ); executionRequest.setToolchains( toolchainModels ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index a78e11d..e4265ee 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -163,7 +163,7 @@ public class CLIManager private String[] cleanArgs( String[] args ) { - List<String> cleaned = new ArrayList<String>(); + List<String> cleaned = new ArrayList<>(); StringBuilder currentArg = null; http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 7812401..2f17008 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -213,7 +213,7 @@ public class MavenCli final Set<String> realms; if ( classWorld != null ) { - realms = new HashSet<String>(); + realms = new HashSet<>(); for ( ClassRealm realm : classWorld.getRealms() ) { realms.add( realm.getId() ); @@ -244,7 +244,7 @@ public class MavenCli { if ( classWorld != null ) { - for ( ClassRealm realm : new ArrayList<ClassRealm>( classWorld.getRealms() ) ) + for ( ClassRealm realm : new ArrayList<>( classWorld.getRealms() ) ) { String realmId = realm.getId(); if ( !realms.contains( realmId ) ) @@ -366,7 +366,7 @@ public class MavenCli CLIManager cliManager = new CLIManager(); - List<String> args = new ArrayList<String>(); + List<String> args = new ArrayList<>(); try { @@ -529,8 +529,8 @@ public class MavenCli .setAutoWiring( true ) .setName( "maven" ); - Set<String> exportedArtifacts = new HashSet<String>( coreEntry.getExportedArtifacts() ); - Set<String> exportedPackages = new HashSet<String>( coreEntry.getExportedPackages() ); + Set<String> exportedArtifacts = new HashSet<>( coreEntry.getExportedArtifacts() ); + Set<String> exportedPackages = new HashSet<>( coreEntry.getExportedPackages() ); for ( CoreExtensionEntry extension : extensions ) { exportedArtifacts.addAll( extension.getExportedArtifacts() ); @@ -734,7 +734,7 @@ public class MavenCli private static <T> List<T> reverse( List<T> list ) { - List<T> copy = new ArrayList<T>( list ); + List<T> copy = new ArrayList<>( list ); Collections.reverse( copy ); return copy; } @@ -747,7 +747,7 @@ public class MavenCli extClassPath = cliRequest.systemProperties.getProperty( EXT_CLASS_PATH ); } - List<File> jars = new ArrayList<File>(); + List<File> jars = new ArrayList<>(); if ( StringUtils.isNotEmpty( extClassPath ) ) { @@ -869,7 +869,7 @@ public class MavenCli { ExceptionHandler handler = new DefaultExceptionHandler(); - Map<String, String> references = new LinkedHashMap<String, String>(); + Map<String, String> references = new LinkedHashMap<>(); MavenProject project = null; @@ -1035,7 +1035,7 @@ public class MavenCli // // There are too many ConfigurationProcessors so we don't know which one to run so report the error. // - StringBuffer sb = new StringBuffer( + StringBuilder sb = new StringBuilder( String.format( "\nThere can only be one user supplied ConfigurationProcessor, there are %s:\n\n", userSuppliedConfigurationProcessorCount ) ); for ( Entry<String, ConfigurationProcessor> entry : configurationProcessors.entrySet() ) @@ -1241,9 +1241,9 @@ public class MavenCli // Profile Activation // ---------------------------------------------------------------------- - List<String> activeProfiles = new ArrayList<String>(); + List<String> activeProfiles = new ArrayList<>(); - List<String> inactiveProfiles = new ArrayList<String>(); + List<String> inactiveProfiles = new ArrayList<>(); if ( commandLine.hasOption( CLIManager.ACTIVATE_PROFILES ) ) { @@ -1366,8 +1366,8 @@ public class MavenCli { String[] projectOptionValues = commandLine.getOptionValues( CLIManager.PROJECT_LIST ); - List<String> inclProjects = new ArrayList<String>(); - List<String> exclProjects = new ArrayList<String>(); + List<String> inclProjects = new ArrayList<>(); + List<String> exclProjects = new ArrayList<>(); if ( projectOptionValues != null ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java index 7c7976a..f62b57e 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java @@ -28,7 +28,7 @@ public class DefaultEventSpyContext implements EventSpy.Context { - private final Map<String, Object> data = new HashMap<String, Object>(); + private final Map<String, Object> data = new HashMap<>(); public Map<String, Object> getData() { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java index a431bde..2a7d3e3 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java @@ -90,7 +90,7 @@ public class BootstrapCoreExtensionManager List<CoreExtension> configuration ) throws Exception { - List<CoreExtensionEntry> extensions = new ArrayList<CoreExtensionEntry>(); + List<CoreExtensionEntry> extensions = new ArrayList<>(); DependencyFilter dependencyFilter = new ExclusionsDependencyFilter( providedArtifacts ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java index b50d944..1a68d76 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java @@ -45,7 +45,7 @@ public class Slf4jConfigurationFactory public static Slf4jConfiguration getConfiguration( ILoggerFactory loggerFactory ) { - Map<URL, Set<Object>> supported = new LinkedHashMap<URL, Set<Object>>(); + Map<URL, Set<Object>> supported = new LinkedHashMap<>(); String slf4jBinding = loggerFactory.getClass().getCanonicalName(); @@ -69,19 +69,7 @@ public class Slf4jConfigurationFactory supported.put( resource, conf.keySet() ); } } - catch ( IOException e ) - { - e.printStackTrace(); - } - catch ( InstantiationException e ) - { - e.printStackTrace(); - } - catch ( IllegalAccessException e ) - { - e.printStackTrace(); - } - catch ( ClassNotFoundException e ) + catch ( IOException | ClassNotFoundException | IllegalAccessException | InstantiationException e ) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java index 4672502..5f87836 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java @@ -36,7 +36,7 @@ public class ConsoleMavenTransferListener extends AbstractMavenTransferListener { - private Map<TransferResource, Long> downloads = new ConcurrentHashMap<TransferResource, Long>(); + private Map<TransferResource, Long> downloads = new ConcurrentHashMap<>(); private int lastLength; http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java index 163d9d9..1e71837 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java @@ -56,7 +56,7 @@ public class CLIManagerTest public Collection<Option> getOptions() { @SuppressWarnings( "unchecked" ) - List<Option> optList = new ArrayList<Option>( options.getOptions() ); + List<Option> optList = new ArrayList<>( options.getOptions() ); Collections.sort( optList, new OptionComparator() ); return optList; } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index f76072e..2be2132 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -274,8 +274,8 @@ public class DefaultModelBuilder ModelData resultData = new ModelData( request.getModelSource(), inputModel ); ModelData superData = new ModelData( null, getSuperModel() ); - Collection<String> parentIds = new LinkedHashSet<String>(); - List<ModelData> lineage = new ArrayList<ModelData>(); + Collection<String> parentIds = new LinkedHashSet<>(); + List<ModelData> lineage = new ArrayList<>(); for ( ModelData currentData = resultData; currentData != null; ) { @@ -519,7 +519,7 @@ public class DefaultModelBuilder boolean strict = request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0; InputSource source = request.isLocationTracking() ? new InputSource() : null; - Map<String, Object> options = new HashMap<String, Object>(); + Map<String, Object> options = new HashMap<>(); options.put( ModelProcessor.IS_STRICT, strict ); options.put( ModelProcessor.INPUT_SOURCE, source ); options.put( ModelProcessor.SOURCE, modelSource ); @@ -660,9 +660,9 @@ public class DefaultModelBuilder return; } - Map<String, Plugin> plugins = new HashMap<String, Plugin>(); - Map<String, String> versions = new HashMap<String, String>(); - Map<String, String> managedVersions = new HashMap<String, String>(); + Map<String, Plugin> plugins = new HashMap<>(); + Map<String, String> versions = new HashMap<>(); + Map<String, String> managedVersions = new HashMap<>(); for ( int i = lineage.size() - 1; i >= 0; i-- ) { @@ -720,7 +720,7 @@ public class DefaultModelBuilder private Map<String, Activation> getProfileActivations( Model model, boolean clone ) { - Map<String, Activation> activations = new HashMap<String, Activation>(); + Map<String, Activation> activations = new HashMap<>(); for ( Profile profile : model.getProfiles() ) { Activation activation = profile.getActivation(); @@ -1037,7 +1037,8 @@ public class DefaultModelBuilder } else { - if ( childModel.getVersion().indexOf( "${" ) > -1 ) + if ( childModel.getVersion() + .contains( "${" ) ) { problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V31 ) .setMessage( "Version must be a constant" ) @@ -1228,7 +1229,7 @@ public class DefaultModelBuilder if ( importMngts == null ) { - importMngts = new ArrayList<DependencyManagement>(); + importMngts = new ArrayList<>(); } importMngts.add( importMngt ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java index 8b4a01b..a3505c9 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java @@ -196,7 +196,7 @@ public class DefaultModelBuildingRequest { if ( profiles == null ) { - profiles = new ArrayList<Profile>(); + profiles = new ArrayList<>(); } return profiles; @@ -207,7 +207,7 @@ public class DefaultModelBuildingRequest { if ( profiles != null ) { - this.profiles = new ArrayList<Profile>( profiles ); + this.profiles = new ArrayList<>( profiles ); } else { @@ -222,7 +222,7 @@ public class DefaultModelBuildingRequest { if ( activeProfileIds == null ) { - activeProfileIds = new ArrayList<String>(); + activeProfileIds = new ArrayList<>(); } return activeProfileIds; @@ -233,7 +233,7 @@ public class DefaultModelBuildingRequest { if ( activeProfileIds != null ) { - this.activeProfileIds = new ArrayList<String>( activeProfileIds ); + this.activeProfileIds = new ArrayList<>( activeProfileIds ); } else { @@ -248,7 +248,7 @@ public class DefaultModelBuildingRequest { if ( inactiveProfileIds == null ) { - inactiveProfileIds = new ArrayList<String>(); + inactiveProfileIds = new ArrayList<>(); } return inactiveProfileIds; @@ -259,7 +259,7 @@ public class DefaultModelBuildingRequest { if ( inactiveProfileIds != null ) { - this.inactiveProfileIds = new ArrayList<String>( inactiveProfileIds ); + this.inactiveProfileIds = new ArrayList<>( inactiveProfileIds ); } else { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java index 61fb434..bb463d1 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java @@ -50,11 +50,11 @@ class DefaultModelBuildingResult public DefaultModelBuildingResult() { - modelIds = new ArrayList<String>(); - rawModels = new HashMap<String, Model>(); - activePomProfiles = new HashMap<String, List<Profile>>(); - activeExternalProfiles = new ArrayList<Profile>(); - problems = new ArrayList<ModelProblem>(); + modelIds = new ArrayList<>(); + rawModels = new HashMap<>(); + activePomProfiles = new HashMap<>(); + activeExternalProfiles = new ArrayList<>(); + problems = new ArrayList<>(); } @Override @@ -127,7 +127,7 @@ class DefaultModelBuildingResult if ( activeProfiles != null ) { - this.activePomProfiles.put( modelId, new ArrayList<Profile>( activeProfiles ) ); + this.activePomProfiles.put( modelId, new ArrayList<>( activeProfiles ) ); } else { @@ -147,7 +147,7 @@ class DefaultModelBuildingResult { if ( activeProfiles != null ) { - this.activeExternalProfiles = new ArrayList<Profile>( activeProfiles ); + this.activeExternalProfiles = new ArrayList<>( activeProfiles ); } else { @@ -167,7 +167,7 @@ class DefaultModelBuildingResult { if ( problems != null ) { - this.problems = new ArrayList<ModelProblem>( problems ); + this.problems = new ArrayList<>( problems ); } else { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java ---------------------------------------------------------------------- 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 a962897..2828874 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 @@ -74,7 +74,7 @@ public class Result<T> public static <T> Result<T> success( T model, Iterable<? extends ModelProblem> problems ) { assert !hasErrors( problems ); - return new Result<T>( false, model, problems ); + return new Result<>( false, model, problems ); } /** @@ -124,7 +124,7 @@ public class Result<T> */ public static <T> Result<T> error( T model, Iterable<? extends ModelProblem> problems ) { - return new Result<T>( true, model, problems ); + return new Result<>( true, model, problems ); } /** @@ -136,7 +136,7 @@ public class Result<T> */ public static <T> Result<T> newResult( T model, Iterable<? extends ModelProblem> problems ) { - return new Result<T>( hasErrors( problems ), model, problems ); + return new Result<>( hasErrors( problems ), model, problems ); } /** @@ -161,7 +161,7 @@ public class Result<T> */ public static <T> Result<T> addProblems( Result<T> result, Iterable<? extends ModelProblem> problems ) { - return new Result<T>( result.hasErrors() || hasErrors( problems ), result.get(), concat( result.getProblems(), + return new Result<>( result.hasErrors() || hasErrors( problems ), result.get(), concat( result.getProblems(), problems ) ); } @@ -195,7 +195,7 @@ public class Result<T> } } ); final Iterable<ModelProblem> problems = concat( transform( results, GET_PROBLEMS ) ); - return new Result<Iterable<T>>( hasErrors, models, problems ); + return new Result<>( hasErrors, models, problems ); } // helper to determine if problems contain error http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java index 5860af6..d895913 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java @@ -47,7 +47,7 @@ public class DefaultDependencyManagementImporter { if ( sources != null && !sources.isEmpty() ) { - Map<String, Dependency> dependencies = new LinkedHashMap<String, Dependency>(); + Map<String, Dependency> dependencies = new LinkedHashMap<>(); DependencyManagement depMngt = target.getDependencyManagement(); @@ -76,7 +76,7 @@ public class DefaultDependencyManagementImporter } } - depMngt.setDependencies( new ArrayList<Dependency>( dependencies.values() ) ); + depMngt.setDependencies( new ArrayList<>( dependencies.values() ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java index 609f441..dcefe54 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java @@ -52,7 +52,7 @@ public class DefaultInheritanceAssembler public void assembleModelInheritance( Model child, Model parent, ModelBuildingRequest request, ModelProblemCollector problems ) { - Map<Object, Object> hints = new HashMap<Object, Object>(); + Map<Object, Object> hints = new HashMap<>(); hints.put( MavenModelMerger.CHILD_PATH_ADJUSTMENT, getChildPathAdjustment( child, parent ) ); merger.merge( child, parent, false, hints ); } @@ -137,7 +137,7 @@ public class DefaultInheritanceAssembler if ( !src.isEmpty() ) { List<Plugin> tgt = target.getPlugins(); - Map<Object, Plugin> master = new LinkedHashMap<Object, Plugin>( src.size() * 2 ); + Map<Object, Plugin> master = new LinkedHashMap<>( src.size() * 2 ); for ( Plugin element : src ) { @@ -155,8 +155,8 @@ public class DefaultInheritanceAssembler } } - Map<Object, List<Plugin>> predecessors = new LinkedHashMap<Object, List<Plugin>>(); - List<Plugin> pending = new ArrayList<Plugin>(); + Map<Object, List<Plugin>> predecessors = new LinkedHashMap<>(); + List<Plugin> pending = new ArrayList<>(); for ( Plugin element : tgt ) { Object key = getPluginKey( element ); @@ -170,7 +170,7 @@ public class DefaultInheritanceAssembler if ( !pending.isEmpty() ) { predecessors.put( key, pending ); - pending = new ArrayList<Plugin>(); + pending = new ArrayList<>(); } } else @@ -179,7 +179,7 @@ public class DefaultInheritanceAssembler } } - List<Plugin> result = new ArrayList<Plugin>( src.size() + tgt.size() ); + List<Plugin> result = new ArrayList<>( src.size() + tgt.size() ); for ( Map.Entry<Object, Plugin> entry : master.entrySet() ) { List<Plugin> pre = predecessors.get( entry.getKey() ); @@ -219,7 +219,7 @@ public class DefaultInheritanceAssembler { List<ReportPlugin> tgt = target.getPlugins(); Map<Object, ReportPlugin> merged = - new LinkedHashMap<Object, ReportPlugin>( ( src.size() + tgt.size() ) * 2 ); + new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); for ( ReportPlugin element : src ) { @@ -247,7 +247,7 @@ public class DefaultInheritanceAssembler merged.put( key, element ); } - target.setPlugins( new ArrayList<ReportPlugin>( merged.values() ) ); + target.setPlugins( new ArrayList<>( merged.values() ) ); } } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java index 1390a4e..cee376f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java @@ -62,7 +62,7 @@ public abstract class AbstractStringBasedModelInterpolator static { - Collection<String> translatedPrefixes = new HashSet<String>(); + Collection<String> translatedPrefixes = new HashSet<>(); // MNG-1927, MNG-2124, MNG-3355: // If the build section is present and the project directory is non-null, we should make @@ -127,7 +127,7 @@ public abstract class AbstractStringBasedModelInterpolator } // NOTE: Order counts here! - List<ValueSource> valueSources = new ArrayList<ValueSource>( 9 ); + List<ValueSource> valueSources = new ArrayList<>( 9 ); if ( projectDir != null ) { @@ -187,7 +187,7 @@ public abstract class AbstractStringBasedModelInterpolator final File projectDir, final ModelBuildingRequest config ) { - List<InterpolationPostProcessor> processors = new ArrayList<InterpolationPostProcessor>( 2 ); + List<InterpolationPostProcessor> processors = new ArrayList<>( 2 ); if ( projectDir != null ) { processors.add( new PathTranslatingPostProcessor( PROJECT_PREFIXES, TRANSLATED_PATH_EXPRESSIONS, http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java index c40f9bd..a790580 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java @@ -50,7 +50,7 @@ public class StringSearchModelInterpolator { private static final Map<Class<?>, InterpolateObjectAction.CacheItem> CACHED_ENTRIES = - new ConcurrentHashMap<Class<?>, InterpolateObjectAction.CacheItem>( 80, 0.75f, 2 ); + new ConcurrentHashMap<>( 80, 0.75f, 2 ); // Empirical data from 3.x, actual =40 @@ -114,7 +114,7 @@ public class StringSearchModelInterpolator this.valueSources = valueSources; this.postProcessors = postProcessors; - this.interpolationTargets = new LinkedList<Object>(); + this.interpolationTargets = new LinkedList<>(); interpolationTargets.add( target ); this.modelInterpolator = modelInterpolator; @@ -231,7 +231,7 @@ public class StringSearchModelInterpolator { this.isQualifiedForInterpolation = isQualifiedForInterpolation( clazz ); this.isArray = clazz.isArray(); - List<CacheField> fields = new ArrayList<CacheField>(); + List<CacheField> fields = new ArrayList<>(); for ( Field currentField : clazz.getDeclaredFields() ) { Class<?> type = currentField.getType(); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java index 63fb82d..ec1b0ad 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java @@ -38,7 +38,7 @@ class UrlNormalizingPostProcessor static { - Set<String> expressions = new HashSet<String>(); + Set<String> expressions = new HashSet<>(); expressions.add( "project.url" ); expressions.add( "project.scm.url" ); expressions.add( "project.scm.connection" ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java index bfeafcb..e611973 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java @@ -60,7 +60,7 @@ public class DefaultDependencyManagementInjector DependencyManagement dependencyManagement = model.getDependencyManagement(); if ( dependencyManagement != null ) { - Map<Object, Dependency> dependencies = new HashMap<Object, Dependency>(); + Map<Object, Dependency> dependencies = new HashMap<>(); Map<Object, Object> context = Collections.emptyMap(); for ( Dependency dependency : model.getDependencies() ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java index 75d7d87..4a50cfe 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java @@ -78,7 +78,7 @@ public class DefaultPluginManagementInjector { List<Plugin> tgt = target.getPlugins(); - Map<Object, Plugin> managedPlugins = new LinkedHashMap<Object, Plugin>( src.size() * 2 ); + Map<Object, Plugin> managedPlugins = new LinkedHashMap<>( src.size() * 2 ); Map<Object, Object> context = Collections.emptyMap(); @@ -110,7 +110,7 @@ public class DefaultPluginManagementInjector List<PluginExecution> tgt = target.getExecutions(); Map<Object, PluginExecution> merged = - new LinkedHashMap<Object, PluginExecution>( ( src.size() + tgt.size() ) * 2 ); + new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); for ( PluginExecution element : src ) { @@ -129,7 +129,7 @@ public class DefaultPluginManagementInjector merged.put( key, element ); } - target.setExecutions( new ArrayList<PluginExecution>( merged.values() ) ); + target.setExecutions( new ArrayList<>( merged.values() ) ); } } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java index 2727a11..66577cb 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java @@ -28,17 +28,13 @@ import java.util.Set; import org.apache.maven.model.BuildBase; import org.apache.maven.model.CiManagement; -import org.apache.maven.model.Contributor; import org.apache.maven.model.Dependency; import org.apache.maven.model.DeploymentRepository; -import org.apache.maven.model.Developer; import org.apache.maven.model.DistributionManagement; import org.apache.maven.model.Exclusion; import org.apache.maven.model.Extension; import org.apache.maven.model.InputLocation; import org.apache.maven.model.IssueManagement; -import org.apache.maven.model.License; -import org.apache.maven.model.MailingList; import org.apache.maven.model.Model; import org.apache.maven.model.ModelBase; import org.apache.maven.model.Organization; @@ -204,7 +200,7 @@ public class MavenModelMerger { if ( target.getLicenses().isEmpty() ) { - target.setLicenses( new ArrayList<License>( source.getLicenses() ) ); + target.setLicenses( new ArrayList<>( source.getLicenses() ) ); } } @@ -214,7 +210,7 @@ public class MavenModelMerger { if ( target.getDevelopers().isEmpty() ) { - target.setDevelopers( new ArrayList<Developer>( source.getDevelopers() ) ); + target.setDevelopers( new ArrayList<>( source.getDevelopers() ) ); } } @@ -224,7 +220,7 @@ public class MavenModelMerger { if ( target.getContributors().isEmpty() ) { - target.setContributors( new ArrayList<Contributor>( source.getContributors() ) ); + target.setContributors( new ArrayList<>( source.getContributors() ) ); } } @@ -234,7 +230,7 @@ public class MavenModelMerger { if ( target.getMailingLists().isEmpty() ) { - target.setMailingLists( new ArrayList<MailingList>( source.getMailingLists() ) ); + target.setMailingLists( new ArrayList<>( source.getMailingLists() ) ); } } @@ -245,10 +241,10 @@ public class MavenModelMerger List<String> src = source.getModules(); if ( !src.isEmpty() && sourceDominant ) { - List<Integer> indices = new ArrayList<Integer>(); + List<Integer> indices = new ArrayList<>(); List<String> tgt = target.getModules(); - Set<String> excludes = new LinkedHashSet<String>( tgt ); - List<String> merged = new ArrayList<String>( tgt.size() + src.size() ); + Set<String> excludes = new LinkedHashSet<>( tgt ); + List<String> merged = new ArrayList<>( tgt.size() + src.size() ); merged.addAll( tgt ); for ( int i = 0, n = tgt.size(); i < n; i++ ) { @@ -281,7 +277,7 @@ public class MavenModelMerger if ( !src.isEmpty() ) { List<Repository> tgt = target.getRepositories(); - Map<Object, Repository> merged = new LinkedHashMap<Object, Repository>( ( src.size() + tgt.size() ) * 2 ); + Map<Object, Repository> merged = new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); List<Repository> dominant, recessive; if ( sourceDominant ) @@ -310,7 +306,7 @@ public class MavenModelMerger } } - target.setRepositories( new ArrayList<Repository>( merged.values() ) ); + target.setRepositories( new ArrayList<>( merged.values() ) ); } } @@ -322,7 +318,7 @@ public class MavenModelMerger if ( !src.isEmpty() ) { List<Repository> tgt = target.getPluginRepositories(); - Map<Object, Repository> merged = new LinkedHashMap<Object, Repository>( ( src.size() + tgt.size() ) * 2 ); + Map<Object, Repository> merged = new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); List<Repository> dominant, recessive; if ( sourceDominant ) @@ -351,7 +347,7 @@ public class MavenModelMerger } } - target.setPluginRepositories( new ArrayList<Repository>( merged.values() ) ); + target.setPluginRepositories( new ArrayList<>( merged.values() ) ); } } @@ -366,8 +362,8 @@ public class MavenModelMerger if ( !src.isEmpty() ) { List<String> tgt = target.getFilters(); - Set<String> excludes = new LinkedHashSet<String>( tgt ); - List<String> merged = new ArrayList<String>( tgt.size() + src.size() ); + Set<String> excludes = new LinkedHashSet<>( tgt ); + List<String> merged = new ArrayList<>( tgt.size() + src.size() ); merged.addAll( tgt ); for ( String s : src ) { @@ -543,7 +539,7 @@ public class MavenModelMerger { List<PluginExecution> tgt = target.getExecutions(); Map<Object, PluginExecution> merged = - new LinkedHashMap<Object, PluginExecution>( ( src.size() + tgt.size() ) * 2 ); + new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); for ( PluginExecution element : src ) { @@ -566,7 +562,7 @@ public class MavenModelMerger merged.put( key, element ); } - target.setExecutions( new ArrayList<PluginExecution>( merged.values() ) ); + target.setExecutions( new ArrayList<>( merged.values() ) ); } } @@ -578,8 +574,8 @@ public class MavenModelMerger if ( !src.isEmpty() ) { List<String> tgt = target.getGoals(); - Set<String> excludes = new LinkedHashSet<String>( tgt ); - List<String> merged = new ArrayList<String>( tgt.size() + src.size() ); + Set<String> excludes = new LinkedHashSet<>( tgt ); + List<String> merged = new ArrayList<>( tgt.size() + src.size() ); merged.addAll( tgt ); for ( String s : src ) { @@ -600,7 +596,7 @@ public class MavenModelMerger if ( !src.isEmpty() ) { List<ReportSet> tgt = target.getReportSets(); - Map<Object, ReportSet> merged = new LinkedHashMap<Object, ReportSet>( ( src.size() + tgt.size() ) * 2 ); + Map<Object, ReportSet> merged = new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); for ( ReportSet rset : src ) { @@ -622,7 +618,7 @@ public class MavenModelMerger merged.put( key, element ); } - target.setReportSets( new ArrayList<ReportSet>( merged.values() ) ); + target.setReportSets( new ArrayList<>( merged.values() ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java index 262dd3f..2803b0a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java @@ -54,7 +54,7 @@ public class DefaultModelNormalizer if ( build != null ) { List<Plugin> plugins = build.getPlugins(); - Map<Object, Plugin> normalized = new LinkedHashMap<Object, Plugin>( plugins.size() * 2 ); + Map<Object, Plugin> normalized = new LinkedHashMap<>( plugins.size() * 2 ); for ( Plugin plugin : plugins ) { @@ -69,7 +69,7 @@ public class DefaultModelNormalizer if ( plugins.size() != normalized.size() ) { - build.setPlugins( new ArrayList<Plugin>( normalized.values() ) ); + build.setPlugins( new ArrayList<>( normalized.values() ) ); } } @@ -81,7 +81,7 @@ public class DefaultModelNormalizer * aftereffects and bogus error messages. */ List<Dependency> dependencies = model.getDependencies(); - Map<String, Dependency> normalized = new LinkedHashMap<String, Dependency>( dependencies.size() * 2 ); + Map<String, Dependency> normalized = new LinkedHashMap<>( dependencies.size() * 2 ); for ( Dependency dependency : dependencies ) { @@ -90,7 +90,7 @@ public class DefaultModelNormalizer if ( dependencies.size() != normalized.size() ) { - model.setDependencies( new ArrayList<Dependency>( normalized.values() ) ); + model.setDependencies( new ArrayList<>( normalized.values() ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java index 51fa60e..e4f319c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java @@ -82,7 +82,7 @@ public class DefaultModelPathTranslator if ( build.getFilters() != null ) { - List<String> filters = new ArrayList<String>( build.getFilters().size() ); + List<String> filters = new ArrayList<>( build.getFilters().size() ); for ( String filter : build.getFilters() ) { filters.add( alignToBaseDirectory( filter, basedir ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java index bb38a2e..77d92a3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java @@ -247,7 +247,7 @@ public class DefaultProfileActivationContext { return Collections.emptyMap(); } - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); Enumeration keys = properties.keys(); while ( keys.hasMoreElements() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java index aeed023..aed837b 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java @@ -94,7 +94,7 @@ public class DefaultProfileInjector if ( !src.isEmpty() ) { List<Plugin> tgt = target.getPlugins(); - Map<Object, Plugin> master = new LinkedHashMap<Object, Plugin>( tgt.size() * 2 ); + Map<Object, Plugin> master = new LinkedHashMap<>( tgt.size() * 2 ); for ( Plugin element : tgt ) { @@ -102,8 +102,8 @@ public class DefaultProfileInjector master.put( key, element ); } - Map<Object, List<Plugin>> predecessors = new LinkedHashMap<Object, List<Plugin>>(); - List<Plugin> pending = new ArrayList<Plugin>(); + Map<Object, List<Plugin>> predecessors = new LinkedHashMap<>(); + List<Plugin> pending = new ArrayList<>(); for ( Plugin element : src ) { Object key = getPluginKey( element ); @@ -115,7 +115,7 @@ public class DefaultProfileInjector if ( !pending.isEmpty() ) { predecessors.put( key, pending ); - pending = new ArrayList<Plugin>(); + pending = new ArrayList<>(); } } else @@ -124,7 +124,7 @@ public class DefaultProfileInjector } } - List<Plugin> result = new ArrayList<Plugin>( src.size() + tgt.size() ); + List<Plugin> result = new ArrayList<>( src.size() + tgt.size() ); for ( Map.Entry<Object, Plugin> entry : master.entrySet() ) { List<Plugin> pre = predecessors.get( entry.getKey() ); @@ -149,7 +149,7 @@ public class DefaultProfileInjector { List<PluginExecution> tgt = target.getExecutions(); Map<Object, PluginExecution> merged = - new LinkedHashMap<Object, PluginExecution>( ( src.size() + tgt.size() ) * 2 ); + new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); for ( PluginExecution element : tgt ) { @@ -171,7 +171,7 @@ public class DefaultProfileInjector } } - target.setExecutions( new ArrayList<PluginExecution>( merged.values() ) ); + target.setExecutions( new ArrayList<>( merged.values() ) ); } } @@ -184,7 +184,7 @@ public class DefaultProfileInjector { List<ReportPlugin> tgt = target.getPlugins(); Map<Object, ReportPlugin> merged = - new LinkedHashMap<Object, ReportPlugin>( ( src.size() + tgt.size() ) * 2 ); + new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); for ( ReportPlugin element : tgt ) { @@ -206,7 +206,7 @@ public class DefaultProfileInjector } } - target.setPlugins( new ArrayList<ReportPlugin>( merged.values() ) ); + target.setPlugins( new ArrayList<>( merged.values() ) ); } } @@ -218,7 +218,7 @@ public class DefaultProfileInjector if ( !src.isEmpty() ) { List<ReportSet> tgt = target.getReportSets(); - Map<Object, ReportSet> merged = new LinkedHashMap<Object, ReportSet>( ( src.size() + tgt.size() ) * 2 ); + Map<Object, ReportSet> merged = new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); for ( ReportSet element : tgt ) { @@ -240,7 +240,7 @@ public class DefaultProfileInjector } } - target.setReportSets( new ArrayList<ReportSet>( merged.values() ) ); + target.setReportSets( new ArrayList<>( merged.values() ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java index 512476a..457ab2a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java @@ -45,7 +45,7 @@ public class DefaultProfileSelector { @Requirement( role = ProfileActivator.class ) - private List<ProfileActivator> activators = new ArrayList<ProfileActivator>(); + private List<ProfileActivator> activators = new ArrayList<>(); public DefaultProfileSelector addProfileActivator( ProfileActivator profileActivator ) { @@ -60,11 +60,11 @@ public class DefaultProfileSelector public List<Profile> getActiveProfiles( Collection<Profile> profiles, ProfileActivationContext context, ModelProblemCollector problems ) { - Collection<String> activatedIds = new HashSet<String>( context.getActiveProfileIds() ); - Collection<String> deactivatedIds = new HashSet<String>( context.getInactiveProfileIds() ); + Collection<String> activatedIds = new HashSet<>( context.getActiveProfileIds() ); + Collection<String> deactivatedIds = new HashSet<>( context.getInactiveProfileIds() ); - List<Profile> activeProfiles = new ArrayList<Profile>( profiles.size() ); - List<Profile> activePomProfilesByDefault = new ArrayList<Profile>(); + List<Profile> activeProfiles = new ArrayList<>( profiles.size() ); + List<Profile> activePomProfilesByDefault = new ArrayList<>(); boolean activatedPomProfileNotByDefault = false; for ( Profile profile : profiles ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java index e981bfd..2f106e1 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java @@ -129,8 +129,8 @@ public class JdkVersionProfileActivator value = value.replaceAll( "[^0-9\\.\\-\\_]", "" ); - List<String> valueTokens = new ArrayList<String>( Arrays.asList( value.split( "[\\.\\-\\_]" ) ) ); - List<String> rangeValueTokens = new ArrayList<String>( Arrays.asList( rangeValue.value.split( "\\." ) ) ); + List<String> valueTokens = new ArrayList<>( Arrays.asList( value.split( "[\\.\\-\\_]" ) ) ); + List<String> rangeValueTokens = new ArrayList<>( Arrays.asList( rangeValue.value.split( "\\." ) ) ); addZeroTokens( valueTokens, 3 ); addZeroTokens( rangeValueTokens, 3 ); @@ -170,7 +170,7 @@ public class JdkVersionProfileActivator private static List<RangeValue> getRange( String range ) { - List<RangeValue> ranges = new ArrayList<RangeValue>(); + List<RangeValue> ranges = new ArrayList<>(); for ( String token : range.split( "," ) ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java index 7d4f66a..322dcae 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java @@ -70,7 +70,7 @@ public class DefaultSuperPomProvider try { - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); options.put( "xml:4.0.0", "xml:4.0.0" ); superModel = modelProcessor.read( is, options ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index dd7bd4e..1d3a0f6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -145,7 +145,7 @@ public class DefaultModelValidator } } - Set<String> profileIds = new HashSet<String>(); + Set<String> profileIds = new HashSet<>(); for ( Profile profile : m.getProfiles() ) { @@ -255,7 +255,7 @@ public class DefaultModelValidator { Severity errOn31 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 ); - Map<String, Plugin> index = new HashMap<String, Plugin>(); + Map<String, Plugin> index = new HashMap<>(); for ( Plugin plugin : plugins ) { @@ -273,7 +273,7 @@ public class DefaultModelValidator index.put( key, plugin ); } - Set<String> executionIds = new HashSet<String>(); + Set<String> executionIds = new HashSet<>(); for ( PluginExecution exec : plugin.getExecutions() ) { @@ -333,7 +333,7 @@ public class DefaultModelValidator if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 ) { - Set<String> modules = new HashSet<String>(); + Set<String> modules = new HashSet<>(); for ( int i = 0, n = m.getModules().size(); i < n; i++ ) { String module = m.getModules().get( i ); @@ -425,7 +425,7 @@ public class DefaultModelValidator Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 ); Severity errOn31 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 ); - Map<String, Dependency> index = new HashMap<String, Dependency>(); + Map<String, Dependency> index = new HashMap<>(); for ( Dependency dependency : dependencies ) { @@ -639,7 +639,7 @@ public class DefaultModelValidator private void validateRawRepositories( ModelProblemCollector problems, List<Repository> repositories, String prefix, ModelBuildingRequest request ) { - Map<String, Repository> index = new HashMap<String, Repository>(); + Map<String, Repository> index = new HashMap<>(); for ( Repository repository : repositories ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java index bb0ccff..64e9b38 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java @@ -35,11 +35,11 @@ public class SimpleProblemCollector { private Model model; - private List<String> warnings = new ArrayList<String>(); + private List<String> warnings = new ArrayList<>(); - private List<String> errors = new ArrayList<String>(); + private List<String> errors = new ArrayList<>(); - private List<String> fatals = new ArrayList<String>(); + private List<String> fatals = new ArrayList<>(); public SimpleProblemCollector() { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java index c4cae3d..9c3e7de 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java @@ -128,7 +128,7 @@ public class StringSearchModelInterpolatorTest p.setProperty( "key", "value" ); p.setProperty( "key2", "value2" ); - List<String> values = new ArrayList<String>(); + List<String> values = new ArrayList<>(); values.add( "${key}" ); values.add( "${key2}" ); @@ -155,7 +155,7 @@ public class StringSearchModelInterpolatorTest p.setProperty( "key", "value" ); p.setProperty( "key2", "value2" ); - List<String> values = new ArrayList<String>(); + List<String> values = new ArrayList<>(); values.add( "key" ); values.add( "${key2}" ); @@ -208,7 +208,7 @@ public class StringSearchModelInterpolatorTest p.setProperty( "key3", "value3" ); p.setProperty( "key4", "value4" ); - List<String[]> values = new ArrayList<String[]>(); + List<String[]> values = new ArrayList<>(); values.add( new String[] { "${key}", "${key2}" } ); values.add( new String[] { "${key3}", "${key4}" } ); @@ -237,7 +237,7 @@ public class StringSearchModelInterpolatorTest p.setProperty( "key", "value" ); p.setProperty( "key2", "value2" ); - Map<String, String> values = new HashMap<String, String>(); + Map<String, String> values = new HashMap<>(); values.put( "key", "${key}" ); values.put( "key2", "${key2}" ); @@ -264,7 +264,7 @@ public class StringSearchModelInterpolatorTest p.setProperty( "key", "value" ); p.setProperty( "key2", "value2" ); - Map<String, String> values = new HashMap<String, String>(); + Map<String, String> values = new HashMap<>(); values.put( "key", "val" ); values.put( "key2", "${key2}" ); @@ -317,7 +317,7 @@ public class StringSearchModelInterpolatorTest p.setProperty( "key3", "value3" ); p.setProperty( "key4", "value4" ); - Map<String, String[]> values = new HashMap<String, String[]>(); + Map<String, String[]> values = new HashMap<>(); values.put( "key", new String[] { "${key}", "${key2}" } ); values.put( "key2", new String[] { "${key3}", "${key4}" } ); @@ -356,7 +356,7 @@ public class StringSearchModelInterpolatorTest int numItems = 100; final CountDownLatch countDownLatch = new CountDownLatch(1); - List<Future<SimpleProblemCollector>> futures = new ArrayList<Future<SimpleProblemCollector>>(); + List<Future<SimpleProblemCollector>> futures = new ArrayList<>(); for ( int i = 0; i < numItems; i++ ) { Callable<SimpleProblemCollector> future = new Callable<SimpleProblemCollector>() @@ -373,7 +373,7 @@ public class StringSearchModelInterpolatorTest return collector; } }; - FutureTask<SimpleProblemCollector> task = new FutureTask<SimpleProblemCollector>( future ); + FutureTask<SimpleProblemCollector> task = new FutureTask<>( future ); futures.add( task ); new Thread( task ).start(); } @@ -387,14 +387,14 @@ public class StringSearchModelInterpolatorTest private ObjectWithMixedProtection getValueList() { - List<String[]> values = new ArrayList<String[]>(); + List<String[]> values = new ArrayList<>(); values.add( new String[] { "${key}", "${key2}" } ); values.add( new String[] { "${key3}", "${key4}" } ); - List<String> values2 = new ArrayList<String>(); + List<String> values2 = new ArrayList<>(); values.add( new String[] { "${key}", "${key2}" } ); values.add( new String[] { "${key3}", "${key4}" } ); - List<String> values3 = new ArrayList<String>(); + List<String> values3 = new ArrayList<>(); values.add( new String[] { "${key}", "${key2}" } ); values.add( new String[] { "${key3}", "${key4}" } );
