Upgraded to java7 language features

trask · Jun 20, 2015 · 7badeb5 · 7badeb5
1 parent 40d5087
commit 7badeb5
Show file tree

Hide file tree

Showing 235 changed files with 941 additions and 1,086 deletions.
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
@@ -45,15 +45,10 @@ public void testValidGlobalSettings()
         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();
-        }
     }
 
 }
diff --git a/.../src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/.../src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -74,7 +74,7 @@ public void populateResult( RepositorySystemSession session, ArtifactDescriptorR
             }
         }
 
-        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 @@ private Dependency convert( org.apache.maven.model.Dependency dependency, Artifa
             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 @@ private void setArtifactProperties( ArtifactDescriptorResult result, Model model
         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 ) );
         }

diff --git a/...r/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/...r/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -239,7 +239,7 @@ private Model loadPom( RepositorySystemSession session, ArtifactDescriptorReques
     {
         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 );

diff --git a/...her-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/...her-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -89,11 +89,11 @@ public DefaultModelResolver( RepositorySystemSession session, RequestTrace trace
         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 @@ private DefaultModelResolver( DefaultModelResolver original )
         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

diff --git a/...vider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/...vider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -19,23 +19,13 @@
  * 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.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 VersionRangeResult resolveVersionRange( RepositorySystemSession session,
         {
             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 @@ private Map<String, ArtifactRepository> getVersions( RepositorySystemSession ses
     {
         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 @@ private Versioning readVersions( RepositorySystemSession session, RequestTrace t
         {
             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 @@ private Versioning readVersions( RepositorySystemSession session, RequestTrace t
                         versioning = m.getVersioning();
                     }
                 }
-                finally
-                {
-                    syncContext.close();
-                }
             }
         }
         catch ( Exception e )

diff --git a/...r-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/...r-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -19,18 +19,6 @@
  * 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.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.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 VersionResult resolveVersion( RepositorySystemSession session, VersionReq
             {
                 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 VersionResult resolveVersion( RepositorySystemSession session, VersionReq
 
         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 @@ else if ( version.endsWith( SNAPSHOT ) )
         }
         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 @@ else if ( version.endsWith( SNAPSHOT ) )
 
             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 @@ private Versioning readVersions( RepositorySystemSession session, RequestTrace t
         {
             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 @@ private Versioning readVersions( RepositorySystemSession session, RequestTrace t
                                 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 @@ private void merge( Map<String, VersionInfo> infos, String srcKey, String dstKey
         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 Key( RepositorySystemSession session, VersionRequest request )
             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 @@ else if ( obj == null || !getClass().equals( obj.getClass() ) )
             }
 
             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 );
         }
 

diff --git a/...er-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java b/...er-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 @@ protected void merge( Metadata recessive )
         {
             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 @@ protected void merge( Metadata recessive )
                 }
             }
 
-            metadata.getVersioning().setSnapshotVersions( new ArrayList<SnapshotVersion>( versions.values() ) );
+            metadata.getVersioning().setSnapshotVersions( new ArrayList<>( versions.values() ) );
         }
 
         artifacts.clear();

diff --git a/...er/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java b/...er/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
@@ -46,7 +46,7 @@ public LocalSnapshotMetadataGenerator( RepositorySystemSession session, InstallR
     {
         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 )

diff --git a/...aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java b/...aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
@@ -67,7 +67,7 @@ Set<MetadataGeneratorFactory> provideMetadataGeneratorFactories( @Named( "snapsh
                                                                      @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 );

diff --git a/...er-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java b/...er-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;