some java 1.7 sugar syntax

olamy · olamy · commit 6196e4061a12 · 2018-02-19T12:25:48.000+10:00
Signed-off-by: olivier lamy &lt;olamy@apache.org&gt;
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java
@@ -42,7 +42,7 @@ public abstract class AbstractCompiler
     extends AbstractLogEnabled
     implements Compiler
 {
-    protected static final String EOL = System.getProperty( "line.separator" );
+    protected static final String EOL = System.lineSeparator();
 
     protected static final String PS = System.getProperty( "path.separator" );
 
@@ -172,7 +172,7 @@ protected static Set<String> getSourceFilesForSourceRoot( CompilerConfiguration
 
         String[] sourceDirectorySources = scanner.getIncludedFiles();
 
-        Set<String> sources = new HashSet<String>();
+        Set<String> sources = new HashSet<>();
 
         for ( String sourceDirectorySource : sourceDirectorySources )
         {
@@ -186,7 +186,7 @@ protected static Set<String> getSourceFilesForSourceRoot( CompilerConfiguration
 
     protected static String[] getSourceFiles( CompilerConfiguration config )
     {
-        Set<String> sources = new HashSet<String>();
+        Set<String> sources = new HashSet<>();
 
         Set<File> sourceFiles = config.getSourceFiles();
 
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java
@@ -43,21 +43,21 @@ public class CompilerConfiguration
 {
     private String outputLocation;
 
-    private List<String> classpathEntries = new LinkedList<String>();
+    private List<String> classpathEntries = new LinkedList<>();
 
-    private List<String> modulepathEntries = new LinkedList<String>();
+    private List<String> modulepathEntries = new LinkedList<>();
 
     // ----------------------------------------------------------------------
     // Source Files
     // ----------------------------------------------------------------------
 
-    private Set<File> sourceFiles = new HashSet<File>();
+    private Set<File> sourceFiles = new HashSet<>();
 
-    private List<String> sourceLocations = new LinkedList<String>();
+    private List<String> sourceLocations = new LinkedList<>();
 
-    private Set<String> includes = new HashSet<String>();
+    private Set<String> includes = new HashSet<>();
 
-    private Set<String> excludes = new HashSet<String>();
+    private Set<String> excludes = new HashSet<>();
 
     // ----------------------------------------------------------------------
     // Compiler Settings
@@ -92,7 +92,7 @@ public class CompilerConfiguration
      */
     private String moduleVersion;
 
-    private Collection<Map.Entry<String,String>> customCompilerArguments = new ArrayList<Map.Entry<String,String>>();
+    private Collection<Map.Entry<String,String>> customCompilerArguments = new ArrayList<>();
 
     private boolean fork;
 
@@ -150,7 +150,7 @@ public class CompilerConfiguration
     private List<String> processorPathEntries;
 
     /**
-     * default value {@link CompilerReuseStrategy.ReuseCreated}
+     * default value {@link CompilerReuseStrategy#ReuseCreated}
      *
      * @since 1.9
      */
@@ -193,7 +193,7 @@ public void setClasspathEntries( List<String> classpathEntries )
         }
         else
         {
-            this.classpathEntries = new LinkedList<String>( classpathEntries );
+            this.classpathEntries = new LinkedList<>( classpathEntries );
         }
     }
 
@@ -219,7 +219,7 @@ public void setModulepathEntries( List<String> modulepathEntries )
         }
         else
         {
-            this.modulepathEntries = new LinkedList<String>( modulepathEntries );
+            this.modulepathEntries = new LinkedList<>( modulepathEntries );
         }
     }
 
@@ -240,7 +240,7 @@ public void setSourceFiles( Set<File> sourceFiles )
         }
         else
         {
-            this.sourceFiles = new HashSet<File>( sourceFiles );
+            this.sourceFiles = new HashSet<>( sourceFiles );
         }
     }
 
@@ -262,7 +262,7 @@ public void setSourceLocations( List<String> sourceLocations )
         }
         else
         {
-            this.sourceLocations = new LinkedList<String>( sourceLocations );
+            this.sourceLocations = new LinkedList<>( sourceLocations );
         }
     }
 
@@ -284,7 +284,7 @@ public void setIncludes( Set<String> includes )
         }
         else
         {
-            this.includes = new HashSet<String>( includes );
+            this.includes = new HashSet<>( includes );
         }
     }
 
@@ -306,7 +306,7 @@ public void setExcludes( Set<String> excludes )
         }
         else
         {
-            this.excludes = new HashSet<String>( excludes );
+            this.excludes = new HashSet<>( excludes );
         }
     }
 
@@ -421,7 +421,7 @@ public void setModuleVersion( String moduleVersion )
 
     public void addCompilerCustomArgument( String customArgument, String value )
     {
-        customCompilerArguments.add( new AbstractMap.SimpleImmutableEntry<String, String>( customArgument, value ) );
+        customCompilerArguments.add( new AbstractMap.SimpleImmutableEntry<>( customArgument, value ) );
     }
 
     /**
@@ -431,7 +431,7 @@ public void addCompilerCustomArgument( String customArgument, String value )
     @Deprecated
     public LinkedHashMap<String, String> getCustomCompilerArguments()
     {
-        LinkedHashMap<String, String> arguments = new LinkedHashMap<String, String>( customCompilerArguments.size() );
+        LinkedHashMap<String, String> arguments = new LinkedHashMap<>( customCompilerArguments.size() );
         for ( Map.Entry<String, String> entry : customCompilerArguments )
         {
             arguments.put( entry.getKey(), entry.getValue() );
@@ -457,7 +457,7 @@ public void setCustomCompilerArguments( LinkedHashMap<String, String> customComp
      */
     public Map<String, String> getCustomCompilerArgumentsAsMap()
     {
-        LinkedHashMap<String, String> arguments = new LinkedHashMap<String, String>( customCompilerArguments.size() );
+        LinkedHashMap<String, String> arguments = new LinkedHashMap<>( customCompilerArguments.size() );
         for ( Map.Entry<String, String> entry : customCompilerArguments )
         {
             arguments.put( entry.getKey(), entry.getValue() );
@@ -467,7 +467,7 @@ public Map<String, String> getCustomCompilerArgumentsAsMap()
 
     public void setCustomCompilerArgumentsAsMap( Map<String, String> customCompilerArguments )
     {
-        this.customCompilerArguments = new ArrayList<Map.Entry<String,String>>();
+        this.customCompilerArguments = new ArrayList<>();
         if ( customCompilerArguments != null )
         {
             this.customCompilerArguments.addAll( customCompilerArguments.entrySet() );
@@ -632,7 +632,7 @@ public String[] getAnnotationProcessors()
      */
     public void addProcessorPathEntry(String entry) {
         if ( processorPathEntries == null ) {
-            processorPathEntries = new LinkedList<String>();
+            processorPathEntries = new LinkedList<>();
         }
 
         processorPathEntries.add( entry );
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerResult.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerResult.java
@@ -74,7 +74,7 @@ public List<CompilerMessage> getCompilerMessages()
     {
         if ( compilerMessages == null )
         {
-            this.compilerMessages = new ArrayList<CompilerMessage>();
+            this.compilerMessages = new ArrayList<>();
         }
         return compilerMessages;
     }
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/SimpleSourceInclusionScanner.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/SimpleSourceInclusionScanner.java
@@ -61,7 +61,7 @@ public Set<File> getIncludedSources( File sourceDir, File targetDir )
 
         String[] potentialSources = scanForSources( sourceDir, sourceIncludes, sourceExcludes );
 
-        Set<File> matchingSources = new HashSet<File>( potentialSources != null ? potentialSources.length : 0 );
+        Set<File> matchingSources = new HashSet<>( potentialSources != null ? potentialSources.length : 0 );
 
         if ( potentialSources != null )
         {
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/StaleSourceScanner.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/StaleSourceScanner.java
@@ -75,7 +75,7 @@ public Set<File> getIncludedSources( File sourceDir, File targetDir )
 
         String[] potentialIncludes = scanForSources( sourceDir, sourceIncludes, sourceExcludes );
 
-        Set<File> matchingSources = new HashSet<File>();
+        Set<File> matchingSources = new HashSet<>();
 
         for ( String path : potentialIncludes )
         {
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SuffixMapping.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SuffixMapping.java
@@ -47,7 +47,7 @@ public SuffixMapping( String sourceSuffix, Set<String> targetSuffixes )
 
     public Set<File> getTargetFiles( File targetDir, String source )
     {
-        Set<File> targetFiles = new HashSet<File>();
+        Set<File> targetFiles = new HashSet<>();
 
         if ( source.endsWith( sourceSuffix ) )
         {
diff --git a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTckTest.java b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTckTest.java
@@ -37,7 +37,7 @@
 public abstract class AbstractCompilerTckTest
     extends PlexusTestCase
 {
-    private static final String EOL = System.getProperty( "line.separator" );
+    private static final String EOL = System.lineSeparator();
 
     private String roleHint;
 
diff --git a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
@@ -74,7 +74,7 @@ public void setForceJavacCompilerUse( boolean forceJavacCompilerUse )
     protected List<String> getClasspath()
         throws Exception
     {
-        List<String> cp = new ArrayList<String>();
+        List<String> cp = new ArrayList<>();
 
         File file = getLocalArtifactPath( "commons-lang", "commons-lang", "2.0", "jar" );
 
@@ -94,8 +94,8 @@ protected void configureCompilerConfig( CompilerConfiguration compilerConfig )
     public void testCompilingSources()
         throws Exception
     {
-        List<CompilerMessage> messages = new ArrayList<CompilerMessage>();
-        Collection<String> files = new TreeSet<String>();
+        List<CompilerMessage> messages = new ArrayList<>();
+        Collection<String> files = new TreeSet<>();
 
         for ( CompilerConfiguration compilerConfig : getCompilerConfigurations() )
         {
@@ -153,7 +153,7 @@ public void testCompilingSources()
             assertEquals( "Wrong number of compilation warnings.", expectedWarnings(), numCompilerWarnings );
         }
 
-        assertEquals( new TreeSet<String>( normalizePaths( expectedOutputFiles() ) ), files );
+        assertEquals( new TreeSet<>( normalizePaths( expectedOutputFiles() ) ), files );
     }
 
     private List<CompilerConfiguration> getCompilerConfigurations()
@@ -165,7 +165,7 @@ private List<CompilerConfiguration> getCompilerConfigurations()
             FileUtils.getFileNames( new File( sourceDir ), "**/*.java", null, false, true );
         Collections.sort( filenames );
 
-        List<CompilerConfiguration> compilerConfigurations = new ArrayList<CompilerConfiguration>();
+        List<CompilerConfiguration> compilerConfigurations = new ArrayList<>();
 
         int index = 0;
         for ( Iterator<String> it = filenames.iterator(); it.hasNext(); index++ )
diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompiler.java
@@ -49,7 +49,7 @@ public class JavaxToolsCompiler
     @SuppressWarnings( "restriction" )
     static final JavaCompiler COMPILER = ToolProvider.getSystemJavaCompiler();
 
-    private static List<JavaCompiler> JAVA_COMPILERS = new CopyOnWriteArrayList<JavaCompiler>();
+    private static List<JavaCompiler> JAVA_COMPILERS = new CopyOnWriteArrayList<>();
 
     protected static JavaCompiler getJavaCompiler( CompilerConfiguration compilerConfiguration )
     {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public abstract class AbstractCompiler`
`42`	`42`	`extends AbstractLogEnabled`
`43`	`43`	`implements Compiler`
`44`	`44`	`{`
`45`		`- protected static final String EOL = System.getProperty( "line.separator" );`
	`45`	`+ protected static final String EOL = System.lineSeparator();`
`46`	`46`
`47`	`47`	`protected static final String PS = System.getProperty( "path.separator" );`
`48`	`48`
`@@ -172,7 +172,7 @@ protected static Set<String> getSourceFilesForSourceRoot( CompilerConfiguration`
`172`	`172`
`173`	`173`	`String[] sourceDirectorySources = scanner.getIncludedFiles();`
`174`	`174`
`175`		`- Set<String> sources = new HashSet<String>();`
	`175`	`+ Set<String> sources = new HashSet<>();`
`176`	`176`
`177`	`177`	`for ( String sourceDirectorySource : sourceDirectorySources )`
`178`	`178`	`{`
`@@ -186,7 +186,7 @@ protected static Set<String> getSourceFilesForSourceRoot( CompilerConfiguration`
`186`	`186`
`187`	`187`	`protected static String[] getSourceFiles( CompilerConfiguration config )`
`188`	`188`	`{`
`189`		`- Set<String> sources = new HashSet<String>();`
	`189`	`+ Set<String> sources = new HashSet<>();`
`190`	`190`
`191`	`191`	`Set<File> sourceFiles = config.getSourceFiles();`
`192`	`192`
Original file line number	Diff line number	Diff line change
`@@ -43,21 +43,21 @@ public class CompilerConfiguration`
`43`	`43`	`{`
`44`	`44`	`private String outputLocation;`
`45`	`45`
`46`		`- private List<String> classpathEntries = new LinkedList<String>();`
	`46`	`+ private List<String> classpathEntries = new LinkedList<>();`
`47`	`47`
`48`		`- private List<String> modulepathEntries = new LinkedList<String>();`
	`48`	`+ private List<String> modulepathEntries = new LinkedList<>();`
`49`	`49`
`50`	`50`	`// ----------------------------------------------------------------------`
`51`	`51`	`// Source Files`
`52`	`52`	`// ----------------------------------------------------------------------`
`53`	`53`
`54`		`- private Set<File> sourceFiles = new HashSet<File>();`
	`54`	`+ private Set<File> sourceFiles = new HashSet<>();`
`55`	`55`
`56`		`- private List<String> sourceLocations = new LinkedList<String>();`
	`56`	`+ private List<String> sourceLocations = new LinkedList<>();`
`57`	`57`
`58`		`- private Set<String> includes = new HashSet<String>();`
	`58`	`+ private Set<String> includes = new HashSet<>();`
`59`	`59`
`60`		`- private Set<String> excludes = new HashSet<String>();`
	`60`	`+ private Set<String> excludes = new HashSet<>();`
`61`	`61`
`62`	`62`	`// ----------------------------------------------------------------------`
`63`	`63`	`// Compiler Settings`
`@@ -92,7 +92,7 @@ public class CompilerConfiguration`
`92`	`92`	`*/`
`93`	`93`	`private String moduleVersion;`
`94`	`94`
`95`		`- private Collection<Map.Entry<String,String>> customCompilerArguments = new ArrayList<Map.Entry<String,String>>();`
	`95`	`+ private Collection<Map.Entry<String,String>> customCompilerArguments = new ArrayList<>();`
`96`	`96`
`97`	`97`	`private boolean fork;`
`98`	`98`
`@@ -150,7 +150,7 @@ public class CompilerConfiguration`
`150`	`150`	`private List<String> processorPathEntries;`
`151`	`151`
`152`	`152`	`/**`
`153`		`- * default value {@link CompilerReuseStrategy.ReuseCreated}`
	`153`	`+ * default value {@link CompilerReuseStrategy#ReuseCreated}`
`154`	`154`	`*`
`155`	`155`	`* @since 1.9`
`156`	`156`	`*/`
`@@ -193,7 +193,7 @@ public void setClasspathEntries( List<String> classpathEntries )`
`193`	`193`	`}`
`194`	`194`	`else`
`195`	`195`	`{`
`196`		`- this.classpathEntries = new LinkedList<String>( classpathEntries );`
	`196`	`+ this.classpathEntries = new LinkedList<>( classpathEntries );`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
`@@ -219,7 +219,7 @@ public void setModulepathEntries( List<String> modulepathEntries )`
`219`	`219`	`}`
`220`	`220`	`else`
`221`	`221`	`{`
`222`		`- this.modulepathEntries = new LinkedList<String>( modulepathEntries );`
	`222`	`+ this.modulepathEntries = new LinkedList<>( modulepathEntries );`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`
`@@ -240,7 +240,7 @@ public void setSourceFiles( Set<File> sourceFiles )`
`240`	`240`	`}`
`241`	`241`	`else`
`242`	`242`	`{`
`243`		`- this.sourceFiles = new HashSet<File>( sourceFiles );`
	`243`	`+ this.sourceFiles = new HashSet<>( sourceFiles );`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`
`@@ -262,7 +262,7 @@ public void setSourceLocations( List<String> sourceLocations )`
`262`	`262`	`}`
`263`	`263`	`else`
`264`	`264`	`{`
`265`		`- this.sourceLocations = new LinkedList<String>( sourceLocations );`
	`265`	`+ this.sourceLocations = new LinkedList<>( sourceLocations );`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`
`@@ -284,7 +284,7 @@ public void setIncludes( Set<String> includes )`
`284`	`284`	`}`
`285`	`285`	`else`
`286`	`286`	`{`
`287`		`- this.includes = new HashSet<String>( includes );`
	`287`	`+ this.includes = new HashSet<>( includes );`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`
`@@ -306,7 +306,7 @@ public void setExcludes( Set<String> excludes )`
`306`	`306`	`}`
`307`	`307`	`else`
`308`	`308`	`{`
`309`		`- this.excludes = new HashSet<String>( excludes );`
	`309`	`+ this.excludes = new HashSet<>( excludes );`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`
`@@ -421,7 +421,7 @@ public void setModuleVersion( String moduleVersion )`
`421`	`421`
`422`	`422`	`public void addCompilerCustomArgument( String customArgument, String value )`
`423`	`423`	`{`
`424`		`- customCompilerArguments.add( new AbstractMap.SimpleImmutableEntry<String, String>( customArgument, value ) );`
	`424`	`+ customCompilerArguments.add( new AbstractMap.SimpleImmutableEntry<>( customArgument, value ) );`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`/**`
`@@ -431,7 +431,7 @@ public void addCompilerCustomArgument( String customArgument, String value )`
`431`	`431`	`@Deprecated`
`432`	`432`	`public LinkedHashMap<String, String> getCustomCompilerArguments()`
`433`	`433`	`{`
`434`		`- LinkedHashMap<String, String> arguments = new LinkedHashMap<String, String>( customCompilerArguments.size() );`
	`434`	`+ LinkedHashMap<String, String> arguments = new LinkedHashMap<>( customCompilerArguments.size() );`
`435`	`435`	`for ( Map.Entry<String, String> entry : customCompilerArguments )`
`436`	`436`	`{`
`437`	`437`	`arguments.put( entry.getKey(), entry.getValue() );`
`@@ -457,7 +457,7 @@ public void setCustomCompilerArguments( LinkedHashMap<String, String> customComp`
`457`	`457`	`*/`
`458`	`458`	`public Map<String, String> getCustomCompilerArgumentsAsMap()`
`459`	`459`	`{`
`460`		`- LinkedHashMap<String, String> arguments = new LinkedHashMap<String, String>( customCompilerArguments.size() );`
	`460`	`+ LinkedHashMap<String, String> arguments = new LinkedHashMap<>( customCompilerArguments.size() );`
`461`	`461`	`for ( Map.Entry<String, String> entry : customCompilerArguments )`
`462`	`462`	`{`
`463`	`463`	`arguments.put( entry.getKey(), entry.getValue() );`
`@@ -467,7 +467,7 @@ public Map<String, String> getCustomCompilerArgumentsAsMap()`
`467`	`467`
`468`	`468`	`public void setCustomCompilerArgumentsAsMap( Map<String, String> customCompilerArguments )`
`469`	`469`	`{`
`470`		`- this.customCompilerArguments = new ArrayList<Map.Entry<String,String>>();`
	`470`	`+ this.customCompilerArguments = new ArrayList<>();`
`471`	`471`	`if ( customCompilerArguments != null )`
`472`	`472`	`{`
`473`	`473`	`this.customCompilerArguments.addAll( customCompilerArguments.entrySet() );`
`@@ -632,7 +632,7 @@ public String[] getAnnotationProcessors()`
`632`	`632`	`*/`
`633`	`633`	`public void addProcessorPathEntry(String entry) {`
`634`	`634`	`if ( processorPathEntries == null ) {`
`635`		`- processorPathEntries = new LinkedList<String>();`
	`635`	`+ processorPathEntries = new LinkedList<>();`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`processorPathEntries.add( entry );`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public List<CompilerMessage> getCompilerMessages()`
`74`	`74`	`{`
`75`	`75`	`if ( compilerMessages == null )`
`76`	`76`	`{`
`77`		`- this.compilerMessages = new ArrayList<CompilerMessage>();`
	`77`	`+ this.compilerMessages = new ArrayList<>();`
`78`	`78`	`}`
`79`	`79`	`return compilerMessages;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public Set<File> getIncludedSources( File sourceDir, File targetDir )`
`61`	`61`
`62`	`62`	`String[] potentialSources = scanForSources( sourceDir, sourceIncludes, sourceExcludes );`
`63`	`63`
`64`		`- Set<File> matchingSources = new HashSet<File>( potentialSources != null ? potentialSources.length : 0 );`
	`64`	`+ Set<File> matchingSources = new HashSet<>( potentialSources != null ? potentialSources.length : 0 );`
`65`	`65`
`66`	`66`	`if ( potentialSources != null )`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public Set<File> getIncludedSources( File sourceDir, File targetDir )`
`75`	`75`
`76`	`76`	`String[] potentialIncludes = scanForSources( sourceDir, sourceIncludes, sourceExcludes );`
`77`	`77`
`78`		`- Set<File> matchingSources = new HashSet<File>();`
	`78`	`+ Set<File> matchingSources = new HashSet<>();`
`79`	`79`
`80`	`80`	`for ( String path : potentialIncludes )`
`81`	`81`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public SuffixMapping( String sourceSuffix, Set<String> targetSuffixes )`
`47`	`47`
`48`	`48`	`public Set<File> getTargetFiles( File targetDir, String source )`
`49`	`49`	`{`
`50`		`- Set<File> targetFiles = new HashSet<File>();`
	`50`	`+ Set<File> targetFiles = new HashSet<>();`
`51`	`51`
`52`	`52`	`if ( source.endsWith( sourceSuffix ) )`
`53`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`public abstract class AbstractCompilerTckTest`
`38`	`38`	`extends PlexusTestCase`
`39`	`39`	`{`
`40`		`- private static final String EOL = System.getProperty( "line.separator" );`
	`40`	`+ private static final String EOL = System.lineSeparator();`
`41`	`41`
`42`	`42`	`private String roleHint;`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public void setForceJavacCompilerUse( boolean forceJavacCompilerUse )`
`74`	`74`	`protected List<String> getClasspath()`
`75`	`75`	`throws Exception`
`76`	`76`	`{`
`77`		`- List<String> cp = new ArrayList<String>();`
	`77`	`+ List<String> cp = new ArrayList<>();`
`78`	`78`
`79`	`79`	`File file = getLocalArtifactPath( "commons-lang", "commons-lang", "2.0", "jar" );`
`80`	`80`
`@@ -94,8 +94,8 @@ protected void configureCompilerConfig( CompilerConfiguration compilerConfig )`
`94`	`94`	`public void testCompilingSources()`
`95`	`95`	`throws Exception`
`96`	`96`	`{`
`97`		`- List<CompilerMessage> messages = new ArrayList<CompilerMessage>();`
`98`		`- Collection<String> files = new TreeSet<String>();`
	`97`	`+ List<CompilerMessage> messages = new ArrayList<>();`
	`98`	`+ Collection<String> files = new TreeSet<>();`
`99`	`99`
`100`	`100`	`for ( CompilerConfiguration compilerConfig : getCompilerConfigurations() )`
`101`	`101`	`{`
`@@ -153,7 +153,7 @@ public void testCompilingSources()`
`153`	`153`	`assertEquals( "Wrong number of compilation warnings.", expectedWarnings(), numCompilerWarnings );`
`154`	`154`	`}`
`155`	`155`
`156`		`- assertEquals( new TreeSet<String>( normalizePaths( expectedOutputFiles() ) ), files );`
	`156`	`+ assertEquals( new TreeSet<>( normalizePaths( expectedOutputFiles() ) ), files );`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`private List<CompilerConfiguration> getCompilerConfigurations()`
`@@ -165,7 +165,7 @@ private List<CompilerConfiguration> getCompilerConfigurations()`
`165`	`165`	`FileUtils.getFileNames( new File( sourceDir ), "*/.java", null, false, true );`
`166`	`166`	`Collections.sort( filenames );`
`167`	`167`
`168`		`- List<CompilerConfiguration> compilerConfigurations = new ArrayList<CompilerConfiguration>();`
	`168`	`+ List<CompilerConfiguration> compilerConfigurations = new ArrayList<>();`
`169`	`169`
`170`	`170`	`int index = 0;`
`171`	`171`	`for ( Iterator<String> it = filenames.iterator(); it.hasNext(); index++ )`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public class JavaxToolsCompiler`
`49`	`49`	`@SuppressWarnings( "restriction" )`
`50`	`50`	`static final JavaCompiler COMPILER = ToolProvider.getSystemJavaCompiler();`
`51`	`51`
`52`		`- private static List<JavaCompiler> JAVA_COMPILERS = new CopyOnWriteArrayList<JavaCompiler>();`
	`52`	`+ private static List<JavaCompiler> JAVA_COMPILERS = new CopyOnWriteArrayList<>();`
`53`	`53`
`54`	`54`	`protected static JavaCompiler getJavaCompiler( CompilerConfiguration compilerConfiguration )`
`55`	`55`	`{`