From 8c8dce6ba83676debaba3ec1c657508fabfda0ff Mon Sep 17 00:00:00 2001 From: Matteo Baccan Date: Mon, 8 Aug 2022 11:50:57 +0200 Subject: [PATCH] Cleanup diamond <> operator --- .../org/codehaus/mojo/flatten/Dependencies.java | 4 ++-- .../codehaus/mojo/flatten/FlattenDescriptor.java | 2 +- .../org/codehaus/mojo/flatten/FlattenMojo.java | 8 ++++---- .../flatten/cifriendly/CiInterpolatorImpl.java | 6 +++--- .../flatten/cifriendly/CiModelInterpolator.java | 14 +++++++------- .../flatten/model/resolution/ReactorModelPool.java | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/codehaus/mojo/flatten/Dependencies.java b/src/main/java/org/codehaus/mojo/flatten/Dependencies.java index 2377816a..314fcdac 100644 --- a/src/main/java/org/codehaus/mojo/flatten/Dependencies.java +++ b/src/main/java/org/codehaus/mojo/flatten/Dependencies.java @@ -46,7 +46,7 @@ public Dependencies() { super(); - this.key2DependencyMap = new HashMap(); + this.key2DependencyMap = new HashMap<>(); } /** @@ -117,7 +117,7 @@ public Dependency resolve( Dependency dependency ) public List toList() { - List result = new ArrayList( this.key2DependencyMap.values() ); + List result = new ArrayList<>( this.key2DependencyMap.values() ); return result; } diff --git a/src/main/java/org/codehaus/mojo/flatten/FlattenDescriptor.java b/src/main/java/org/codehaus/mojo/flatten/FlattenDescriptor.java index faa8326e..128186a9 100644 --- a/src/main/java/org/codehaus/mojo/flatten/FlattenDescriptor.java +++ b/src/main/java/org/codehaus/mojo/flatten/FlattenDescriptor.java @@ -43,7 +43,7 @@ public class FlattenDescriptor public FlattenDescriptor() { super(); - this.name2handlingMap = new HashMap(); + this.name2handlingMap = new HashMap<>(); } /** diff --git a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java index dd23790c..8fbae51e 100644 --- a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java +++ b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java @@ -765,7 +765,7 @@ protected static List createFlattenedRepositories( List { if ( repositories != null ) { - List flattenedRepositories = new ArrayList( repositories.size() ); + List flattenedRepositories = new ArrayList<>( repositories.size() ); for ( Repository repo : repositories ) { // filter inherited repository section from super POM (see MOJO-2042)... @@ -906,7 +906,7 @@ public void injectProfile( Model model, Profile profile, ModelBuildingRequest re public List getActiveProfiles( Collection profiles, ProfileActivationContext context, ModelProblemCollector problems ) { - List activeProfiles = new ArrayList( profiles.size() ); + List activeProfiles = new ArrayList<>( profiles.size() ); for ( Profile profile : profiles ) { @@ -996,7 +996,7 @@ protected static boolean isBuildTimeDriven( Activation activation ) */ protected List createFlattenedDependencies( Model effectiveModel ) throws MojoExecutionException { - List flattenedDependencies = new ArrayList(); + List flattenedDependencies = new ArrayList<>(); // resolve all direct and inherited dependencies... try { createFlattenedDependencies( effectiveModel, flattenedDependencies ); @@ -1078,7 +1078,7 @@ private void createFlattenedDependenciesDirect( List projectDependen private void createFlattenedDependenciesAll( List projectDependencies, List flattenedDependencies ) throws DependencyTreeBuilderException, ArtifactDescriptorException { - final Queue dependencyNodeLinkedList = new LinkedList(); + final Queue dependencyNodeLinkedList = new LinkedList<>(); final Set processedDependencies = new HashSet<>(); final Artifact projectArtifact = this.project.getArtifact(); diff --git a/src/main/java/org/codehaus/mojo/flatten/cifriendly/CiInterpolatorImpl.java b/src/main/java/org/codehaus/mojo/flatten/cifriendly/CiInterpolatorImpl.java index bc71df3b..37749f3e 100644 --- a/src/main/java/org/codehaus/mojo/flatten/cifriendly/CiInterpolatorImpl.java +++ b/src/main/java/org/codehaus/mojo/flatten/cifriendly/CiInterpolatorImpl.java @@ -43,9 +43,9 @@ public class CiInterpolatorImpl implements Interpolator { private Map existingAnswers = new HashMap(); - private List valueSources = new ArrayList(); + private List valueSources = new ArrayList<>(); - private List postProcessors = new ArrayList(); + private List postProcessors = new ArrayList<>(); private boolean cacheAnswers = false; @@ -131,7 +131,7 @@ public String interpolate( String input, RecursionInterceptor recursionIntercept { try { - return interpolate( input, recursionInterceptor, new HashSet() ); + return interpolate( input, recursionInterceptor, new HashSet<>() ); } finally { diff --git a/src/main/java/org/codehaus/mojo/flatten/cifriendly/CiModelInterpolator.java b/src/main/java/org/codehaus/mojo/flatten/cifriendly/CiModelInterpolator.java index 514b29a8..11be3f13 100644 --- a/src/main/java/org/codehaus/mojo/flatten/cifriendly/CiModelInterpolator.java +++ b/src/main/java/org/codehaus/mojo/flatten/cifriendly/CiModelInterpolator.java @@ -79,7 +79,7 @@ public CiModelInterpolator() private static final Collection TRANSLATED_PATH_EXPRESSIONS; static { - Collection translatedPrefixes = new HashSet(); + Collection translatedPrefixes = new HashSet<>(); // MNG-1927, MNG-2124, MNG-3355: // If the build section is present and the project directory is @@ -107,7 +107,7 @@ public CiModelInterpolator() @Requirement private UrlNormalizer urlNormalizer; - private static final Map, InterpolateObjectAction.CacheItem> CACHED_ENTRIES = new ConcurrentHashMap, InterpolateObjectAction.CacheItem>( + private static final Map, InterpolateObjectAction.CacheItem> CACHED_ENTRIES = new ConcurrentHashMap<>( 80, 0.75f, 2); // Empirical data from 3.x, actual =40 @@ -198,7 +198,7 @@ public InterpolateObjectAction(Object target, List valueS this.valueSources = valueSources; this.postProcessors = postProcessors; - this.interpolationTargets = new LinkedList(); + this.interpolationTargets = new LinkedList<>(); interpolationTargets.add(target); this.modelInterpolator = modelInterpolator; @@ -289,7 +289,7 @@ private boolean isQualifiedForInterpolation(Field field, Class fieldType) { CacheItem(Class clazz) { this.isQualifiedForInterpolation = isQualifiedForInterpolation(clazz); this.isArray = clazz.isArray(); - List fields = new ArrayList(); + List fields = new ArrayList<>(); for (Field currentField : clazz.getDeclaredFields()) { Class type = currentField.getType(); if (isQualifiedForInterpolation(currentField, type)) { @@ -499,7 +499,7 @@ protected List createValueSources(final Model model, final File pro } // NOTE: Order counts here! - List valueSources = new ArrayList(9); + List valueSources = new ArrayList<>(9); if (projectDir != null) { ValueSource basedirValueSource = new PrefixedValueSourceWrapper(new AbstractValueSource(false) { @@ -545,7 +545,7 @@ public Object getValue(String expression) { protected List createPostProcessors(final Model model, final File projectDir, final ModelBuildingRequest config) { - List processors = new ArrayList(2); + List processors = new ArrayList<>(2); if (projectDir != null) { processors.add(new PathTranslatingPostProcessor(PROJECT_PREFIXES, TRANSLATED_PATH_EXPRESSIONS, projectDir, pathTranslator)); @@ -664,7 +664,7 @@ public UrlNormalizingPostProcessor(UrlNormalizer normalizer) { } public Object execute(String expression, Object value) { - Set expressions = new HashSet(); + Set expressions = new HashSet<>(); expressions.add("project.url"); expressions.add("project.scm.url"); expressions.add("project.scm.connection"); diff --git a/src/main/java/org/codehaus/mojo/flatten/model/resolution/ReactorModelPool.java b/src/main/java/org/codehaus/mojo/flatten/model/resolution/ReactorModelPool.java index dfc79b65..0d299a93 100644 --- a/src/main/java/org/codehaus/mojo/flatten/model/resolution/ReactorModelPool.java +++ b/src/main/java/org/codehaus/mojo/flatten/model/resolution/ReactorModelPool.java @@ -35,7 +35,7 @@ class ReactorModelPool { - private Map models = new HashMap(); + private Map models = new HashMap<>(); public File find( String groupId, String artifactId, String version ) {