Cleanup - Java 7 - replace with diamond

apache · Apr 22, 2021 · fe4735f · fe4735f
1 parent 71b9219
commit fe4735f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/rar/RarMojo.java b/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
@@ -414,7 +414,7 @@ private void resourceHandling()
         resource.setTargetPath( getBuildDir().getAbsolutePath() );
         resource.setFiltering( filterRarSourceDirectory );
 
-        List<Resource> resources = new ArrayList<Resource>();
+        List<Resource> resources = new ArrayList<>();
         resources.add( resource );
 
         if ( rarResources != null && !rarResources.isEmpty() )

diff --git a/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java b/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
@@ -83,7 +83,7 @@ public void testBasicRar()
         File[] fileNames = workDirectory.listFiles();
         assertNotNull( fileNames );
 
-        List<String> expectedFiles = new ArrayList<String>();
+        List<String> expectedFiles = new ArrayList<>();
 
         expectedFiles.add( "maven-artifact01-1.0-SNAPSHOT.jar" );
         expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
@@ -116,7 +116,7 @@ public void testBasicRar()
         assertTrue( rarFile.exists() );
 
         //expected files/directories inside the rar file
-        expectedFiles = new ArrayList<String>();
+        expectedFiles = new ArrayList<>();
 
         expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.properties" );
         expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.xml" );
@@ -168,8 +168,8 @@ public void testBasicRarWithDescriptor()
         File[] fileNames = workDirectory.listFiles();
         assertNotNull( fileNames );
 
-        List<String> expectedFiles = new ArrayList<String>();
-        List<String> fileList = new ArrayList<String>();
+        List<String> expectedFiles = new ArrayList<>();
+        List<String> fileList = new ArrayList<>();
 
         for ( File fileName : fileNames )
         {
@@ -191,7 +191,7 @@ public void testBasicRarWithDescriptor()
         assertTrue( rarFile.exists() );
 
         //expected files/directories inside the rar file
-        expectedFiles = new ArrayList<String>();
+        expectedFiles = new ArrayList<>();
 
         expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.properties" );
         expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.xml" );
@@ -243,8 +243,8 @@ public void testBasicRarWithManifest()
         File[] fileNames = workDirectory.listFiles();
         assertNotNull( fileNames );
 
-        List<String> expectedFiles = new ArrayList<String>();
-        List<String> fileList = new ArrayList<String>();
+        List<String> expectedFiles = new ArrayList<>();
+        List<String> fileList = new ArrayList<>();
 
         for ( File file : fileNames )
         {
@@ -267,7 +267,7 @@ public void testBasicRarWithManifest()
         assertTrue( rarFile.exists() );
 
         //expected files/directories inside the rar file
-        expectedFiles = new ArrayList<String>();
+        expectedFiles = new ArrayList<>();
 
         expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.properties" );
         expectedFiles.add( "META-INF/maven/org.apache.maven.test/maven-rar-test/pom.xml" );

diff --git a/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
@@ -122,7 +122,7 @@ public Artifact getArtifact()
 
     public Set<Artifact> getArtifacts()
     {
-        Set<Artifact> artifacts = new HashSet<Artifact>();
+        Set<Artifact> artifacts = new HashSet<>();
 
         artifacts.add( createArtifact( "org.apache.maven.test", "maven-artifact01", "1.0-SNAPSHOT", false ) );
         artifacts.add( createArtifact( "org.apache.maven.test", "maven-artifact02", "1.0-SNAPSHOT", false ) );
@@ -134,7 +134,7 @@ public List<Artifact> getAttachedArtifacts()
     {
         if ( attachedArtifacts == null )
         {
-            attachedArtifacts = new ArrayList<Artifact>();
+            attachedArtifacts = new ArrayList<>();
         }
         return attachedArtifacts;
     }