http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java index 5c6689d..669773d 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java @@ -39,12 +39,12 @@ public class AndArtifactFilter public AndArtifactFilter() { - this.filters = new LinkedHashSet<ArtifactFilter>(); + this.filters = new LinkedHashSet<>(); } public AndArtifactFilter( List<ArtifactFilter> filters ) { - this.filters = new LinkedHashSet<ArtifactFilter>( filters ); + this.filters = new LinkedHashSet<>( filters ); } public boolean include( Artifact artifact ) @@ -68,7 +68,7 @@ public class AndArtifactFilter public List<ArtifactFilter> getFilters() { - return new ArrayList<ArtifactFilter>( filters ); + return new ArrayList<>( filters ); } @Override
http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java index fb0afcf..e92ece2 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java @@ -45,7 +45,7 @@ public class CumulativeScopeArtifactFilter */ public CumulativeScopeArtifactFilter( Collection<String> scopes ) { - this.scopes = new HashSet<String>(); + this.scopes = new HashSet<>(); addScopes( scopes ); } @@ -57,7 +57,7 @@ public class CumulativeScopeArtifactFilter */ public CumulativeScopeArtifactFilter( CumulativeScopeArtifactFilter... filters ) { - this.scopes = new HashSet<String>(); + this.scopes = new HashSet<>(); if ( filters != null ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java index c3dc981..57c6177 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java @@ -35,7 +35,7 @@ public class ExclusionSetFilter public ExclusionSetFilter( String[] excludes ) { - this.excludes = new LinkedHashSet<String>( Arrays.asList( excludes ) ); + this.excludes = new LinkedHashSet<>( Arrays.asList( excludes ) ); } public ExclusionSetFilter( Set<String> excludes ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java index 403e125..6ac8884 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java @@ -39,7 +39,7 @@ public class IncludesArtifactFilter public IncludesArtifactFilter( List<String> patterns ) { - this.patterns = new LinkedHashSet<String>( patterns ); + this.patterns = new LinkedHashSet<>( patterns ); } public boolean include( Artifact artifact ) @@ -60,7 +60,7 @@ public class IncludesArtifactFilter public List<String> getPatterns() { - return new ArrayList<String>( patterns ); + return new ArrayList<>( patterns ); } @Override http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java index f33bc32..9331710 100644 --- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java @@ -114,7 +114,7 @@ public class MavenRepositorySystem if ( !d.getExclusions().isEmpty() ) { - List<String> exclusions = new ArrayList<String>(); + List<String> exclusions = new ArrayList<>(); for ( Exclusion exclusion : d.getExclusions() ) { @@ -593,7 +593,7 @@ public class MavenRepositorySystem public Set<String> getRepoIds( List<ArtifactRepository> repositories ) { - Set<String> repoIds = new HashSet<String>(); + Set<String> repoIds = new HashSet<>(); if ( repositories != null ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 69ee04a..e3f4d26 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -156,9 +156,9 @@ public class DefaultClassRealmManager private ClassRealm createRealm( String baseRealmId, RealmType type, ClassLoader parent, List<String> parentImports, Map<String, ClassLoader> foreignImports, List<Artifact> artifacts ) { - Set<String> artifactIds = new LinkedHashSet<String>(); + Set<String> artifactIds = new LinkedHashSet<>(); - List<ClassRealmConstituent> constituents = new ArrayList<ClassRealmConstituent>(); + List<ClassRealmConstituent> constituents = new ArrayList<>(); if ( artifacts != null ) { @@ -177,20 +177,20 @@ public class DefaultClassRealmManager if ( parentImports != null ) { - parentImports = new ArrayList<String>( parentImports ); + parentImports = new ArrayList<>( parentImports ); } else { - parentImports = new ArrayList<String>(); + parentImports = new ArrayList<>(); } if ( foreignImports != null ) { - foreignImports = new TreeMap<String, ClassLoader>( foreignImports ); + foreignImports = new TreeMap<>( foreignImports ); } else { - foreignImports = new TreeMap<String, ClassLoader>(); + foreignImports = new TreeMap<>(); } ClassRealm classRealm = newRealm( baseRealmId ); @@ -305,7 +305,7 @@ public class DefaultClassRealmManager private void callDelegates( ClassRealm classRealm, RealmType type, ClassLoader parent, List<String> parentImports, Map<String, ClassLoader> foreignImports, List<ClassRealmConstituent> constituents ) { - List<ClassRealmManagerDelegate> delegates = new ArrayList<ClassRealmManagerDelegate>( this.delegates ); + List<ClassRealmManagerDelegate> delegates = new ArrayList<>( this.delegates ); if ( !delegates.isEmpty() ) { @@ -329,7 +329,7 @@ public class DefaultClassRealmManager private Set<String> populateRealm( ClassRealm classRealm, List<ClassRealmConstituent> constituents ) { - Set<String> includedIds = new LinkedHashSet<String>(); + Set<String> includedIds = new LinkedHashSet<>(); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java index d44642d..e779009 100644 --- a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java +++ b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java @@ -46,7 +46,7 @@ public class EventSpyDispatcher public void setEventSpies( List<EventSpy> eventSpies ) { // make copy to get rid of needless overhead for dynamic lookups - this.eventSpies = new ArrayList<EventSpy>( eventSpies ); + this.eventSpies = new ArrayList<>( eventSpies ); } public List<EventSpy> getEventSpies() @@ -84,11 +84,7 @@ public class EventSpyDispatcher { eventSpy.init( context ); } - catch ( Exception e ) - { - logError( "initialize", e, eventSpy ); - } - catch ( LinkageError e ) + catch ( Exception | LinkageError e ) { logError( "initialize", e, eventSpy ); } @@ -107,11 +103,7 @@ public class EventSpyDispatcher { eventSpy.onEvent( event ); } - catch ( Exception e ) - { - logError( "notify", e, eventSpy ); - } - catch ( LinkageError e ) + catch ( Exception | LinkageError e ) { logError( "notify", e, eventSpy ); } @@ -130,11 +122,7 @@ public class EventSpyDispatcher { eventSpy.close(); } - catch ( Exception e ) - { - logError( "close", e, eventSpy ); - } - catch ( LinkageError e ) + catch ( Exception | LinkageError e ) { logError( "close", e, eventSpy ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java index 6df72c8..5b802ed 100644 --- a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java +++ b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java @@ -103,7 +103,7 @@ public class DefaultExceptionHandler { List<ProjectBuildingResult> results = ( (ProjectBuildingException) exception ).getResults(); - children = new ArrayList<ExceptionSummary>(); + children = new ArrayList<>(); for ( ProjectBuildingResult result : results ) { @@ -126,7 +126,7 @@ public class DefaultExceptionHandler private ExceptionSummary handle( ProjectBuildingResult result ) { - List<ExceptionSummary> children = new ArrayList<ExceptionSummary>(); + List<ExceptionSummary> children = new ArrayList<>(); for ( ModelProblem problem : result.getProblems() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java index e5509dc..db6160d 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java @@ -239,7 +239,7 @@ public class DefaultMavenExecutionRequest { if ( goals == null ) { - goals = new ArrayList<String>(); + goals = new ArrayList<>(); } return goals; } @@ -283,7 +283,7 @@ public class DefaultMavenExecutionRequest { if ( selectedProjects == null ) { - selectedProjects = new ArrayList<String>(); + selectedProjects = new ArrayList<>(); } return selectedProjects; @@ -294,7 +294,7 @@ public class DefaultMavenExecutionRequest { if ( excludedProjects == null ) { - excludedProjects = new ArrayList<String>(); + excludedProjects = new ArrayList<>(); } return excludedProjects; @@ -335,7 +335,7 @@ public class DefaultMavenExecutionRequest { if ( activeProfiles != null ) { - this.activeProfiles = new ArrayList<String>( activeProfiles ); + this.activeProfiles = new ArrayList<>( activeProfiles ); } else { @@ -350,7 +350,7 @@ public class DefaultMavenExecutionRequest { if ( inactiveProfiles != null ) { - this.inactiveProfiles = new ArrayList<String>( inactiveProfiles ); + this.inactiveProfiles = new ArrayList<>( inactiveProfiles ); } else { @@ -365,7 +365,7 @@ public class DefaultMavenExecutionRequest { if ( remoteRepositories != null ) { - this.remoteRepositories = new ArrayList<ArtifactRepository>( remoteRepositories ); + this.remoteRepositories = new ArrayList<>( remoteRepositories ); } else { @@ -380,7 +380,7 @@ public class DefaultMavenExecutionRequest { if ( pluginArtifactRepositories != null ) { - this.pluginArtifactRepositories = new ArrayList<ArtifactRepository>( pluginArtifactRepositories ); + this.pluginArtifactRepositories = new ArrayList<>( pluginArtifactRepositories ); } else { @@ -400,7 +400,7 @@ public class DefaultMavenExecutionRequest { if ( activeProfiles == null ) { - activeProfiles = new ArrayList<String>(); + activeProfiles = new ArrayList<>(); } return activeProfiles; } @@ -410,7 +410,7 @@ public class DefaultMavenExecutionRequest { if ( inactiveProfiles == null ) { - inactiveProfiles = new ArrayList<String>(); + inactiveProfiles = new ArrayList<>(); } return inactiveProfiles; } @@ -490,7 +490,7 @@ public class DefaultMavenExecutionRequest { if ( goals != null ) { - this.goals = new ArrayList<String>( goals ); + this.goals = new ArrayList<>( goals ); } else { @@ -574,7 +574,7 @@ public class DefaultMavenExecutionRequest { if ( selectedProjects != null ) { - this.selectedProjects = new ArrayList<String>( selectedProjects ); + this.selectedProjects = new ArrayList<>( selectedProjects ); } else { @@ -589,7 +589,7 @@ public class DefaultMavenExecutionRequest { if ( excludedProjects != null ) { - this.excludedProjects = new ArrayList<String>( excludedProjects ); + this.excludedProjects = new ArrayList<>( excludedProjects ); } else { @@ -756,7 +756,7 @@ public class DefaultMavenExecutionRequest { if ( proxies == null ) { - proxies = new ArrayList<Proxy>(); + proxies = new ArrayList<>(); } return proxies; } @@ -766,7 +766,7 @@ public class DefaultMavenExecutionRequest { if ( proxies != null ) { - this.proxies = new ArrayList<Proxy>( proxies ); + this.proxies = new ArrayList<>( proxies ); } else { @@ -802,7 +802,7 @@ public class DefaultMavenExecutionRequest { if ( servers == null ) { - servers = new ArrayList<Server>(); + servers = new ArrayList<>(); } return servers; } @@ -812,7 +812,7 @@ public class DefaultMavenExecutionRequest { if ( servers != null ) { - this.servers = new ArrayList<Server>( servers ); + this.servers = new ArrayList<>( servers ); } else { @@ -848,7 +848,7 @@ public class DefaultMavenExecutionRequest { if ( mirrors == null ) { - mirrors = new ArrayList<Mirror>(); + mirrors = new ArrayList<>(); } return mirrors; } @@ -858,7 +858,7 @@ public class DefaultMavenExecutionRequest { if ( mirrors != null ) { - this.mirrors = new ArrayList<Mirror>( mirrors ); + this.mirrors = new ArrayList<>( mirrors ); } else { @@ -894,7 +894,7 @@ public class DefaultMavenExecutionRequest { if ( profiles == null ) { - profiles = new ArrayList<Profile>(); + profiles = new ArrayList<>(); } return profiles; } @@ -904,7 +904,7 @@ public class DefaultMavenExecutionRequest { if ( profiles != null ) { - this.profiles = new ArrayList<Profile>( profiles ); + this.profiles = new ArrayList<>( profiles ); } else { @@ -919,7 +919,7 @@ public class DefaultMavenExecutionRequest { if ( pluginGroups == null ) { - pluginGroups = new ArrayList<String>(); + pluginGroups = new ArrayList<>(); } return pluginGroups; @@ -930,7 +930,7 @@ public class DefaultMavenExecutionRequest { if ( pluginGroups != null ) { - this.pluginGroups = new ArrayList<String>( pluginGroups ); + this.pluginGroups = new ArrayList<>( pluginGroups ); } else { @@ -1065,7 +1065,7 @@ public class DefaultMavenExecutionRequest { if ( remoteRepositories == null ) { - remoteRepositories = new ArrayList<ArtifactRepository>(); + remoteRepositories = new ArrayList<>(); } return remoteRepositories; } @@ -1091,7 +1091,7 @@ public class DefaultMavenExecutionRequest { if ( pluginArtifactRepositories == null ) { - pluginArtifactRepositories = new ArrayList<ArtifactRepository>(); + pluginArtifactRepositories = new ArrayList<>(); } return pluginArtifactRepositories; } @@ -1249,7 +1249,7 @@ public class DefaultMavenExecutionRequest { if ( toolchains == null ) { - toolchains = new HashMap<String, List<ToolchainModel>>(); + toolchains = new HashMap<>(); } return toolchains; } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java index 7568fde..ba5630e 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java @@ -69,7 +69,7 @@ public class DefaultMavenExecutionRequestPopulator { if ( toolchains != null ) { - Map<String, List<ToolchainModel>> groupedToolchains = new HashMap<String, List<ToolchainModel>>( 2 ); + Map<String, List<ToolchainModel>> groupedToolchains = new HashMap<>( 2 ); for ( ToolchainModel model : toolchains.getToolchains() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java index a8967ed..87d8676 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java @@ -38,7 +38,7 @@ public class DefaultMavenExecutionResult private DependencyResolutionResult dependencyResolutionResult; - private final List<Throwable> exceptions = new CopyOnWriteArrayList<Throwable>(); + private final List<Throwable> exceptions = new CopyOnWriteArrayList<>(); private final Map<MavenProject, BuildSummary> buildSummaries = Collections.synchronizedMap( new IdentityHashMap<MavenProject, BuildSummary>() ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java index 235691a..864c49ad 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java @@ -74,7 +74,7 @@ public class MavenSession private boolean parallel; private final Map<String, Map<String, Map<String, Object>>> pluginContextsByProjectAndPluginKey = - new ConcurrentHashMap<String, Map<String, Map<String, Object>>>(); + new ConcurrentHashMap<>(); public void setProjects( List<MavenProject> projects ) @@ -198,7 +198,7 @@ public class MavenSession if ( pluginContextsByKey == null ) { - pluginContextsByKey = new ConcurrentHashMap<String, Map<String, Object>>(); + pluginContextsByKey = new ConcurrentHashMap<>(); pluginContextsByProjectAndPluginKey.put( projectKey, pluginContextsByKey ); } @@ -209,7 +209,7 @@ public class MavenSession if ( pluginContext == null ) { - pluginContext = new ConcurrentHashMap<String, Object>(); + pluginContext = new ConcurrentHashMap<>(); pluginContextsByKey.put( pluginKey, pluginContext ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java index 1b99a3b..45501a6 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java @@ -47,17 +47,17 @@ public class ReactorManager // make projects that depend on me, and projects that I depend on public static final String MAKE_BOTH_MODE = "make-both"; - private List<String> blackList = new ArrayList<String>(); + private List<String> blackList = new ArrayList<>(); - private Map<String, BuildFailure> buildFailuresByProject = new HashMap<String, BuildFailure>(); + private Map<String, BuildFailure> buildFailuresByProject = new HashMap<>(); - private Map pluginContextsByProjectAndPluginKey = new HashMap(); + private Map<String, Map<String, Map>> pluginContextsByProjectAndPluginKey = new HashMap<>(); private String failureBehavior = FAIL_FAST; private final ProjectSorter sorter; - private Map<String, BuildSuccess> buildSuccessesByProject = new HashMap<String, BuildSuccess>(); + private Map<String, BuildSuccess> buildSuccessesByProject = new HashMap<>(); public ReactorManager( List<MavenProject> projects ) throws CycleDetectedException, DuplicateProjectException @@ -67,15 +67,15 @@ public class ReactorManager public Map getPluginContext( PluginDescriptor plugin, MavenProject project ) { - Map pluginContextsByKey = (Map) pluginContextsByProjectAndPluginKey.get( project.getId() ); + Map<String, Map> pluginContextsByKey = pluginContextsByProjectAndPluginKey.get( project.getId() ); if ( pluginContextsByKey == null ) { - pluginContextsByKey = new HashMap(); + pluginContextsByKey = new HashMap<>(); pluginContextsByProjectAndPluginKey.put( project.getId(), pluginContextsByKey ); } - Map pluginContext = (Map) pluginContextsByKey.get( plugin.getPluginLookupKey() ); + Map pluginContext = pluginContextsByKey.get( plugin.getPluginLookupKey() ); if ( pluginContext == null ) { @@ -93,15 +93,16 @@ public class ReactorManager this.failureBehavior = FAIL_FAST; // default return; } - if ( FAIL_FAST.equals( failureBehavior ) || FAIL_AT_END.equals( failureBehavior ) - || FAIL_NEVER.equals( failureBehavior ) ) + if ( FAIL_FAST.equals( failureBehavior ) || FAIL_AT_END.equals( failureBehavior ) || FAIL_NEVER.equals( + failureBehavior ) ) { this.failureBehavior = failureBehavior; } else { - throw new IllegalArgumentException( "Invalid failure behavior (must be one of: \'" + FAIL_FAST + "\', \'" - + FAIL_AT_END + "\', \'" + FAIL_NEVER + "\')." ); + throw new IllegalArgumentException( + "Invalid failure behavior (must be one of: \'" + FAIL_FAST + "\', \'" + FAIL_AT_END + "\', \'" + + FAIL_NEVER + "\')." ); } } @@ -127,8 +128,8 @@ public class ReactorManager { for ( String dependentId : dependents ) { - if ( !buildSuccessesByProject.containsKey( dependentId ) - && !buildFailuresByProject.containsKey( dependentId ) ) + if ( !buildSuccessesByProject.containsKey( dependentId ) && !buildFailuresByProject.containsKey( + dependentId ) ) { blackList( dependentId ); } @@ -184,12 +185,12 @@ public class ReactorManager public BuildFailure getBuildFailure( MavenProject project ) { - return (BuildFailure) buildFailuresByProject.get( getProjectKey( project ) ); + return buildFailuresByProject.get( getProjectKey( project ) ); } public BuildSuccess getBuildSuccess( MavenProject project ) { - return (BuildSuccess) buildSuccessesByProject.get( getProjectKey( project ) ); + return buildSuccessesByProject.get( getProjectKey( project ) ); } public boolean executedMultipleProjects() http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java b/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java index 000607f..9a76993 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java +++ b/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java @@ -104,7 +104,7 @@ class SettingsAdapter @Override public List<Profile> getProfiles() { - List<Profile> result = new ArrayList<Profile>(); + List<Profile> result = new ArrayList<>(); for ( org.apache.maven.model.Profile profile : request.getProfiles() ) { result.add( SettingsUtils.convertToSettingsProfile( profile ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java index 8a98daf..e5b6c16 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java +++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java @@ -54,7 +54,7 @@ public class MojoExecutionScope 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 MojoExecutionScope() { @@ -65,7 +65,7 @@ public class MojoExecutionScope LinkedList<ScopeState> stack = values.get(); if ( stack == null ) { - stack = new LinkedList<ScopeState>(); + stack = new LinkedList<>(); values.set( stack ); } stack.addFirst( new ScopeState() ); @@ -177,7 +177,7 @@ public class MojoExecutionScope // the same instance can be provided multiple times under different Key's // deduplicate instances to avoid redundant beforeXXX/afterXXX callbacks IdentityHashMap<WeakMojoExecutionListener, Object> listeners = - new IdentityHashMap<WeakMojoExecutionListener, Object>(); + new IdentityHashMap<>(); for ( Object provided : getScopeState().provided.values() ) { if ( provided instanceof WeakMojoExecutionListener ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java index c4265b3..e253e9f 100644 --- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java +++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java @@ -47,7 +47,7 @@ public class CoreExports public CoreExports( ClassRealm realm, Set<String> exportedArtifacts, Set<String> exportedPackages ) { - Map<String, ClassLoader> packages = new LinkedHashMap<String, ClassLoader>(); + Map<String, ClassLoader> packages = new LinkedHashMap<>(); for ( String pkg : exportedPackages ) { packages.put( pkg, realm ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java index edadeb2..4ac5183 100644 --- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java +++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java @@ -84,8 +84,8 @@ public class CoreExtensionEntry public static CoreExtensionEntry discoverFrom( ClassRealm loader ) { - Set<String> artifacts = new LinkedHashSet<String>(); - Set<String> packages = new LinkedHashSet<String>(); + Set<String> artifacts = new LinkedHashSet<>(); + Set<String> packages = new LinkedHashSet<>(); try { @@ -115,8 +115,8 @@ public class CoreExtensionEntry public static CoreExtensionEntry discoverFrom( ClassRealm loader, Collection<File> classpath ) { - Set<String> artifacts = new LinkedHashSet<String>(); - Set<String> packages = new LinkedHashSet<String>(); + Set<String> artifacts = new LinkedHashSet<>(); + Set<String> packages = new LinkedHashSet<>(); try { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java index c836746..680d584 100644 --- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java @@ -158,7 +158,7 @@ public class DefaultGraphBuilder reactorDirectory = new File( request.getBaseDirectory() ); } - Collection<MavenProject> selectedProjects = new LinkedHashSet<MavenProject>( projects.size() ); + Collection<MavenProject> selectedProjects = new LinkedHashSet<>( projects.size() ); for ( String selector : request.getSelectedProjects() ) { @@ -208,7 +208,7 @@ public class DefaultGraphBuilder if ( makeUpstream || makeDownstream ) { - for ( MavenProject selectedProject : new ArrayList<MavenProject>( selectedProjects ) ) + for ( MavenProject selectedProject : new ArrayList<>( selectedProjects ) ) { if ( makeUpstream ) { @@ -221,7 +221,7 @@ public class DefaultGraphBuilder } } - result = new ArrayList<MavenProject>( selectedProjects.size() ); + result = new ArrayList<>( selectedProjects.size() ); for ( MavenProject project : projects ) { @@ -249,7 +249,7 @@ public class DefaultGraphBuilder reactorDirectory = new File( request.getBaseDirectory() ); } - Collection<MavenProject> excludedProjects = new LinkedHashSet<MavenProject>( projects.size() ); + Collection<MavenProject> excludedProjects = new LinkedHashSet<>( projects.size() ); for ( String selector : request.getExcludedProjects() ) { @@ -275,7 +275,7 @@ public class DefaultGraphBuilder } } - result = new ArrayList<MavenProject>( projects.size() ); + result = new ArrayList<>( projects.size() ); for ( MavenProject project : projects ) { if ( !excludedProjects.contains( project ) ) @@ -303,7 +303,7 @@ public class DefaultGraphBuilder String selector = request.getResumeFrom(); - result = new ArrayList<MavenProject>( projects.size() ); + result = new ArrayList<>( projects.size() ); boolean resumed = false; @@ -391,7 +391,7 @@ public class DefaultGraphBuilder request.getProjectBuildingRequest().setRepositorySession( session.getRepositorySession() ); - List<MavenProject> projects = new ArrayList<MavenProject>(); + List<MavenProject> projects = new ArrayList<>(); // We have no POM file. // @@ -455,7 +455,7 @@ public class DefaultGraphBuilder private void validateProjects( List<MavenProject> projects ) { - Map<String, MavenProject> projectsMap = new HashMap<String, MavenProject>(); + Map<String, MavenProject> projectsMap = new HashMap<>(); for ( MavenProject p : projects ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java index 01fec33..86aa55d 100644 --- a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java @@ -57,7 +57,7 @@ public class DefaultProjectDependencyGraph public List<MavenProject> getSortedProjects() { - return new ArrayList<MavenProject>( sorter.getSortedProjects() ); + return new ArrayList<>( sorter.getSortedProjects() ); } public List<MavenProject> getDownstreamProjects( MavenProject project, boolean transitive ) @@ -67,7 +67,7 @@ public class DefaultProjectDependencyGraph throw new IllegalArgumentException( "project missing" ); } - Set<String> projectIds = new HashSet<String>(); + Set<String> projectIds = new HashSet<>(); getDownstreamProjects( ProjectSorter.getId( project ), projectIds, transitive ); @@ -92,7 +92,7 @@ public class DefaultProjectDependencyGraph throw new IllegalArgumentException( "project missing" ); } - Set<String> projectIds = new HashSet<String>(); + Set<String> projectIds = new HashSet<>(); getUpstreamProjects( ProjectSorter.getId( project ), projectIds, transitive ); @@ -112,7 +112,7 @@ public class DefaultProjectDependencyGraph private List<MavenProject> getSortedProjects( Set<String> projectIds ) { - List<MavenProject> result = new ArrayList<MavenProject>( projectIds.size() ); + List<MavenProject> result = new ArrayList<>( projectIds.size() ); for ( MavenProject mavenProject : sorter.getSortedProjects() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java index 662bda4..1f37fed 100644 --- a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java @@ -74,7 +74,7 @@ class FilteredProjectDependencyGraph sortedProjects = applyFilter( projectDependencyGraph.getSortedProjects() ); } - return new ArrayList<MavenProject>( sortedProjects ); + return new ArrayList<>( sortedProjects ); } public List<MavenProject> getDownstreamProjects( MavenProject project, boolean transitive ) @@ -89,7 +89,7 @@ class FilteredProjectDependencyGraph private List<MavenProject> applyFilter( Collection<? extends MavenProject> projects ) { - List<MavenProject> filtered = new ArrayList<MavenProject>( projects.size() ); + List<MavenProject> filtered = new ArrayList<>( projects.size() ); for ( MavenProject project : projects ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java index 26a8dda..3e79915 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java +++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java @@ -101,7 +101,7 @@ public class DefaultRepositorySystemSessionFactory session.setCache( request.getRepositoryCache() ); - Map<Object, Object> configProps = new LinkedHashMap<Object, Object>(); + Map<Object, Object> configProps = new LinkedHashMap<>(); configProps.put( ConfigurationProperties.USER_AGENT, getUserAgent() ); configProps.put( ConfigurationProperties.INTERACTIVE, request.isInteractiveMode() ); configProps.putAll( request.getSystemProperties() ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java index 64c9a7f..48cd0c5 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java @@ -61,7 +61,7 @@ public class DefaultLifecycles public DefaultLifecycles( Map<String, Lifecycle> lifecycles, Logger logger ) { - this.lifecycles = new LinkedHashMap<String, Lifecycle>(); + this.lifecycles = new LinkedHashMap<>(); this.logger = logger; this.lifecycles = lifecycles; } @@ -82,7 +82,7 @@ public class DefaultLifecycles // If people are going to make their own lifecycles then we need to tell people how to namespace them correctly // so that they don't interfere with internally defined lifecycles. - HashMap<String, Lifecycle> phaseToLifecycleMap = new HashMap<String, Lifecycle>(); + HashMap<String, Lifecycle> phaseToLifecycleMap = new HashMap<>(); for ( Lifecycle lifecycle : getLifeCycles() ) { @@ -113,12 +113,12 @@ public class DefaultLifecycles public List<Lifecycle> getLifeCycles() { // ensure canonical order of standard lifecycles - Map<String, Lifecycle> lifecycles = new LinkedHashMap<String, Lifecycle>( this.lifecycles ); + Map<String, Lifecycle> lifecycles = new LinkedHashMap<>( this.lifecycles ); - LinkedHashSet<String> lifecycleNames = new LinkedHashSet<String>( Arrays.asList( STANDARD_LIFECYCLES ) ); + LinkedHashSet<String> lifecycleNames = new LinkedHashSet<>( Arrays.asList( STANDARD_LIFECYCLES ) ); lifecycleNames.addAll( lifecycles.keySet() ); - ArrayList<Lifecycle> result = new ArrayList<Lifecycle>(); + ArrayList<Lifecycle> result = new ArrayList<>(); for ( String name : lifecycleNames ) { Lifecycle lifecycle = lifecycles.get( name ); @@ -131,7 +131,7 @@ public class DefaultLifecycles public String getLifecyclePhaseList() { - Set<String> phases = new LinkedHashSet<String>(); + Set<String> phases = new LinkedHashSet<>(); for ( Lifecycle lifecycle : getLifeCycles() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java b/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java index 7767ea2..7dacb8e 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java @@ -65,9 +65,9 @@ public class MavenExecutionPlan { this.planItem = planItem; - lastMojoExecutionForAllPhases = new LinkedHashMap<String, ExecutionPlanItem>(); + lastMojoExecutionForAllPhases = new LinkedHashMap<>(); - LinkedHashSet<String> totalPhaseSet = new LinkedHashSet<String>(); + LinkedHashSet<String> totalPhaseSet = new LinkedHashSet<>(); if ( defaultLifecycles != null ) { for ( String phase : getDistinctPhasesInOrderOfExecutionPlanAppearance( planItem ) ) @@ -79,9 +79,9 @@ public class MavenExecutionPlan } } } - this.phasesInExecutionPlan = new ArrayList<String>( totalPhaseSet ); + this.phasesInExecutionPlan = new ArrayList<>( totalPhaseSet ); - Map<String, ExecutionPlanItem> lastInExistingPhases = new HashMap<String, ExecutionPlanItem>(); + Map<String, ExecutionPlanItem> lastInExistingPhases = new HashMap<>(); for ( ExecutionPlanItem executionPlanItem : getExecutionPlanItems() ) { lastInExistingPhases.put( executionPlanItem.getLifecyclePhase(), executionPlanItem ); @@ -127,7 +127,7 @@ public class MavenExecutionPlan private static Iterable<String> getDistinctPhasesInOrderOfExecutionPlanAppearance( List<ExecutionPlanItem> planItems ) { - LinkedHashSet<String> result = new LinkedHashSet<String>(); + LinkedHashSet<String> result = new LinkedHashSet<>(); for ( ExecutionPlanItem executionPlanItem : planItems ) { final String phase = executionPlanItem.getLifecyclePhase(); @@ -141,7 +141,7 @@ public class MavenExecutionPlan public List<MojoExecution> getMojoExecutions() { - List<MojoExecution> result = new ArrayList<MojoExecution>(); + List<MojoExecution> result = new ArrayList<>(); for ( ExecutionPlanItem executionPlanItem : planItem ) { result.add( executionPlanItem.getMojoExecution() ); @@ -156,7 +156,7 @@ public class MavenExecutionPlan */ public Set<Plugin> getNonThreadSafePlugins() { - Set<Plugin> plugins = new HashSet<Plugin>(); + Set<Plugin> plugins = new HashSet<>(); for ( ExecutionPlanItem executionPlanItem : planItem ) { final MojoExecution mojoExecution = executionPlanItem.getMojoExecution(); @@ -175,7 +175,7 @@ public class MavenExecutionPlan */ public Set<MojoDescriptor> getNonThreadSafeMojos() { - Set<MojoDescriptor> mojos = new HashSet<MojoDescriptor>(); + Set<MojoDescriptor> mojos = new HashSet<>(); for ( ExecutionPlanItem executionPlanItem : planItem ) { final MojoExecution mojoExecution = executionPlanItem.getMojoExecution(); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java index 771385c..7fba304 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java @@ -38,7 +38,7 @@ public class BuildListCalculator { public ProjectBuildList calculateProjectBuilds( MavenSession session, List<TaskSegment> taskSegments ) { - List<ProjectSegment> projectBuilds = new ArrayList<ProjectSegment>(); + List<ProjectSegment> projectBuilds = new ArrayList<>(); MavenProject rootProject = session.getTopLevelProject(); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java index 8cc47cc..2600881 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java @@ -188,7 +188,7 @@ public class DefaultLifecycleExecutionPlanCalculator MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, PluginVersionResolutionException, LifecyclePhaseNotFoundException { - final List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>(); + final List<MojoExecution> mojoExecutions = new ArrayList<>(); for ( Object task : tasks ) { @@ -416,7 +416,7 @@ public class DefaultLifecycleExecutionPlanCalculator injectLifecycleOverlay( lifecycleMappings, mojoExecution, session, project ); - List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>(); + List<MojoExecution> mojoExecutions = new ArrayList<>(); for ( List<MojoExecution> forkedExecutions : lifecycleMappings.values() ) { @@ -459,11 +459,7 @@ public class DefaultLifecycleExecutionPlanCalculator { lifecycleOverlay = pluginDescriptor.getLifecycleMapping( forkedLifecycle ); } - catch ( IOException e ) - { - throw new PluginDescriptorParsingException( pluginDescriptor.getPlugin(), pluginDescriptor.getSource(), e ); - } - catch ( XmlPullParserException e ) + catch ( IOException | XmlPullParserException e ) { throw new PluginDescriptorParsingException( pluginDescriptor.getPlugin(), pluginDescriptor.getSource(), e ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java index 3024fe4..8348530 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java @@ -62,11 +62,11 @@ public class DefaultLifecycleMappingDelegate */ Map<String, Map<Integer, List<MojoExecution>>> mappings = - new LinkedHashMap<String, Map<Integer, List<MojoExecution>>>(); + new LinkedHashMap<>(); for ( String phase : lifecycle.getPhases() ) { - Map<Integer, List<MojoExecution>> phaseBindings = new TreeMap<Integer, List<MojoExecution>>(); + Map<Integer, List<MojoExecution>> phaseBindings = new TreeMap<>(); mappings.put( phase, phaseBindings ); @@ -123,11 +123,11 @@ public class DefaultLifecycleMappingDelegate } } - Map<String, List<MojoExecution>> lifecycleMappings = new LinkedHashMap<String, List<MojoExecution>>(); + Map<String, List<MojoExecution>> lifecycleMappings = new LinkedHashMap<>(); for ( Map.Entry<String, Map<Integer, List<MojoExecution>>> entry : mappings.entrySet() ) { - List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>(); + List<MojoExecution> mojoExecutions = new ArrayList<>(); for ( List<MojoExecution> executions : entry.getValue().values() ) { @@ -148,7 +148,7 @@ public class DefaultLifecycleMappingDelegate if ( mojoExecutions == null ) { - mojoExecutions = new ArrayList<MojoExecution>(); + mojoExecutions = new ArrayList<>(); phaseBindings.put( priority, mojoExecutions ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java index 52f3e85..e71d200 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java @@ -93,7 +93,7 @@ public class DefaultLifecyclePluginAnalyzer return null; } - Map<Plugin, Plugin> plugins = new LinkedHashMap<Plugin, Plugin>(); + Map<Plugin, Plugin> plugins = new LinkedHashMap<>(); for ( Lifecycle lifecycle : getOrderedLifecycles() ) { @@ -132,7 +132,7 @@ public class DefaultLifecyclePluginAnalyzer { // NOTE: The lifecycle order can affect implied execution ids so we better be deterministic. - List<Lifecycle> lifecycles = new ArrayList<Lifecycle>( defaultLifeCycles.getLifeCycles() ); + List<Lifecycle> lifecycles = new ArrayList<>( defaultLifeCycles.getLifeCycles() ); Collections.sort( lifecycles, new Comparator<Lifecycle>() { @@ -230,7 +230,7 @@ public class DefaultLifecyclePluginAnalyzer private String getExecutionId( Plugin plugin, String goal ) { - Set<String> existingIds = new HashSet<String>(); + Set<String> existingIds = new HashSet<>(); for ( PluginExecution execution : plugin.getExecutions() ) { existingIds.add( execution.getId() ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java index 28377f1..20e5585 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java @@ -88,7 +88,7 @@ public class DefaultLifecycleTaskSegmentCalculator 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/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java index cceffdf..4a404e9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java @@ -50,7 +50,7 @@ public class ExecutionPlanItem { BuilderCommon.attachToThread( mavenProject ); - List<ExecutionPlanItem> result = new ArrayList<ExecutionPlanItem>(); + List<ExecutionPlanItem> result = new ArrayList<>(); for ( MojoExecution mojoExecution : executions ) { result.add( new ExecutionPlanItem( mojoExecution ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java index 2edbe75..a99fb65 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java @@ -155,8 +155,8 @@ public class LifecycleDebugLogger private void debugDependencyRequirements( List<MojoExecution> mojoExecutions ) { - Set<String> scopesToCollect = new TreeSet<String>(); - Set<String> scopesToResolve = new TreeSet<String>(); + Set<String> scopesToCollect = new TreeSet<>(); + Set<String> scopesToResolve = new TreeSet<>(); for ( MojoExecution mojoExecution : mojoExecutions ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java index 4d73528..0947ed3 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java @@ -129,7 +129,7 @@ public class LifecycleDependencyResolver project.setResolvedArtifacts( artifacts ); - Map<String, Artifact> map = new HashMap<String, Artifact>(); + Map<String, Artifact> map = new HashMap<>(); for ( Artifact artifact : artifacts ) { map.put( artifact.getDependencyConflictId(), artifact ); @@ -171,10 +171,10 @@ public class LifecycleDependencyResolver if ( scopesToCollect.isEmpty() && scopesToResolve.isEmpty() ) { - return new LinkedHashSet<Artifact>(); + return new LinkedHashSet<>(); } - scopesToCollect = new HashSet<String>( scopesToCollect ); + scopesToCollect = new HashSet<>( scopesToCollect ); scopesToCollect.addAll( scopesToResolve ); DependencyFilter collectionFilter = new ScopeDependencyFilter( null, negate( scopesToCollect ) ); @@ -224,7 +224,7 @@ public class LifecycleDependencyResolver eventSpyDispatcher.onEvent( result ); - Set<Artifact> artifacts = new LinkedHashSet<Artifact>(); + Set<Artifact> artifacts = new LinkedHashSet<>(); if ( result.getDependencyGraph() != null && !result.getDependencyGraph().getChildren().isEmpty() ) { RepositoryUtils.toArtifacts( artifacts, result.getDependencyGraph().getChildren(), @@ -253,7 +253,7 @@ public class LifecycleDependencyResolver private Set<String> getReactorProjectKeys( Collection<MavenProject> projects ) { - Set<String> projectKeys = new HashSet<String>( projects.size() * 2 ); + Set<String> projectKeys = new HashSet<>( projects.size() * 2 ); for ( MavenProject project : projects ) { String key = ArtifactUtils.key( project.getGroupId(), project.getArtifactId(), project.getVersion() ); @@ -264,7 +264,7 @@ public class LifecycleDependencyResolver private Collection<String> negate( Collection<String> scopes ) { - Collection<String> result = new HashSet<String>(); + Collection<String> result = new HashSet<>(); Collections.addAll( result, "system", "compile", "provided", "runtime", "test" ); for ( String scope : scopes ) @@ -306,7 +306,7 @@ public class LifecycleDependencyResolver implements DependencyFilter { - private Set<String> keys = new HashSet<String>(); + private Set<String> keys = new HashSet<>(); public ReactorDependencyFilter( Collection<Artifact> artifacts ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java index c615a6f..956e717 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java @@ -59,7 +59,7 @@ public class LifecyclePluginResolver public void resolveMissingPluginVersions( MavenProject project, MavenSession session ) throws PluginVersionResolutionException { - Map<String, String> versions = new HashMap<String, String>( 64 ); + Map<String, String> versions = new HashMap<>( 64 ); for ( Plugin plugin : project.getBuildPlugins() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java index 36c85fd..e6b09ce 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java @@ -20,7 +20,6 @@ package org.apache.maven.lifecycle.internal; */ import org.apache.maven.execution.MavenSession; -import org.apache.maven.model.Dependency; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.BuildPluginManager; import org.apache.maven.plugin.InvalidPluginDescriptorException; @@ -297,7 +296,7 @@ public class MojoDescriptorCreator plugin.setVersion( pluginInPom.getVersion() ); } - plugin.setDependencies( new ArrayList<Dependency>( pluginInPom.getDependencies() ) ); + plugin.setDependencies( new ArrayList<>( pluginInPom.getDependencies() ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java index a6ba752..2e4c117 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java @@ -19,15 +19,6 @@ package org.apache.maven.lifecycle.internal; * under the License. */ -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.resolver.filter.CumulativeScopeArtifactFilter; @@ -49,15 +40,24 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.util.StringUtils; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + /** * Executes an individual mojo * - * @since 3.0 * @author Jason van Zyl * @author Benjamin Bentmann * @author Kristian Rosenvold * <p/> * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. + * @since 3.0 */ @Component( role = MojoExecutor.class ) public class MojoExecutor @@ -81,8 +81,8 @@ public class MojoExecutor public DependencyContext newDependencyContext( MavenSession session, List<MojoExecution> mojoExecutions ) { - Set<String> scopesToCollect = new TreeSet<String>(); - Set<String> scopesToResolve = new TreeSet<String>(); + Set<String> scopesToCollect = new TreeSet<>(); + Set<String> scopesToResolve = new TreeSet<>(); collectDependencyRequirements( scopesToResolve, scopesToCollect, mojoExecutions ); @@ -171,9 +171,9 @@ public class MojoExecutor if ( mojoDescriptor.isProjectRequired() && !session.getRequest().isProjectPresent() ) { - Throwable cause = - new MissingProjectException( "Goal requires a project to execute" - + " but there is no POM in this directory (" + session.getExecutionRootDirectory() + ")." + Throwable cause = new MissingProjectException( + "Goal requires a project to execute" + " but there is no POM in this directory (" + + session.getExecutionRootDirectory() + ")." + " Please verify you invoked Maven from the correct directory." ); throw new LifecycleExecutionException( mojoExecution, null, cause ); } @@ -182,9 +182,8 @@ public class MojoExecutor { if ( MojoExecution.Source.CLI.equals( mojoExecution.getSource() ) ) { - Throwable cause = - new IllegalStateException( "Goal requires online mode for execution" - + " but Maven is currently offline." ); + Throwable cause = new IllegalStateException( + "Goal requires online mode for execution" + " but Maven is currently offline." ); throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), cause ); } else @@ -207,19 +206,8 @@ public class MojoExecutor { pluginManager.executeMojo( session, mojoExecution ); } - catch ( MojoFailureException e ) - { - throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), e ); - } - catch ( MojoExecutionException e ) - { - throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), e ); - } - catch ( PluginConfigurationException e ) - { - throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), e ); - } - catch ( PluginManagerException e ) + catch ( MojoFailureException | PluginManagerException | PluginConfigurationException + | MojoExecutionException e ) { throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), e ); } @@ -242,7 +230,7 @@ public class MojoExecutor } public void ensureDependenciesAreResolved( MojoDescriptor mojoDescriptor, MavenSession session, - DependencyContext dependencyContext ) + DependencyContext dependencyContext ) throws LifecycleExecutionException { @@ -294,7 +282,7 @@ public class MojoExecutor String scopeToResolve = mojoDescriptor.getDependencyResolutionRequired(); String scopeToCollect = mojoDescriptor.getDependencyCollectionRequired(); - List<String> scopes = new ArrayList<String>( 2 ); + List<String> scopes = new ArrayList<>( 2 ); if ( StringUtils.isNotEmpty( scopeToCollect ) ) { scopes.add( scopeToCollect ); @@ -328,7 +316,7 @@ public class MojoExecutor MavenProject project = session.getCurrentProject(); - forkedProjects = new ArrayList<MavenProject>( forkedExecutions.size() ); + forkedProjects = new ArrayList<>( forkedExecutions.size() ); try { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java index 6c8fd50..427f449 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java @@ -59,7 +59,7 @@ public class ProjectBuildList */ public ProjectBuildList getByTaskSegment( TaskSegment taskSegment ) { - List<ProjectSegment> currentSegment = new ArrayList<ProjectSegment>(); + List<ProjectSegment> currentSegment = new ArrayList<>(); for ( ProjectSegment projectBuild : items ) { if ( taskSegment == projectBuild.getTaskSegment() ) @@ -72,7 +72,7 @@ public class ProjectBuildList public Map<MavenProject, ProjectSegment> selectSegment( TaskSegment taskSegment ) { - Map<MavenProject, ProjectSegment> result = new HashMap<MavenProject, ProjectSegment>(); + Map<MavenProject, ProjectSegment> result = new HashMap<>(); for ( ProjectSegment projectBuild : items ) { if ( taskSegment == projectBuild.getTaskSegment() ) @@ -126,7 +126,7 @@ public class ProjectBuildList public Set<String> getReactorProjectKeys() { - Set<String> projectKeys = new HashSet<String>( items.size() * 2 ); + Set<String> projectKeys = new HashSet<>( items.size() * 2 ); for ( ProjectSegment projectBuild : items ) { MavenProject project = projectBuild.getProject(); @@ -147,7 +147,7 @@ public class ProjectBuildList */ public Set<MavenProject> getProjects() { - Set<MavenProject> projects = new HashSet<MavenProject>(); + Set<MavenProject> projects = new HashSet<>(); for ( ProjectSegment s : items ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java index b1b1d18..13539b4 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java @@ -45,8 +45,8 @@ public final class ProjectIndex public ProjectIndex( List<MavenProject> projects ) { - this.projects = new HashMap<String, MavenProject>( projects.size() * 2 ); - this.indices = new HashMap<String, Integer>( projects.size() * 2 ); + this.projects = new HashMap<>( projects.size() * 2 ); + this.indices = new HashMap<>( projects.size() * 2 ); for ( int i = 0; i < projects.size(); i++ ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java index 9551887..14671ff 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java @@ -44,13 +44,13 @@ public final class TaskSegment public TaskSegment( boolean aggregating ) { this.aggregating = aggregating; - tasks = new ArrayList<Object>(); + tasks = new ArrayList<>(); } public TaskSegment( boolean aggregating, Object... tasks ) { this.aggregating = aggregating; - this.tasks = new ArrayList<Object>( Arrays.asList( tasks ) ); + this.tasks = new ArrayList<>( Arrays.asList( tasks ) ); } @Override http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java index de6a5a3..4613165 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java @@ -44,7 +44,7 @@ public class ConcurrencyDependencyGraph private final ProjectDependencyGraph projectDependencyGraph; - private final HashSet<MavenProject> finishedProjects = new HashSet<MavenProject>(); + private final HashSet<MavenProject> finishedProjects = new HashSet<>(); public ConcurrencyDependencyGraph( ProjectBuildList projectBuilds, ProjectDependencyGraph projectDependencyGraph ) { @@ -65,7 +65,7 @@ public class ConcurrencyDependencyGraph public List<MavenProject> getRootSchedulableBuilds() { - List<MavenProject> result = new ArrayList<MavenProject>(); + List<MavenProject> result = new ArrayList<>(); for ( ProjectSegment projectBuild : projectBuilds ) { if ( projectDependencyGraph.getUpstreamProjects( projectBuild.getProject(), false ).size() == 0 ) @@ -90,7 +90,7 @@ public class ConcurrencyDependencyGraph private List<MavenProject> getSchedulableNewProcesses( MavenProject finishedProject ) { - List<MavenProject> result = new ArrayList<MavenProject>(); + List<MavenProject> result = new ArrayList<>(); // schedule dependent projects, if all of their requirements are met for ( MavenProject dependentProject : projectDependencyGraph.getDownstreamProjects( finishedProject, false ) ) { @@ -109,7 +109,7 @@ public class ConcurrencyDependencyGraph */ public Set<MavenProject> getUnfinishedProjects() { - Set<MavenProject> unfinished = new HashSet<MavenProject>( projectBuilds.getProjects() ); + Set<MavenProject> unfinished = new HashSet<>( projectBuilds.getProjects() ); unfinished.remove( finishedProjects ); return unfinished; } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java index 906e5e7..b3e35e0 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java @@ -76,7 +76,7 @@ public class MultiThreadedBuilder ExecutorService executor = Executors.newFixedThreadPool( Math.min( session.getRequest().getDegreeOfConcurrency(), session.getProjects().size() ), new BuildThreadFactory() ); - CompletionService<ProjectSegment> service = new ExecutorCompletionService<ProjectSegment>( executor ); + CompletionService<ProjectSegment> service = new ExecutorCompletionService<>( executor ); ConcurrencyDependencyGraph analyzer = new ConcurrencyDependencyGraph( projectBuilds, session.getProjectDependencyGraph() ); @@ -165,11 +165,7 @@ public class MultiThreadedBuilder { unprocessed.get(); } - catch ( InterruptedException e ) - { - throw new RuntimeException( e ); - } - catch ( ExecutionException e ) + catch ( InterruptedException | ExecutionException e ) { throw new RuntimeException( e ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java index 8f1f493..51244be 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java @@ -45,12 +45,12 @@ public class ThreadOutputMuxer { private final Iterator<ProjectSegment> projects; - private final ThreadLocal<ProjectSegment> projectBuildThreadLocal = new ThreadLocal<ProjectSegment>(); + private final ThreadLocal<ProjectSegment> projectBuildThreadLocal = new ThreadLocal<>(); private final Map<ProjectSegment, ByteArrayOutputStream> streams = - new HashMap<ProjectSegment, ByteArrayOutputStream>(); + new HashMap<>(); - private final Map<ProjectSegment, PrintStream> printStreams = new HashMap<ProjectSegment, PrintStream>(); + private final Map<ProjectSegment, PrintStream> printStreams = new HashMap<>(); private final ByteArrayOutputStream defaultOutputStreamForUnknownData = new ByteArrayOutputStream(); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java index d3e11fd..3deca00 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java @@ -41,7 +41,7 @@ public class DefaultLifecycleMapping { if ( lifecycleMap == null ) { - lifecycleMap = new HashMap<String, Lifecycle>(); + lifecycleMap = new HashMap<>(); if ( lifecycles != null ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java index 1702aa1..1401e30 100644 --- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java +++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java @@ -107,7 +107,7 @@ public class DefaultLifecycleBindingsInjector { List<Plugin> tgt = target.getPlugins(); - Map<Object, Plugin> merged = new LinkedHashMap<Object, Plugin>( ( src.size() + tgt.size() ) * 2 ); + Map<Object, Plugin> merged = new LinkedHashMap<>( ( src.size() + tgt.size() ) * 2 ); for ( Plugin element : tgt ) { @@ -115,7 +115,7 @@ public class DefaultLifecycleBindingsInjector merged.put( key, element ); } - Map<Object, Plugin> unmanaged = new LinkedHashMap<Object, Plugin>(); + Map<Object, Plugin> unmanaged = new LinkedHashMap<>(); for ( Plugin element : src ) { @@ -151,7 +151,7 @@ public class DefaultLifecycleBindingsInjector } } - List<Plugin> result = new ArrayList<Plugin>( merged.values() ); + List<Plugin> result = new ArrayList<>( merged.values() ); target.setPlugins( result ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java index c9df92c..96800e1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java @@ -57,10 +57,10 @@ public class DefaultExtensionRealmCache public CacheKey( List<Artifact> extensionArtifacts ) { - this.files = new ArrayList<File>( extensionArtifacts.size() ); - this.timestamps = new ArrayList<Long>( extensionArtifacts.size() ); - this.sizes = new ArrayList<Long>( extensionArtifacts.size() ); - this.ids = new ArrayList<String>( extensionArtifacts.size() ); + this.files = new ArrayList<>( extensionArtifacts.size() ); + this.timestamps = new ArrayList<>( extensionArtifacts.size() ); + this.sizes = new ArrayList<>( extensionArtifacts.size() ); + this.ids = new ArrayList<>( extensionArtifacts.size() ); for ( Artifact artifact : extensionArtifacts ) { @@ -107,7 +107,7 @@ public class DefaultExtensionRealmCache } } - protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<Key, CacheRecord>(); + protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<>(); @Override public Key createKey( List<Artifact> extensionArtifacts ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java index 23bda64..3417061 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java @@ -66,7 +66,7 @@ public class DefaultPluginArtifactsCache this.plugin = plugin.clone(); workspace = CacheUtils.getWorkspace( session ); this.localRepo = session.getLocalRepository(); - this.repositories = new ArrayList<RemoteRepository>( repositories.size() ); + this.repositories = new ArrayList<>( repositories.size() ); for ( RemoteRepository repository : repositories ) { if ( repository.isRepositoryManager() ) @@ -133,7 +133,7 @@ public class DefaultPluginArtifactsCache } - protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<Key, CacheRecord>(); + protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<>(); public Key createKey( Plugin plugin, DependencyFilter extensionFilter, List<RemoteRepository> repositories, RepositorySystemSession session ) @@ -164,7 +164,7 @@ public class DefaultPluginArtifactsCache assertUniqueKey( key ); CacheRecord record = - new CacheRecord( Collections.unmodifiableList( new ArrayList<Artifact>( pluginArtifacts ) ) ); + new CacheRecord( Collections.unmodifiableList( new ArrayList<>( pluginArtifacts ) ) ); cache.put( key, record ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java index 4927726..5968332 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java @@ -50,7 +50,7 @@ public class DefaultPluginDescriptorCache implements PluginDescriptorCache { - private Map<Key, PluginDescriptor> descriptors = new HashMap<Key, PluginDescriptor>( 128 ); + private Map<Key, PluginDescriptor> descriptors = new HashMap<>( 128 ); public void flush() { @@ -109,7 +109,7 @@ public class DefaultPluginDescriptorCache if ( mojos != null ) { - clones = new ArrayList<ComponentDescriptor<?>>( mojos.size() ); + clones = new ArrayList<>( mojos.size() ); for ( MojoDescriptor mojo : mojos ) { @@ -148,7 +148,7 @@ public class DefaultPluginDescriptorCache workspace = CacheUtils.getWorkspace( session ); localRepo = session.getLocalRepository(); - this.repositories = new ArrayList<RemoteRepository>( repositories.size() ); + this.repositories = new ArrayList<>( repositories.size() ); for ( RemoteRepository repository : repositories ) { if ( repository.isRepositoryManager() ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java index 6c8288e..56a34c1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java @@ -73,7 +73,7 @@ public class DefaultPluginRealmCache this.plugin = plugin.clone(); this.workspace = CacheUtils.getWorkspace( session ); this.localRepo = session.getLocalRepository(); - this.repositories = new ArrayList<RemoteRepository>( repositories.size() ); + this.repositories = new ArrayList<>( repositories.size() ); for ( RemoteRepository repository : repositories ) { if ( repository.isRepositoryManager() ) @@ -146,7 +146,7 @@ public class DefaultPluginRealmCache } - protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<Key, CacheRecord>(); + protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<>(); public Key createKey( Plugin plugin, ClassLoader parentRealm, Map<String, ClassLoader> foreignImports, DependencyFilter dependencyFilter, List<RemoteRepository> repositories, http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java index 2eb2738..14cc7e1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java @@ -29,7 +29,7 @@ public class MavenPluginValidator { private final Artifact pluginArtifact; - private List<String> errors = new ArrayList<String>(); + private List<String> errors = new ArrayList<>(); private boolean firstDescriptor = true;
