Upgraded to java7 language features
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7badeb5b Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7badeb5b Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7badeb5b Branch: refs/heads/master Commit: 7badeb5b5bdfb48dd3c9533d224418d0648b76ce Parents: 40d5087 Author: Kristian Rosenvold <krosenv...@apache.org> Authored: Fri Mar 6 07:12:21 2015 +0100 Committer: Kristian Rosenvold <krosenv...@apache.org> Committed: Sat Jun 20 10:56:07 2015 +0200 ---------------------------------------------------------------------- .../maven/settings/GlobalSettingsTest.java | 7 +- .../ArtifactDescriptorReaderDelegate.java | 6 +- .../DefaultArtifactDescriptorReader.java | 2 +- .../internal/DefaultModelResolver.java | 8 +- .../internal/DefaultVersionRangeResolver.java | 34 +++---- .../internal/DefaultVersionResolver.java | 69 +++++++------- .../internal/LocalSnapshotMetadata.java | 6 +- .../LocalSnapshotMetadataGenerator.java | 2 +- .../repository/internal/MavenAetherModule.java | 2 +- .../internal/MavenSnapshotMetadata.java | 2 +- .../internal/RemoteSnapshotMetadata.java | 4 +- .../RemoteSnapshotMetadataGenerator.java | 2 +- .../repository/internal/VersionsMetadata.java | 4 +- .../internal/VersionsMetadataGenerator.java | 4 +- .../internal/util/ConsoleTransferListener.java | 2 +- .../apache/maven/artifact/ArtifactUtils.java | 4 +- .../apache/maven/artifact/DefaultArtifact.java | 2 +- .../artifact/versioning/ComparableVersion.java | 5 +- .../maven/artifact/versioning/VersionRange.java | 6 +- .../apache/maven/artifact/ArtifactStatus.java | 2 +- .../deployer/DefaultArtifactDeployer.java | 2 +- .../DefaultRepositoryMetadataManager.java | 9 +- .../artifact/resolver/ArtifactResolver.java | 6 +- .../resolver/DebugResolutionListener.java | 2 +- .../resolver/DefaultArtifactResolver.java | 18 ++-- .../resolver/filter/OrArtifactFilter.java | 4 +- .../maven/profiles/DefaultProfileManager.java | 16 ++-- .../apache/maven/profiles/ProfileManager.java | 4 +- .../project/DefaultMavenProjectBuilder.java | 2 +- .../org/apache/maven/project/ModelUtils.java | 22 ++--- .../org/apache/maven/project/ProjectUtils.java | 2 +- .../DefaultModelInheritanceAssembler.java | 58 ++++++------ .../AbstractStringBasedModelInterpolator.java | 11 +-- .../StringSearchModelInterpolator.java | 15 ++-- .../project/path/DefaultPathTranslator.java | 4 +- .../validation/ModelValidationResult.java | 2 +- .../apache/maven/repository/MetadataGraph.java | 2 +- .../maven/repository/MetadataGraphNode.java | 4 +- .../repository/MetadataResolutionResult.java | 6 +- .../repository/legacy/DefaultWagonManager.java | 6 +- .../legacy/LegacyRepositorySystem.java | 16 ++-- .../legacy/TransferListenerAdapter.java | 4 +- .../DefaultLegacyArtifactCollector.java | 14 +-- .../resolver/LegacyArtifactCollector.java | 6 +- .../repository/metadata/ClasspathContainer.java | 2 +- .../DefaultClasspathTransformation.java | 2 +- .../metadata/DefaultGraphConflictResolver.java | 4 +- .../repository/metadata/MetadataGraph.java | 12 +-- .../usability/plugin/ExpressionDocumenter.java | 10 +-- .../AbstractArtifactComponentTestCase.java | 2 +- .../maven/artifact/ArtifactUtilsTest.java | 4 +- .../artifact/metadata/TestMetadataSource.java | 2 +- .../ArtifactResolutionExceptionTest.java | 2 +- .../artifact/resolver/ArtifactResolverTest.java | 9 +- .../artifact/resolver/TestTransferListener.java | 2 +- .../artifact/testutils/TestFileManager.java | 2 +- .../project/ClasspathArtifactResolver.java | 2 +- .../maven/project/EmptyLifecycleExecutor.java | 2 +- .../project/EmptyLifecyclePluginAnalyzer.java | 2 +- .../apache/maven/project/ModelUtilsTest.java | 1 - .../maven/project/ProjectClasspathTest.java | 1 - .../inheritance/t00/ProjectInheritanceTest.java | 1 - .../inheritance/t02/ProjectInheritanceTest.java | 6 +- .../inheritance/t04/ProjectInheritanceTest.java | 1 - .../inheritance/t05/ProjectInheritanceTest.java | 1 - .../inheritance/t07/ProjectInheritanceTest.java | 1 - .../legacy/DefaultWagonManagerTest.java | 4 +- .../maven/repository/legacy/StringWagon.java | 2 +- .../resolver/DefaultArtifactCollectorTest.java | 59 ++++++------ .../conflict/AbstractConflictResolverTest.java | 26 +++--- .../conflict/FarthestConflictResolverTest.java | 23 +++-- .../conflict/NearestConflictResolverTest.java | 23 +++-- .../conflict/NewestConflictResolverTest.java | 23 +++-- .../conflict/OldestConflictResolverTest.java | 24 +++-- .../repository/metadata/TestMetadataSource.java | 10 +-- .../maven/DefaultArtifactFilterManager.java | 6 +- .../java/org/apache/maven/DefaultMaven.java | 12 +-- .../DefaultProjectDependenciesResolver.java | 8 +- .../java/org/apache/maven/ReactorReader.java | 8 +- .../java/org/apache/maven/RepositoryUtils.java | 12 +-- .../manager/DefaultArtifactHandlerManager.java | 2 +- .../repository/DefaultRepositoryRequest.java | 2 +- .../metadata/AbstractRepositoryMetadata.java | 6 +- .../resolver/ArtifactResolutionRequest.java | 8 +- .../resolver/ArtifactResolutionResult.java | 8 +- .../resolver/DefaultResolutionErrorHandler.java | 2 +- .../maven/artifact/resolver/ResolutionNode.java | 8 +- .../resolver/filter/AndArtifactFilter.java | 6 +- .../filter/CumulativeScopeArtifactFilter.java | 4 +- .../resolver/filter/ExclusionSetFilter.java | 2 +- .../resolver/filter/IncludesArtifactFilter.java | 4 +- .../maven/bridge/MavenRepositorySystem.java | 4 +- .../classrealm/DefaultClassRealmManager.java | 16 ++-- .../eventspy/internal/EventSpyDispatcher.java | 20 +---- .../exception/DefaultExceptionHandler.java | 4 +- .../execution/DefaultMavenExecutionRequest.java | 50 +++++------ .../DefaultMavenExecutionRequestPopulator.java | 2 +- .../execution/DefaultMavenExecutionResult.java | 2 +- .../apache/maven/execution/MavenSession.java | 6 +- .../apache/maven/execution/ReactorManager.java | 31 +++---- .../apache/maven/execution/SettingsAdapter.java | 2 +- .../scope/internal/MojoExecutionScope.java | 6 +- .../maven/extension/internal/CoreExports.java | 2 +- .../extension/internal/CoreExtensionEntry.java | 8 +- .../apache/maven/graph/DefaultGraphBuilder.java | 16 ++-- .../graph/DefaultProjectDependencyGraph.java | 8 +- .../graph/FilteredProjectDependencyGraph.java | 4 +- .../DefaultRepositorySystemSessionFactory.java | 2 +- .../maven/lifecycle/DefaultLifecycles.java | 12 +-- .../maven/lifecycle/MavenExecutionPlan.java | 16 ++-- .../lifecycle/internal/BuildListCalculator.java | 2 +- ...DefaultLifecycleExecutionPlanCalculator.java | 10 +-- .../DefaultLifecycleMappingDelegate.java | 10 +-- .../DefaultLifecyclePluginAnalyzer.java | 6 +- .../DefaultLifecycleTaskSegmentCalculator.java | 2 +- .../lifecycle/internal/ExecutionPlanItem.java | 2 +- .../internal/LifecycleDebugLogger.java | 4 +- .../internal/LifecycleDependencyResolver.java | 14 +-- .../internal/LifecyclePluginResolver.java | 2 +- .../internal/MojoDescriptorCreator.java | 3 +- .../maven/lifecycle/internal/MojoExecutor.java | 56 +++++------- .../lifecycle/internal/ProjectBuildList.java | 8 +- .../maven/lifecycle/internal/ProjectIndex.java | 4 +- .../maven/lifecycle/internal/TaskSegment.java | 4 +- .../ConcurrencyDependencyGraph.java | 8 +- .../multithreaded/MultiThreadedBuilder.java | 8 +- .../multithreaded/ThreadOutputMuxer.java | 6 +- .../mapping/DefaultLifecycleMapping.java | 2 +- .../DefaultLifecycleBindingsInjector.java | 6 +- .../plugin/DefaultExtensionRealmCache.java | 10 +-- .../plugin/DefaultPluginArtifactsCache.java | 6 +- .../plugin/DefaultPluginDescriptorCache.java | 6 +- .../maven/plugin/DefaultPluginRealmCache.java | 4 +- .../maven/plugin/MavenPluginValidator.java | 2 +- .../org/apache/maven/plugin/MojoExecution.java | 2 +- .../plugin/internal/DefaultLegacySupport.java | 4 +- .../DefaultPluginDependenciesResolver.java | 2 +- .../plugin/internal/DefaultPluginManager.java | 6 +- .../PluginDependencyResolutionListener.java | 4 +- .../ValidatingConfigurationListener.java | 2 +- .../internal/DefaultPluginPrefixResolver.java | 2 +- .../internal/DefaultPluginVersionResolver.java | 8 +- .../DefaultDependencyResolutionResult.java | 12 +-- .../project/DefaultModelBuildingListener.java | 14 +-- .../maven/project/DefaultProjectBuilder.java | 26 +++--- .../project/DefaultProjectBuildingHelper.java | 20 ++--- .../project/DefaultProjectBuildingRequest.java | 20 ++--- .../project/DefaultProjectBuildingResult.java | 2 +- .../DefaultProjectDependenciesResolver.java | 4 +- .../maven/project/DefaultProjectRealmCache.java | 2 +- .../maven/project/ExtensionDescriptor.java | 8 +- .../project/ExtensionDescriptorBuilder.java | 23 ++--- .../org/apache/maven/project/MavenProject.java | 62 ++++++------- .../maven/project/ProjectModelResolver.java | 14 +-- .../org/apache/maven/project/ProjectSorter.java | 8 +- .../apache/maven/project/ReactorModelCache.java | 2 +- .../apache/maven/project/ReactorModelPool.java | 2 +- .../artifact/DefaultMavenMetadataCache.java | 6 +- .../project/artifact/MavenMetadataSource.java | 18 ++-- .../DelegatingLocalArtifactRepository.java | 4 +- .../session/scope/internal/SessionScope.java | 4 +- .../maven/toolchain/DefaultToolchain.java | 2 +- .../toolchain/DefaultToolchainManager.java | 2 +- .../DefaultToolchainManagerPrivate.java | 2 +- .../building/ToolchainsBuildingException.java | 2 +- .../toolchain/merge/MavenToolchainMerger.java | 2 +- .../maven/MavenLifecycleParticipantTest.java | 8 +- .../DefaultBeanConfiguratorTest.java | 6 +- .../DelegatingMojoExecutionListener.java | 2 +- .../DelegatingProjectExecutionListener.java | 2 +- .../lifecycle/EmptyLifecyclePluginAnalyzer.java | 2 +- .../maven/lifecycle/LifecycleExecutorTest.java | 6 +- .../maven/lifecycle/MavenExecutionPlanTest.java | 3 - .../multithreaded/ThreadOutputMuxerTest.java | 4 +- .../internal/stub/CompletionServiceStub.java | 4 +- .../internal/stub/DefaultLifecyclesStub.java | 2 +- .../stub/LifeCyclePluginAnalyzerStub.java | 2 +- .../LifecycleExecutionPlanCalculatorStub.java | 8 +- .../LifecycleTaskSegmentCalculatorStub.java | 2 +- .../stub/ProjectDependenciesResolverStub.java | 8 +- .../stub/ProjectDependencyGraphStub.java | 8 +- .../PluginParameterExpressionEvaluatorTest.java | 4 +- .../project/DefaultMavenProjectBuilderTest.java | 3 +- .../maven/project/EmptyLifecycleExecutor.java | 2 +- .../project/EmptyProjectBuildingHelper.java | 2 +- .../apache/maven/project/MavenProjectTest.java | 2 - .../maven/project/PomConstructionTest.java | 8 +- .../apache/maven/project/ProjectSorterTest.java | 18 ++-- .../harness/Xpp3DomAttributeIterator.java | 4 +- .../project/harness/Xpp3DomNodeIterator.java | 2 +- .../project/harness/Xpp3DomNodePointer.java | 2 +- .../maven/repository/TestRepositorySystem.java | 4 +- .../maven/settings/SettingsUtilsTest.java | 4 +- .../DefaultToolchainManagerPrivateTest.java | 8 +- .../toolchain/DefaultToolchainManagerTest.java | 10 +-- .../java/org/apache/maven/cli/CLIManager.java | 2 +- .../java/org/apache/maven/cli/MavenCli.java | 26 +++--- .../maven/cli/event/DefaultEventSpyContext.java | 2 +- .../internal/BootstrapCoreExtensionManager.java | 2 +- .../cli/logging/Slf4jConfigurationFactory.java | 16 +--- .../transfer/ConsoleMavenTransferListener.java | 2 +- .../org/apache/maven/cli/CLIManagerTest.java | 2 +- .../model/building/DefaultModelBuilder.java | 19 ++-- .../building/DefaultModelBuildingRequest.java | 12 +-- .../building/DefaultModelBuildingResult.java | 16 ++-- .../org/apache/maven/model/building/Result.java | 10 +-- .../DefaultDependencyManagementImporter.java | 4 +- .../DefaultInheritanceAssembler.java | 16 ++-- .../AbstractStringBasedModelInterpolator.java | 6 +- .../StringSearchModelInterpolator.java | 6 +- .../UrlNormalizingPostProcessor.java | 2 +- .../DefaultDependencyManagementInjector.java | 2 +- .../DefaultPluginManagementInjector.java | 6 +- .../maven/model/merge/MavenModelMerger.java | 42 ++++----- .../normalization/DefaultModelNormalizer.java | 8 +- .../model/path/DefaultModelPathTranslator.java | 2 +- .../DefaultProfileActivationContext.java | 2 +- .../model/profile/DefaultProfileInjector.java | 22 ++--- .../model/profile/DefaultProfileSelector.java | 10 +-- .../activation/JdkVersionProfileActivator.java | 6 +- .../model/superpom/DefaultSuperPomProvider.java | 2 +- .../model/validation/DefaultModelValidator.java | 12 +-- .../model/building/SimpleProblemCollector.java | 6 +- .../StringSearchModelInterpolatorTest.java | 22 ++--- .../apache/maven/model/merge/ModelMerger.java | 94 ++++++++++---------- .../maven/plugin/descriptor/MojoDescriptor.java | 4 +- .../plugin/descriptor/PluginDescriptor.java | 2 +- .../descriptor/PluginDescriptorBuilder.java | 10 +-- .../building/SettingsBuildingException.java | 2 +- .../crypto/DefaultSettingsDecrypter.java | 6 +- .../DefaultSettingsDecryptionRequest.java | 8 +- .../settings/merge/MavenSettingsMerger.java | 6 +- .../validation/DefaultSettingsValidator.java | 6 +- .../DefaultSettingsValidatorTest.java | 2 +- pom.xml | 4 +- 235 files changed, 941 insertions(+), 1086 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java ---------------------------------------------------------------------- diff --git a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java index b728be3..5176ef0 100644 --- a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java +++ b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java @@ -45,15 +45,10 @@ public class GlobalSettingsTest File globalSettingsFile = new File( basedir, "src/conf/settings.xml" ); assertTrue( globalSettingsFile.getAbsolutePath(), globalSettingsFile.isFile() ); - Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), "UTF-8" ); - try + try (Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), "UTF-8" )) { new SettingsXpp3Reader().read( reader ); } - finally - { - reader.close(); - } } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java index 29749ad..2395b36 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java @@ -74,7 +74,7 @@ public class ArtifactDescriptorReaderDelegate } } - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); Prerequisites prerequisites = model.getPrerequisites(); if ( prerequisites != null ) @@ -118,7 +118,7 @@ public class ArtifactDescriptorReaderDelegate new DefaultArtifact( dependency.getGroupId(), dependency.getArtifactId(), dependency.getClassifier(), null, dependency.getVersion(), props, stereotype ); - List<Exclusion> exclusions = new ArrayList<Exclusion>( dependency.getExclusions().size() ); + List<Exclusion> exclusions = new ArrayList<>( dependency.getExclusions().size() ); for ( org.apache.maven.model.Exclusion exclusion : dependency.getExclusions() ) { exclusions.add( convert( exclusion ) ); @@ -145,7 +145,7 @@ public class ArtifactDescriptorReaderDelegate if ( downloadUrl != null && downloadUrl.length() > 0 ) { Artifact artifact = result.getArtifact(); - Map<String, String> props = new HashMap<String, String>( artifact.getProperties() ); + Map<String, String> props = new HashMap<>( artifact.getProperties() ); props.put( ArtifactProperties.DOWNLOAD_URL, downloadUrl ); result.setArtifact( artifact.setProperties( props ) ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java index a768de5..f7328a1 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java @@ -239,7 +239,7 @@ public class DefaultArtifactDescriptorReader { RequestTrace trace = RequestTrace.newChild( request.getTrace(), request ); - Set<String> visited = new LinkedHashSet<String>(); + Set<String> visited = new LinkedHashSet<>(); for ( Artifact a = request.getArtifact();; ) { Artifact pomArtifact = ArtifactDescriptorUtils.toPomArtifact( a ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java index 7cd4747..f344959 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java @@ -89,11 +89,11 @@ class DefaultModelResolver this.versionRangeResolver = versionRangeResolver; this.remoteRepositoryManager = remoteRepositoryManager; this.repositories = repositories; - List<RemoteRepository> externalRepositories = new ArrayList<RemoteRepository>(); + List<RemoteRepository> externalRepositories = new ArrayList<>(); externalRepositories.addAll( repositories ); this.externalRepositories = Collections.unmodifiableList( externalRepositories ); - this.repositoryIds = new HashSet<String>(); + this.repositoryIds = new HashSet<>(); } private DefaultModelResolver( DefaultModelResolver original ) @@ -104,9 +104,9 @@ class DefaultModelResolver this.resolver = original.resolver; this.versionRangeResolver = original.versionRangeResolver; this.remoteRepositoryManager = original.remoteRepositoryManager; - this.repositories = new ArrayList<RemoteRepository>( original.repositories ); + this.repositories = new ArrayList<>( original.repositories ); this.externalRepositories = original.externalRepositories; - this.repositoryIds = new HashSet<String>( original.repositoryIds ); + this.repositoryIds = new HashSet<>( original.repositoryIds ); } @Override http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java index e8ba06b..224fd2c 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java @@ -19,23 +19,13 @@ package org.apache.maven.repository.internal; * under the License. */ -import java.io.FileInputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.util.IOUtil; -import org.eclipse.aether.RepositoryEvent.EventType; import org.eclipse.aether.RepositoryEvent; +import org.eclipse.aether.RepositoryEvent.EventType; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.RequestTrace; import org.eclipse.aether.SyncContext; @@ -64,6 +54,15 @@ import org.eclipse.aether.version.Version; import org.eclipse.aether.version.VersionConstraint; import org.eclipse.aether.version.VersionScheme; +import javax.inject.Inject; +import javax.inject.Named; +import java.io.FileInputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @author Benjamin Bentmann */ @@ -181,7 +180,7 @@ public class DefaultVersionRangeResolver { Map<String, ArtifactRepository> versionIndex = getVersions( session, result, request ); - List<Version> versions = new ArrayList<Version>(); + List<Version> versions = new ArrayList<>(); for ( Map.Entry<String, ArtifactRepository> v : versionIndex.entrySet() ) { try @@ -211,13 +210,13 @@ public class DefaultVersionRangeResolver { RequestTrace trace = RequestTrace.newChild( request.getTrace(), request ); - Map<String, ArtifactRepository> versionIndex = new HashMap<String, ArtifactRepository>(); + Map<String, ArtifactRepository> versionIndex = new HashMap<>(); Metadata metadata = new DefaultMetadata( request.getArtifact().getGroupId(), request.getArtifact().getArtifactId(), MAVEN_METADATA_XML, Metadata.Nature.RELEASE_OR_SNAPSHOT ); - List<MetadataRequest> metadataRequests = new ArrayList<MetadataRequest>( request.getRepositories().size() ); + List<MetadataRequest> metadataRequests = new ArrayList<>( request.getRepositories().size() ); metadataRequests.add( new MetadataRequest( metadata, null, request.getRequestContext() ) ); @@ -274,9 +273,8 @@ public class DefaultVersionRangeResolver { if ( metadata != null ) { - SyncContext syncContext = syncContextFactory.newInstance( session, true ); - try + try ( SyncContext syncContext = syncContextFactory.newInstance( session, true ) ) { syncContext.acquire( null, Collections.singleton( metadata ) ); @@ -288,10 +286,6 @@ public class DefaultVersionRangeResolver versioning = m.getVersioning(); } } - finally - { - syncContext.close(); - } } } catch ( Exception e ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java index d722644..4dc1435 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java @@ -19,18 +19,6 @@ package org.apache.maven.repository.internal; * under the License. */ -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.inject.Inject; -import javax.inject.Named; - import org.apache.maven.artifact.repository.metadata.Snapshot; import org.apache.maven.artifact.repository.metadata.SnapshotVersion; import org.apache.maven.artifact.repository.metadata.Versioning; @@ -40,8 +28,8 @@ import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.RepositoryCache; -import org.eclipse.aether.RepositoryEvent.EventType; import org.eclipse.aether.RepositoryEvent; +import org.eclipse.aether.RepositoryEvent.EventType; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.RequestTrace; import org.eclipse.aether.SyncContext; @@ -70,6 +58,17 @@ import org.eclipse.aether.spi.log.LoggerFactory; import org.eclipse.aether.spi.log.NullLoggerFactory; import org.eclipse.aether.util.ConfigUtils; +import javax.inject.Inject; +import javax.inject.Named; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @author Benjamin Bentmann */ @@ -187,8 +186,8 @@ public class DefaultVersionResolver { Record record = (Record) obj; result.setVersion( record.version ); - result.setRepository( CacheUtils.getRepository( session, request.getRepositories(), record.repoClass, - record.repoId ) ); + result.setRepository( + CacheUtils.getRepository( session, request.getRepositories(), record.repoClass, record.repoId ) ); return result; } } @@ -197,15 +196,13 @@ public class DefaultVersionResolver if ( RELEASE.equals( version ) ) { - metadata = - new DefaultMetadata( artifact.getGroupId(), artifact.getArtifactId(), MAVEN_METADATA_XML, - Metadata.Nature.RELEASE ); + metadata = new DefaultMetadata( artifact.getGroupId(), artifact.getArtifactId(), MAVEN_METADATA_XML, + Metadata.Nature.RELEASE ); } else if ( LATEST.equals( version ) ) { - metadata = - new DefaultMetadata( artifact.getGroupId(), artifact.getArtifactId(), MAVEN_METADATA_XML, - Metadata.Nature.RELEASE_OR_SNAPSHOT ); + metadata = new DefaultMetadata( artifact.getGroupId(), artifact.getArtifactId(), MAVEN_METADATA_XML, + Metadata.Nature.RELEASE_OR_SNAPSHOT ); } else if ( version.endsWith( SNAPSHOT ) ) { @@ -233,7 +230,7 @@ public class DefaultVersionResolver } else { - List<MetadataRequest> metadataReqs = new ArrayList<MetadataRequest>( request.getRepositories().size() ); + List<MetadataRequest> metadataReqs = new ArrayList<>( request.getRepositories().size() ); metadataReqs.add( new MetadataRequest( metadata, null, request.getRequestContext() ) ); @@ -249,7 +246,7 @@ public class DefaultVersionResolver List<MetadataResult> metadataResults = metadataResolver.resolveMetadata( session, metadataReqs ); - Map<String, VersionInfo> infos = new HashMap<String, VersionInfo>(); + Map<String, VersionInfo> infos = new HashMap<>(); for ( MetadataResult metadataResult : metadataResults ) { @@ -343,9 +340,8 @@ public class DefaultVersionResolver { if ( metadata != null ) { - SyncContext syncContext = syncContextFactory.newInstance( session, true ); - try + try ( SyncContext syncContext = syncContextFactory.newInstance( session, true ) ) { syncContext.acquire( null, Collections.singleton( metadata ) ); @@ -373,16 +369,12 @@ public class DefaultVersionResolver versioning = repaired; throw new IOException( "Snapshot information corrupted with remote repository data" - + ", please verify that no remote repository uses the id '" + repository.getId() - + "'" ); + + ", please verify that no remote repository uses the id '" + + repository.getId() + "'" ); } } } } - finally - { - syncContext.close(); - } } } catch ( Exception e ) @@ -467,9 +459,8 @@ public class DefaultVersionResolver VersionInfo srcInfo = infos.get( srcKey ); VersionInfo dstInfo = infos.get( dstKey ); - if ( dstInfo == null - || ( srcInfo != null && dstInfo.isOutdated( srcInfo.timestamp ) - && srcInfo.repository != dstInfo.repository ) ) + if ( dstInfo == null || ( srcInfo != null && dstInfo.isOutdated( srcInfo.timestamp ) + && srcInfo.repository != dstInfo.repository ) ) { infos.put( dstKey, srcInfo ); } @@ -554,7 +545,7 @@ public class DefaultVersionResolver version = artifact.getVersion(); localRepo = session.getLocalRepository().getBasedir(); workspace = CacheUtils.getWorkspace( session ); - repositories = new ArrayList<RemoteRepository>( request.getRepositories().size() ); + repositories = new ArrayList<>( request.getRepositories().size() ); boolean repoMan = false; for ( RemoteRepository repository : request.getRepositories() ) { @@ -594,10 +585,10 @@ public class DefaultVersionResolver } Key that = (Key) obj; - return artifactId.equals( that.artifactId ) && groupId.equals( that.groupId ) - && classifier.equals( that.classifier ) && extension.equals( that.extension ) - && version.equals( that.version ) && context.equals( that.context ) - && localRepo.equals( that.localRepo ) && CacheUtils.eq( workspace, that.workspace ) + return artifactId.equals( that.artifactId ) && groupId.equals( that.groupId ) && classifier.equals( + that.classifier ) && extension.equals( that.extension ) && version.equals( that.version ) + && context.equals( that.context ) && localRepo.equals( that.localRepo ) + && CacheUtils.eq( workspace, that.workspace ) && CacheUtils.repositoriesEquals( repositories, that.repositories ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java index a22d07d..a572010 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java @@ -38,7 +38,7 @@ final class LocalSnapshotMetadata extends MavenMetadata { - private final Collection<Artifact> artifacts = new ArrayList<Artifact>(); + private final Collection<Artifact> artifacts = new ArrayList<>(); private final boolean legacyFormat; @@ -104,7 +104,7 @@ final class LocalSnapshotMetadata { String lastUpdated = metadata.getVersioning().getLastUpdated(); - Map<String, SnapshotVersion> versions = new LinkedHashMap<String, SnapshotVersion>(); + Map<String, SnapshotVersion> versions = new LinkedHashMap<>(); for ( Artifact artifact : artifacts ) { @@ -129,7 +129,7 @@ final class LocalSnapshotMetadata } } - metadata.getVersioning().setSnapshotVersions( new ArrayList<SnapshotVersion>( versions.values() ) ); + metadata.getVersioning().setSnapshotVersions( new ArrayList<>( versions.values() ) ); } artifacts.clear(); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java index ee7c10b..072ba66 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java @@ -46,7 +46,7 @@ class LocalSnapshotMetadataGenerator { legacyFormat = ConfigUtils.getBoolean( session.getConfigProperties(), false, "maven.metadata.legacy" ); - snapshots = new LinkedHashMap<Object, LocalSnapshotMetadata>(); + snapshots = new LinkedHashMap<>(); } public Collection<? extends Metadata> prepare( Collection<? extends Artifact> artifacts ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java index fa81f61..1c9acd7 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java @@ -67,7 +67,7 @@ public final class MavenAetherModule @Named( "versions" ) MetadataGeneratorFactory versions ) { - Set<MetadataGeneratorFactory> factories = new HashSet<MetadataGeneratorFactory>(); + Set<MetadataGeneratorFactory> factories = new HashSet<>(); factories.add( snapshot ); factories.add( versions ); return Collections.unmodifiableSet( factories ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java index 1e6f909..e4c9a7e 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java @@ -34,7 +34,7 @@ abstract class MavenSnapshotMetadata { static final String SNAPSHOT = "SNAPSHOT"; - protected final Collection<Artifact> artifacts = new ArrayList<Artifact>(); + protected final Collection<Artifact> artifacts = new ArrayList<>(); protected final boolean legacyFormat; http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java index 4494cae..5c7faba 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java @@ -41,7 +41,7 @@ final class RemoteSnapshotMetadata extends MavenSnapshotMetadata { - private final Map<String, SnapshotVersion> versions = new LinkedHashMap<String, SnapshotVersion>(); + private final Map<String, SnapshotVersion> versions = new LinkedHashMap<>(); public RemoteSnapshotMetadata( Artifact artifact, boolean legacyFormat ) { @@ -128,7 +128,7 @@ final class RemoteSnapshotMetadata if ( !legacyFormat ) { - metadata.getVersioning().setSnapshotVersions( new ArrayList<SnapshotVersion>( versions.values() ) ); + metadata.getVersioning().setSnapshotVersions( new ArrayList<>( versions.values() ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java index 6cbeec5..8258966 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java @@ -46,7 +46,7 @@ class RemoteSnapshotMetadataGenerator { legacyFormat = ConfigUtils.getBoolean( session.getConfigProperties(), false, "maven.metadata.legacy" ); - snapshots = new LinkedHashMap<Object, RemoteSnapshotMetadata>(); + snapshots = new LinkedHashMap<>(); /* * NOTE: This should be considered a quirk to support interop with Maven's legacy ArtifactDeployer which http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java index adaca9d..f5e13be 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java @@ -89,9 +89,9 @@ final class VersionsMetadata versioning.setRelease( recessive.getVersioning().getRelease() ); } - Collection<String> versions = new LinkedHashSet<String>( recessive.getVersioning().getVersions() ); + Collection<String> versions = new LinkedHashSet<>( recessive.getVersioning().getVersions() ); versions.addAll( versioning.getVersions() ); - versioning.setVersions( new ArrayList<String>( versions ) ); + versioning.setVersions( new ArrayList<>( versions ) ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java index e2f5e82..5173001 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java @@ -55,8 +55,8 @@ class VersionsMetadataGenerator private VersionsMetadataGenerator( RepositorySystemSession session, Collection<? extends Metadata> metadatas ) { - versions = new LinkedHashMap<Object, VersionsMetadata>(); - processedVersions = new LinkedHashMap<Object, VersionsMetadata>(); + versions = new LinkedHashMap<>(); + processedVersions = new LinkedHashMap<>(); /* * NOTE: This should be considered a quirk to support interop with Maven's legacy ArtifactDeployer which http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java index fb44283..cf587d8 100644 --- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java +++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java @@ -36,7 +36,7 @@ public class ConsoleTransferListener private PrintStream out; - 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-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java ---------------------------------------------------------------------- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java index 8efc45c..a5a9b22 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java @@ -109,7 +109,7 @@ public final class ArtifactUtils public static Map<String, Artifact> artifactMapByVersionlessId( Collection<Artifact> artifacts ) { - Map<String, Artifact> artifactMap = new LinkedHashMap<String, Artifact>(); + Map<String, Artifact> artifactMap = new LinkedHashMap<>(); if ( artifacts != null ) { @@ -201,7 +201,7 @@ public final class ArtifactUtils if ( original != null ) { - copy = new ArrayList<T>(); + copy = new ArrayList<>(); if ( !original.isEmpty() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java ---------------------------------------------------------------------- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java index e3e42c0..147e88e 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java @@ -251,7 +251,7 @@ public class DefaultArtifact { if ( metadataMap == null ) { - metadataMap = new HashMap<Object, ArtifactMetadata>(); + metadataMap = new HashMap<>(); } ArtifactMetadata m = metadataMap.get( metadata.getKey() ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java ---------------------------------------------------------------------- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index 67a4696..e7d24c4 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -331,9 +331,8 @@ public class ComparableVersion public String toString() { StringBuilder buffer = new StringBuilder(); - for ( Iterator<Item> iter = iterator(); iter.hasNext(); ) + for ( Item item : this ) { - Item item = iter.next(); if ( buffer.length() > 0 ) { buffer.append( ( item instanceof ListItem ) ? '-' : '.' ); @@ -359,7 +358,7 @@ public class ComparableVersion ListItem list = items; - Stack<Item> stack = new Stack<Item>(); + Stack<Item> stack = new Stack<>(); stack.push( list ); boolean isDigit = false; http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java ---------------------------------------------------------------------- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java index dd8e028..0d094ef 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java @@ -60,7 +60,7 @@ public class VersionRange if ( restrictions != null ) { - copiedRestrictions = new ArrayList<Restriction>(); + copiedRestrictions = new ArrayList<>(); if ( !restrictions.isEmpty() ) { @@ -96,7 +96,7 @@ public class VersionRange return null; } - List<Restriction> restrictions = new ArrayList<Restriction>(); + List<Restriction> restrictions = new ArrayList<>(); String process = spec; ArtifactVersion version = null; ArtifactVersion upperBound = null; @@ -307,7 +307,7 @@ public class VersionRange private List<Restriction> intersection( List<Restriction> r1, List<Restriction> r2 ) { - List<Restriction> restrictions = new ArrayList<Restriction>( r1.size() + r2.size() ); + List<Restriction> restrictions = new ArrayList<>( r1.size() + r2.size() ); Iterator<Restriction> i1 = r1.iterator(); Iterator<Restriction> i2 = r2.iterator(); Restriction res1 = i1.next(); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java index 3bd1e34..1705d66 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java @@ -73,7 +73,7 @@ public final class ArtifactStatus if ( map == null ) { - map = new HashMap<String, ArtifactStatus>(); + map = new HashMap<>(); } map.put( key, this ); } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java index abbab82..1463c5a 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java @@ -59,7 +59,7 @@ public class DefaultArtifactDeployer @Requirement private LegacySupport legacySupport; - private Map<Object, MergeableMetadata> relatedMetadata = new ConcurrentHashMap<Object, MergeableMetadata>(); + private Map<Object, MergeableMetadata> relatedMetadata = new ConcurrentHashMap<>(); /** * @deprecated we want to use the artifact method only, and ensure artifact.file is set http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java index e793713..718aa0c 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java @@ -204,7 +204,7 @@ public class DefaultRepositoryMetadataManager // TODO: this needs to be repeated here so the merging doesn't interfere with the written metadata // - we'd be much better having a pristine input, and an ongoing metadata for merging instead - Map<ArtifactRepository, Metadata> previousMetadata = new HashMap<ArtifactRepository, Metadata>(); + Map<ArtifactRepository, Metadata> previousMetadata = new HashMap<>(); ArtifactRepository selected = null; for ( ArtifactRepository repository : remoteRepositories ) { @@ -334,12 +334,7 @@ public class DefaultRepositoryMetadataManager { throw new RepositoryMetadataReadException( "Cannot read metadata from '" + mappingFile + "'", e ); } - catch ( IOException e ) - { - throw new RepositoryMetadataReadException( "Cannot read metadata from '" + mappingFile + "': " - + e.getMessage(), e ); - } - catch ( XmlPullParserException e ) + catch ( IOException | XmlPullParserException e ) { throw new RepositoryMetadataReadException( "Cannot read metadata from '" + mappingFile + "': " + e.getMessage(), e ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java index 8df2e4a..7a8dce7 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java @@ -55,7 +55,7 @@ public interface ArtifactResolver // USED BY MAVEN ASSEMBLY PLUGIN @Deprecated ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, + Map<String,Artifact> managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source ) throws ArtifactResolutionException, ArtifactNotFoundException; @@ -63,7 +63,7 @@ public interface ArtifactResolver // USED BY MAVEN ASSEMBLY PLUGIN @Deprecated ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, + Map<String,Artifact> managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter ) throws ArtifactResolutionException, ArtifactNotFoundException; @@ -77,7 +77,7 @@ public interface ArtifactResolver @Deprecated ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, + Map<String,Artifact> managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List<ResolutionListener> listeners ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java index b066e4c..73a7598 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java @@ -38,7 +38,7 @@ public class DebugResolutionListener private String indent = ""; - private static Set<Artifact> ignoredArtifacts = new HashSet<Artifact>(); + private static Set<Artifact> ignoredArtifacts = new HashSet<>(); public DebugResolutionListener( Logger logger ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java index 1631a01..98de2d8 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java @@ -260,7 +260,7 @@ public class DefaultArtifactResolver } public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, + Map<String,Artifact> managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source ) throws ArtifactResolutionException, ArtifactNotFoundException @@ -270,7 +270,7 @@ public class DefaultArtifactResolver } public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, + Map<String,Artifact> managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter ) throws ArtifactResolutionException, ArtifactNotFoundException @@ -300,7 +300,7 @@ public class DefaultArtifactResolver } public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, + Map<String,Artifact> managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List<ResolutionListener> listeners ) @@ -311,7 +311,7 @@ public class DefaultArtifactResolver } public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, + Map<String,Artifact> managedVersions, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List<ResolutionListener> listeners, @@ -377,7 +377,7 @@ public class DefaultArtifactResolver if ( listeners == null ) { - listeners = new ArrayList<ResolutionListener>(); + listeners = new ArrayList<>(); if ( logger.isDebugEnabled() ) { @@ -438,11 +438,11 @@ public class DefaultArtifactResolver } else { - List<Artifact> allArtifacts = new ArrayList<Artifact>(); + List<Artifact> allArtifacts = new ArrayList<>(); allArtifacts.addAll( artifacts ); allArtifacts.addAll( directArtifacts ); - Map<String, Artifact> mergedArtifacts = new LinkedHashMap<String, Artifact>(); + Map<String, Artifact> mergedArtifacts = new LinkedHashMap<>(); for ( Artifact artifact : allArtifacts ) { String conflictId = artifact.getDependencyConflictId(); @@ -452,7 +452,7 @@ public class DefaultArtifactResolver } } - artifacts = new LinkedHashSet<Artifact>( mergedArtifacts.values() ); + artifacts = new LinkedHashSet<>( mergedArtifacts.values() ); } collectionRequest = new ArtifactResolutionRequest( request ); @@ -530,7 +530,7 @@ public class DefaultArtifactResolver if ( request.isResolveRoot() ) { // Add the root artifact (as the first artifact to retain logical order of class path!) - Set<Artifact> allArtifacts = new LinkedHashSet<Artifact>(); + Set<Artifact> allArtifacts = new LinkedHashSet<>(); allArtifacts.add( rootArtifact ); allArtifacts.addAll( result.getArtifacts() ); result.setArtifacts( allArtifacts ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java index 8cd02cc..24bfbf4 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java @@ -38,12 +38,12 @@ public class OrArtifactFilter public OrArtifactFilter() { - this.filters = new LinkedHashSet<ArtifactFilter>(); + this.filters = new LinkedHashSet<>(); } public OrArtifactFilter( Collection<ArtifactFilter> filters ) { - this.filters = new LinkedHashSet<ArtifactFilter>( filters ); + this.filters = new LinkedHashSet<>( filters ); } public boolean include( Artifact artifact ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java index 3b99e9e..9cbd7c8 100644 --- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java +++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java @@ -50,13 +50,13 @@ public class DefaultProfileManager @Requirement private ProfileSelector profileSelector; - private List activatedIds = new ArrayList(); + private List<String> activatedIds = new ArrayList<>(); - private List deactivatedIds = new ArrayList(); + private List<String> deactivatedIds = new ArrayList<>(); - private List defaultIds = new ArrayList(); + private List<String> defaultIds = new ArrayList<>(); - private Map profilesById = new LinkedHashMap(); + private Map<String, Profile> profilesById = new LinkedHashMap<>(); private Properties requestProperties; @@ -105,7 +105,7 @@ public class DefaultProfileManager { String profileId = profile.getId(); - Profile existing = (Profile) profilesById.get( profileId ); + Profile existing = profilesById.get( profileId ); if ( existing != null ) { logger.warn( "Overriding profile: \'" + profileId + "\' (source: " + existing.getSource() @@ -186,7 +186,7 @@ public class DefaultProfileManager context.setSystemProperties( System.getProperties() ); context.setUserProperties( requestProperties ); - final List<ProfileActivationException> errors = new ArrayList<ProfileActivationException>(); + final List<ProfileActivationException> errors = new ArrayList<>(); List<Profile> profiles = profileSelector.getActiveProfiles( profilesById.values(), context, new ModelProblemCollector() @@ -230,12 +230,12 @@ public class DefaultProfileManager } } - public List getExplicitlyActivatedIds() + public List<String> getExplicitlyActivatedIds() { return activatedIds; } - public List getExplicitlyDeactivatedIds() + public List<String> getExplicitlyDeactivatedIds() { return deactivatedIds; } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java index ddda3d7..603343f 100644 --- a/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java +++ b/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java @@ -47,9 +47,9 @@ public interface ProfileManager Map getProfilesById(); - List getExplicitlyActivatedIds(); + List<String> getExplicitlyActivatedIds(); - List getExplicitlyDeactivatedIds(); + List<String> getExplicitlyDeactivatedIds(); List getIdsActivatedByDefault(); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index fff2de1..7bc5a5c 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -151,7 +151,7 @@ public class DefaultMavenProjectBuilder { boolean normalized = false; - List<ArtifactRepository> repos = new ArrayList<ArtifactRepository>( repositories.size() ); + List<ArtifactRepository> repos = new ArrayList<>( repositories.size() ); for ( Object repository : repositories ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java index 1af061d..faf224b 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java +++ b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java @@ -63,7 +63,7 @@ public final class ModelUtils if ( ( parentPlugins != null ) && !parentPlugins.isEmpty() ) { - parentPlugins = new ArrayList<Plugin>( parentPlugins ); + parentPlugins = new ArrayList<>( parentPlugins ); // If we're processing this merge as an inheritance, we have to build up a list of // plugins that were considered for inheritance. @@ -82,7 +82,7 @@ public final class ModelUtils } } - List<Plugin> assembledPlugins = new ArrayList<Plugin>(); + List<Plugin> assembledPlugins = new ArrayList<>(); Map<String, Plugin> childPlugins = childContainer.getPluginsAsMap(); @@ -134,16 +134,16 @@ public final class ModelUtils public static List<Plugin> orderAfterMerge( List<Plugin> merged, List<Plugin> highPrioritySource, List<Plugin> lowPrioritySource ) { - List<Plugin> results = new ArrayList<Plugin>(); + List<Plugin> results = new ArrayList<>(); if ( !merged.isEmpty() ) { results.addAll( merged ); } - List<Plugin> missingFromResults = new ArrayList<Plugin>(); + List<Plugin> missingFromResults = new ArrayList<>(); - List<List<Plugin>> sources = new ArrayList<List<Plugin>>(); + List<List<Plugin>> sources = new ArrayList<>(); sources.add( highPrioritySource ); sources.add( lowPrioritySource ); @@ -222,9 +222,9 @@ public final class ModelUtils if ( ( parentExecutions != null ) && !parentExecutions.isEmpty() ) { - List<PluginExecution> mergedExecutions = new ArrayList<PluginExecution>(); + List<PluginExecution> mergedExecutions = new ArrayList<>(); - Map<String, PluginExecution> assembledExecutions = new TreeMap<String, PluginExecution>(); + Map<String, PluginExecution> assembledExecutions = new TreeMap<>(); Map<String, PluginExecution> childExecutions = child.getExecutionsAsMap(); @@ -282,7 +282,7 @@ public final class ModelUtils List<String> parentGoals = parent.getGoals(); List<String> childGoals = child.getGoals(); - List<String> goals = new ArrayList<String>(); + List<String> goals = new ArrayList<>(); if ( ( childGoals != null ) && !childGoals.isEmpty() ) { @@ -312,7 +312,7 @@ public final class ModelUtils public static List<Repository> mergeRepositoryLists( List<Repository> dominant, List<Repository> recessive ) { - List<Repository> repositories = new ArrayList<Repository>(); + List<Repository> repositories = new ArrayList<>(); for ( Repository repository : dominant ) { @@ -343,7 +343,7 @@ public final class ModelUtils private static List<Dependency> mergeDependencyList( List<Dependency> child, List<Dependency> parent ) { - Map<String, Dependency> depsMap = new LinkedHashMap<String, Dependency>(); + Map<String, Dependency> depsMap = new LinkedHashMap<>(); if ( parent != null ) { @@ -361,7 +361,7 @@ public final class ModelUtils } } - return new ArrayList<Dependency>( depsMap.values() ); + return new ArrayList<>( depsMap.values() ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java index b70d3cf..d15a892 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java +++ b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java @@ -51,7 +51,7 @@ public final class ProjectUtils throws InvalidRepositoryException { - List<ArtifactRepository> remoteRepositories = new ArrayList<ArtifactRepository>(); + List<ArtifactRepository> remoteRepositories = new ArrayList<>(); for ( Repository r : repositories ) { http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java index 4b08eb9..fa67041 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java +++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java @@ -20,8 +20,6 @@ package org.apache.maven.project.inheritance; */ import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -323,7 +321,7 @@ public class DefaultModelInheritanceAssembler { List<Dependency> childDeps = childDepMgmt.getDependencies(); - Map<String, Dependency> mappedChildDeps = new TreeMap<String, Dependency>(); + Map<String, Dependency> mappedChildDeps = new TreeMap<>(); for ( Dependency dep : childDeps ) { mappedChildDeps.put( dep.getManagementKey(), dep ); @@ -377,7 +375,7 @@ public class DefaultModelInheritanceAssembler if ( ( parentPlugins != null ) && !parentPlugins.isEmpty() ) { - Map<String, ReportPlugin> assembledPlugins = new TreeMap<String, ReportPlugin>(); + Map<String, ReportPlugin> assembledPlugins = new TreeMap<>(); Map<String, ReportPlugin> childPlugins = child.getReportPluginsAsMap(); @@ -416,7 +414,7 @@ public class DefaultModelInheritanceAssembler } } - child.setPlugins( new ArrayList<ReportPlugin>( assembledPlugins.values() ) ); + child.setPlugins( new ArrayList<>( assembledPlugins.values() ) ); child.flushReportPluginMap(); } @@ -427,7 +425,7 @@ public class DefaultModelInheritanceAssembler List<String> parentReports = parent.getReports(); List<String> childReports = child.getReports(); - List<String> reports = new ArrayList<String>(); + List<String> reports = new ArrayList<>(); if ( ( childReports != null ) && !childReports.isEmpty() ) { @@ -479,7 +477,7 @@ public class DefaultModelInheritanceAssembler if ( ( parentReportSets != null ) && !parentReportSets.isEmpty() ) { - Map<String, ReportSet> assembledReportSets = new TreeMap<String, ReportSet>(); + Map<String, ReportSet> assembledReportSets = new TreeMap<>(); Map<String, ReportSet> childReportSets = child.getReportSetsAsMap(); @@ -518,7 +516,7 @@ public class DefaultModelInheritanceAssembler } } - child.setReportSets( new ArrayList<ReportSet>( assembledReportSets.values() ) ); + child.setReportSets( new ArrayList<>( assembledReportSets.values() ) ); child.flushReportSetMap(); } @@ -529,7 +527,7 @@ public class DefaultModelInheritanceAssembler @SuppressWarnings( "unchecked" ) private void assembleDependencyInheritance( Model child, Model parent ) { - Map<String, Dependency> depsMap = new LinkedHashMap<String, Dependency>(); + Map<String, Dependency> depsMap = new LinkedHashMap<>(); List<Dependency> deps = parent.getDependencies(); @@ -551,7 +549,7 @@ public class DefaultModelInheritanceAssembler } } - child.setDependencies( new ArrayList<Dependency>( depsMap.values() ) ); + child.setDependencies( new ArrayList<>( depsMap.values() ) ); } private void assembleBuildInheritance( Model child, Model parent ) @@ -694,7 +692,7 @@ public class DefaultModelInheritanceAssembler // TODO: Move this to plexus-utils' PathTool. private static String resolvePath( String uncleanPath ) { - LinkedList<String> pathElements = new LinkedList<String>(); + LinkedList<String> pathElements = new LinkedList<>(); StringTokenizer tokenizer = new StringTokenizer( uncleanPath, "/" ); @@ -702,26 +700,26 @@ public class DefaultModelInheritanceAssembler { String token = tokenizer.nextToken(); - if ( token.equals( "" ) ) + switch ( token ) { - // Empty path entry ("...//.."), remove. - } - else if ( token.equals( ".." ) ) - { - if ( pathElements.isEmpty() ) - { - // FIXME: somehow report to the user - // that there are too many '..' elements. - // For now, ignore the extra '..'. - } - else - { - pathElements.removeLast(); - } - } - else - { - pathElements.addLast( token ); + case "": + // Empty path entry ("...//.."), remove. + break; + case "..": + if ( pathElements.isEmpty() ) + { + // FIXME: somehow report to the user + // that there are too many '..' elements. + // For now, ignore the extra '..'. + } + else + { + pathElements.removeLast(); + } + break; + default: + pathElements.addLast( token ); + break; } } http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java index dfc3dee..568196c 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java +++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java @@ -71,7 +71,7 @@ public abstract class AbstractStringBasedModelInterpolator static { - List<String> translatedPrefixes = new ArrayList<String>(); + List<String> translatedPrefixes = new ArrayList<>(); // MNG-1927, MNG-2124, MNG-3355: // If the build section is present and the project directory is non-null, we should make @@ -168,12 +168,7 @@ public abstract class AbstractStringBasedModelInterpolator { model = modelReader.read( sReader ); } - catch ( IOException e ) - { - throw new ModelInterpolationException( - "Cannot read project model from interpolating filter of serialized version.", e ); - } - catch ( XmlPullParserException e ) + catch ( IOException | XmlPullParserException e ) { throw new ModelInterpolationException( "Cannot read project model from interpolating filter of serialized version.", e ); @@ -253,7 +248,7 @@ public abstract class AbstractStringBasedModelInterpolator } }, PROJECT_PREFIXES, false ); - List<ValueSource> valueSources = new ArrayList<ValueSource>( 9 ); + List<ValueSource> valueSources = new ArrayList<>( 9 ); // NOTE: Order counts here! valueSources.add( basedirValueSource ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java index 864f57f..13ceaf7 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java +++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java @@ -47,8 +47,8 @@ public class StringSearchModelInterpolator extends AbstractStringBasedModelInterpolator { - private static final Map<Class<?>, Field[]> fieldsByClass = new WeakHashMap<Class<?>, Field[]>(); - private static final Map<Class<?>, Boolean> fieldIsPrimitiveByClass = new WeakHashMap<Class<?>, Boolean>(); + private static final Map<Class<?>, Field[]> fieldsByClass = new WeakHashMap<>(); + private static final Map<Class<?>, Boolean> fieldIsPrimitiveByClass = new WeakHashMap<>(); public StringSearchModelInterpolator() { @@ -119,7 +119,7 @@ public class StringSearchModelInterpolator this.postProcessors = postProcessors; this.debugEnabled = debugEnabled; - this.interpolationTargets = new LinkedList<Object>(); + this.interpolationTargets = new LinkedList<>(); interpolationTargets.add( target ); this.modelInterpolator = modelInterpolator; @@ -199,7 +199,7 @@ public class StringSearchModelInterpolator Collection<Object> c = (Collection<Object>) field.get( target ); if ( c != null && !c.isEmpty() ) { - List<Object> originalValues = new ArrayList<Object>( c ); + List<Object> originalValues = new ArrayList<>( c ); try { c.clear(); @@ -326,12 +326,7 @@ public class StringSearchModelInterpolator } } } - catch ( IllegalArgumentException e ) - { - throw new ModelInterpolationException( - "Failed to interpolate field: " + field + " on class: " + cls.getName(), e ); - } - catch ( IllegalAccessException e ) + catch ( IllegalArgumentException | IllegalAccessException e ) { throw new ModelInterpolationException( "Failed to interpolate field: " + field + " on class: " + cls.getName(), e ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java index ece7c39..b4061ec 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java +++ b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java @@ -65,7 +65,7 @@ public class DefaultPathTranslator if ( build.getFilters() != null ) { - List<String> filters = new ArrayList<String>(); + List<String> filters = new ArrayList<>(); for ( String filter : build.getFilters() ) { filters.add( alignToBaseDirectory( filter, basedir ) ); @@ -203,7 +203,7 @@ public class DefaultPathTranslator if ( build.getFilters() != null ) { - List<String> filters = new ArrayList<String>(); + List<String> filters = new ArrayList<>(); for ( String filter : build.getFilters() ) { filters.add( unalignFromBaseDirectory( filter, basedir ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java index cb8c601..ad94fe0 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java +++ b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java @@ -37,7 +37,7 @@ public class ModelValidationResult public ModelValidationResult() { - messages = new ArrayList<String>(); + messages = new ArrayList<>(); } public int getMessageCount() http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java index fcaddd2..e994856 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java @@ -45,7 +45,7 @@ public class MetadataGraph public MetadataGraph() { - nodes = new ArrayList<MetadataGraphNode>( 64 ); + nodes = new ArrayList<>( 64 ); } public void addNode( MetadataGraphNode node ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java index c8b9ab4..c258f05 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java @@ -41,8 +41,8 @@ public class MetadataGraphNode public MetadataGraphNode() { - inNodes = new ArrayList<MetadataGraphNode>( 4 ); - exNodes = new ArrayList<MetadataGraphNode>( 8 ); + inNodes = new ArrayList<>( 4 ); + exNodes = new ArrayList<>( 8 ); } public MetadataGraphNode( MavenArtifactMetadata metadata ) http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java index 209c36f..6224907 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java @@ -85,7 +85,7 @@ public class MetadataResolutionResult { if ( artifacts == null ) { - artifacts = new LinkedHashSet<Artifact>(); + artifacts = new LinkedHashSet<>(); } artifacts.add( artifact ); @@ -100,7 +100,7 @@ public class MetadataResolutionResult { if ( requestedArtifacts == null ) { - requestedArtifacts = new LinkedHashSet<Artifact>(); + requestedArtifacts = new LinkedHashSet<>(); } requestedArtifacts.add( artifact ); @@ -318,7 +318,7 @@ public class MetadataResolutionResult { if ( l == null ) { - return new ArrayList<T>(); + return new ArrayList<>(); } return l; }
