Some miscellaneous linting fixups (#152)

rhowe · web-flow · commit 4291bb706b9e · 2021-09-11T14:32:49.000+02:00
* Remove unused imports

* Replace for loops with foreach loops

* Prefer String.contains() over String.indexOf()

* Remove unnecessary unboxing

* Use try-with-resources in JarUtil

* Merge identical catch blocks

* Use &lt;&gt; where we can
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/AbstractSourceInclusionScanner.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/AbstractSourceInclusionScanner.java
@@ -31,7 +31,7 @@
 public abstract class AbstractSourceInclusionScanner
     implements SourceInclusionScanner
 {
-    private final List<SourceMapping> sourceMappings = new ArrayList<SourceMapping>();
+    private final List<SourceMapping> sourceMappings = new ArrayList<>();
 
     public final void addSourceMapping( SourceMapping sourceMapping )
     {
diff --git a/plexus-compiler-api/src/test/java/org/codehaus/plexus/compiler/util/scan/SimpleSourceInclusionScannerTest.java b/plexus-compiler-api/src/test/java/org/codehaus/plexus/compiler/util/scan/SimpleSourceInclusionScannerTest.java
@@ -38,7 +38,7 @@ protected void setUp()
         super.setUp();
 
         includes = Collections.singleton( "*.java" );
-        excludes = new HashSet<String>();
+        excludes = new HashSet<>();
         scanner = new SimpleSourceInclusionScanner( includes, excludes );
     }
 
diff --git a/plexus-compiler-api/src/test/java/org/codehaus/plexus/compiler/util/scan/mapping/SuffixMappingTest.java b/plexus-compiler-api/src/test/java/org/codehaus/plexus/compiler/util/scan/mapping/SuffixMappingTest.java
@@ -66,7 +66,7 @@ public void testShouldReturnOneClassFileAndOneXmlFileForSingleJavaFile()
 
         File basedir = new File( "." );
 
-        Set<String> targets = new HashSet<String>();
+        Set<String> targets = new HashSet<>();
         targets.add( ".class" );
         targets.add( ".xml" );
 
@@ -88,7 +88,7 @@ public void testShouldReturnNoTargetFilesWhenSourceFileHasWrongSuffix()
 
         File basedir = new File( "." );
 
-        Set<String> targets = new HashSet<String>();
+        Set<String> targets = new HashSet<>();
         targets.add( ".class" );
         targets.add( ".xml" );
 
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
@@ -77,9 +77,9 @@ public void testDeprecation()
 
         assertFalse( error.isError() );
 
-        assertTrue( error.getMessage().indexOf( "Date" ) != -1 );
+        assertTrue( error.getMessage().contains( "Date" ) );
 
-        assertTrue( error.getMessage().indexOf( "deprecated" ) != -1 );
+        assertTrue( error.getMessage().contains( "deprecated" ) );
     }
 
     public void testWarning()
@@ -111,7 +111,7 @@ public void testWarning()
 
         assertFalse( error.isError() );
 
-        assertTrue( error.getMessage().indexOf( "finally block does not complete normally" ) != -1 );
+        assertTrue( error.getMessage().contains( "finally block does not complete normally" ) );
     }
 
     protected List<CompilerMessage> compile( CompilerConfiguration configuration )
diff --git a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java b/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java
@@ -366,7 +366,7 @@ private AjBuildConfig buildCompilerConfig( CompilerConfiguration config )
             // buildConfig.setJavaOptions( javaOpts );
         }
 
-        List<String> cp = new LinkedList<String>( config.getClasspathEntries() );
+        List<String> cp = new LinkedList<>( config.getClasspathEntries() );
 
         File javaHomeDir = new File( System.getProperty( "java.home" ) );
         File[] jars = new File( javaHomeDir, "lib" ).listFiles();
@@ -395,7 +395,7 @@ private AjBuildConfig buildCompilerConfig( CompilerConfiguration config )
         checkForAspectJRT( cp );
         if ( cp != null && !cp.isEmpty() )
         {
-            List<String> elements = new ArrayList<String>( cp.size() );
+            List<String> elements = new ArrayList<>( cp.size() );
             for ( String path : cp )
             {
                 elements.add( ( new File( path ) ).getAbsolutePath() );
@@ -473,11 +473,7 @@ private List<CompilerMessage> compileInProcess( AjBuildConfig buildConfig )
         {
             manager.batchBuild( buildConfig, messageHandler );
         }
-        catch ( AbortException e )
-        {
-            throw new CompilerException( "Unknown error while compiling", e );
-        }
-        catch ( IOException e )
+        catch ( AbortException | IOException e )
         {
             throw new CompilerException( "Unknown error while compiling", e );
         }
@@ -493,7 +489,7 @@ private List<CompilerMessage> compileInProcess( AjBuildConfig buildConfig )
 
         boolean errors = messageHandler.hasAnyMessage( IMessage.ERROR, true );
 
-        List<CompilerMessage> messages = new ArrayList<CompilerMessage>();
+        List<CompilerMessage> messages = new ArrayList<>();
         if ( errors )
         {
             IMessage[] errorMessages = messageHandler.getMessages( IMessage.ERROR, true );
@@ -554,7 +550,7 @@ private void checkForAspectJRT( List<String> cp )
 
     private List<File> buildFileList( List<String> locations )
     {
-        List<File> fileList = new LinkedList<File>();
+        List<File> fileList = new LinkedList<>();
         for ( String location : locations )
         {
             fileList.add( new File( location ) );
diff --git a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompilerConfiguration.java b/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompilerConfiguration.java
@@ -109,7 +109,7 @@ public Map<String, String> getAJOptions()
 
     public void setSourcePathResources( Map<String, File> sourcePathResources )
     {
-        this.sourcePathResources = new TreeMap<String, File>( sourcePathResources );
+        this.sourcePathResources = new TreeMap<>( sourcePathResources );
     }
 
     public Map<String, File> getSourcePathResources()
diff --git a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java
@@ -526,11 +526,7 @@ private List<CompilerMessage> compileOutOfProcess( File workingDirectory, File t
 
             messages = parseCompilerOutput( new BufferedReader( new StringReader( stringWriter.toString() ) ) );
         }
-        catch ( CommandLineException e )
-        {
-            throw new CompilerException( "Error while executing the external compiler.", e );
-        }
-        catch ( IOException e )
+        catch ( CommandLineException | IOException e )
         {
             throw new CompilerException( "Error while executing the external compiler.", e );
         }
diff --git a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/DefaultCSharpCompilerParser.java b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/DefaultCSharpCompilerParser.java
@@ -62,7 +62,7 @@ private static boolean isOutputWithNoColumnNumber( String line )
 
         String chunk2 = chunk1.substring( 0, j );
 
-        return ( chunk2.indexOf( "," ) == -1 );
+        return !chunk2.contains( "," );
     }
 
     private static CompilerMessage parseLineWithNoColumnNumber( String line )
@@ -86,7 +86,7 @@ else if ( line.startsWith( COMPILATION_PREFIX ) )
 
             return null;
         }
-        else if ( line.indexOf( MAGIC_LINE_MARKER ) != -1 )
+        else if ( line.contains( MAGIC_LINE_MARKER ) )
         {
             int i = line.indexOf( MAGIC_LINE_MARKER );
 
@@ -102,7 +102,7 @@ else if ( line.indexOf( MAGIC_LINE_MARKER ) != -1 )
 
             message = line.substring( j + 1 + ERROR_PREFIX.length() );
 
-            error = line.indexOf( ") error" ) != -1;
+            error = line.contains( ") error" );
         }
         else
         {
@@ -134,7 +134,7 @@ else if ( line.startsWith( COMPILATION_PREFIX ) )
         {
             return null;
         }
-        else if ( line.indexOf( MAGIC_LINE_MARKER ) != -1 )
+        else if ( line.contains( MAGIC_LINE_MARKER ) )
         {
             int i = line.indexOf( MAGIC_LINE_MARKER );
 
@@ -147,7 +147,7 @@ else if ( line.indexOf( MAGIC_LINE_MARKER ) != -1 )
             String linenum = null;
             String colnum = null;
 
-            if ( linecol.indexOf( "," ) > -1 && linecol.split( "," ).length == 2 )
+            if ( linecol.contains( "," ) && linecol.split( "," ).length == 2 )
             {
                 linenum = linecol.split( "," )[0];
                 colnum = linecol.split( "," )[1];
@@ -173,7 +173,7 @@ else if ( linecol.split( "," ).length == 1 )
 
             message = line.substring( j + 1 + ERROR_PREFIX.length() );
 
-            error = line.indexOf( "): error" ) != -1;
+            error = line.contains( "): error" );
         }
         else
         {
diff --git a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/JarUtil.java b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/JarUtil.java
@@ -21,20 +21,13 @@ public static void extract( File destDir, File jarFile ) throws IOException
                 f.mkdir();
                 continue;
             }
-            InputStream is = jar.getInputStream( file );
-            FileOutputStream fos = new FileOutputStream( f );
-            try
+            try ( InputStream is = jar.getInputStream( file ); FileOutputStream fos = new FileOutputStream( f ) )
             {
                 while ( is.available() > 0 )
                 {
                     fos.write( is.read() );
                 }
             }
-            finally
-            {
-                is.close();
-                fos.close();
-            }
         }
     }
 }
diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/src/main/java/org/codehaus/plexus/compiler/javac/errorprone/JavacCompilerWithErrorProne.java b/plexus-compilers/plexus-compiler-javac-errorprone/src/main/java/org/codehaus/plexus/compiler/javac/errorprone/JavacCompilerWithErrorProne.java
@@ -29,7 +29,6 @@
 import org.codehaus.plexus.component.annotations.Component;
 
 import javax.tools.JavaCompiler;
-import javax.tools.ToolProvider;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java b/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
@@ -29,9 +29,6 @@
 
 import java.lang.reflect.Field;
 import java.net.URLClassLoader;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:jason@plexus.org">Jason van Zyl</a>
diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
@@ -104,7 +104,7 @@ public class JavacCompiler
 
     private static volatile Class<?> JAVAC_CLASS;
 
-    private List<Class<?>> javaccClasses = new CopyOnWriteArrayList<Class<?>>();
+    private List<Class<?>> javaccClasses = new CopyOnWriteArrayList<>();
 
     // ----------------------------------------------------------------------
     //
@@ -682,26 +682,14 @@ private static CompilerResult compileInProcess0( Class<?> javacClass, String[] a
 
             ok = (Integer) compile.invoke( null, new Object[]{ args, new PrintWriter( out ) } );
 
-            messages = parseModernStream( ok.intValue(), new BufferedReader( new StringReader( out.toString() ) ) );
+            messages = parseModernStream( ok, new BufferedReader( new StringReader( out.toString() ) ) );
         }
-        catch ( NoSuchMethodException e )
-        {
-            throw new CompilerException( "Error while executing the compiler.", e );
-        }
-        catch ( IllegalAccessException e )
-        {
-            throw new CompilerException( "Error while executing the compiler.", e );
-        }
-        catch ( InvocationTargetException e )
-        {
-            throw new CompilerException( "Error while executing the compiler.", e );
-        }
-        catch ( IOException e )
+        catch ( NoSuchMethodException | IOException | InvocationTargetException | IllegalAccessException e )
         {
             throw new CompilerException( "Error while executing the compiler.", e );
         }
 
-        boolean success = ok.intValue() == 0;
+        boolean success = ok == 0;
         return new CompilerResult( success, messages );
     }
 
@@ -822,9 +810,9 @@ private static boolean isNote( String line )
 
     private static boolean startsWithPrefix( String line, String[] prefixes )
     {
-        for ( int i = 0; i < prefixes.length; i++ )
+        for ( String prefix : prefixes )
         {
-            if ( line.startsWith( prefixes[i] ) )
+            if ( line.startsWith( prefix ) )
             {
                 return true;
             }
@@ -966,24 +954,19 @@ else if ( msgLine.endsWith( "^" ) )
         catch ( NoSuchElementException e )
         {
             return new CompilerMessage( "no more tokens - could not parse error message: " + error, isError );
-        }
-        catch ( NumberFormatException e )
-        {
-            return new CompilerMessage( "could not parse error message: " + error, isError );
-        }
-        catch ( Exception e )
+        } catch ( Exception e )
         {
             return new CompilerMessage( "could not parse error message: " + error, isError );
         }
     }
 
     private static String getWarnPrefix( String msg )
     {
-        for ( int i = 0; i < WARNING_PREFIXES.length; i++ )
+        for ( String warningPrefix : WARNING_PREFIXES )
         {
-            if ( msg.startsWith( WARNING_PREFIXES[i] ) )
+            if ( msg.startsWith( warningPrefix ) )
             {
-                return WARNING_PREFIXES[i];
+                return warningPrefix;
             }
         }
         return null;
@@ -1016,9 +999,9 @@ private File createFileWithArguments( String[] args, String outputDirectory )
 
             writer = new PrintWriter( new FileWriter( tempFile ) );
 
-            for ( int i = 0; i < args.length; i++ )
+            for ( String arg : args )
             {
-                String argValue = args[i].replace( File.separatorChar, '/' );
+                String argValue = arg.replace( File.separatorChar, '/' );
 
                 writer.write( "\"" + argValue + "\"" );
 
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
@@ -113,7 +113,7 @@ public CompilerResult compileInProcess( String[] args, final CompilerConfigurati
             }
             final String sourceEncoding = config.getSourceEncoding();
             final Charset sourceCharset = sourceEncoding == null ? null : Charset.forName( sourceEncoding );
-            final DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<JavaFileObject>();
+            final DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<>();
             try ( final StandardJavaFileManager standardFileManager =
                 compiler.getStandardFileManager( collector, null, sourceCharset ) )
             {
@@ -133,7 +133,7 @@ public CompilerResult compileInProcess( String[] args, final CompilerConfigurati
                 final JavaCompiler.CompilationTask task =
                     compiler.getTask( null, standardFileManager, collector, arguments, null, fileObjects );
                 final Boolean result = task.call();
-                final ArrayList<CompilerMessage> compilerMsgs = new ArrayList<CompilerMessage>();
+                final ArrayList<CompilerMessage> compilerMsgs = new ArrayList<>();
                 for ( Diagnostic<? extends JavaFileObject> diagnostic : collector.getDiagnostics() )
                 {
                     CompilerMessage.Kind kind = convertKind(diagnostic);
diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
@@ -287,7 +287,7 @@ public void testJRuntimeArguments()
         expectedArguments.add( "1.3" );
 
         // customCompilerArguments
-        Map<String, String> customCompilerArguments = new LinkedHashMap<String, String>();
+        Map<String, String> customCompilerArguments = new LinkedHashMap<>();
         customCompilerArguments.put( "-J-Duser.language=en_us", null );
         compilerConfiguration.setCustomCompilerArgumentsAsMap( customCompilerArguments );
         // don't expect this argument!!
@@ -494,7 +494,7 @@ private void populateArguments( CompilerConfiguration compilerConfiguration, Lis
 
         // classpathEntires
 
-        List<String> classpathEntries = new ArrayList<String>();
+        List<String> classpathEntries = new ArrayList<>();
 
         classpathEntries.add( "/myjar1.jar" );
 
@@ -508,7 +508,7 @@ private void populateArguments( CompilerConfiguration compilerConfiguration, Lis
 
         // sourceRoots
 
-        List<String> compileSourceRoots = new ArrayList<String>();
+        List<String> compileSourceRoots = new ArrayList<>();
 
         compileSourceRoots.add( "/src/main/one" );
 
@@ -580,7 +580,7 @@ private void populateArguments( CompilerConfiguration compilerConfiguration, Lis
 
         // customerCompilerArguments
 
-        Map<String, String> customerCompilerArguments = new LinkedHashMap<String, String>();
+        Map<String, String> customerCompilerArguments = new LinkedHashMap<>();
 
         customerCompilerArguments.put( "arg1", null );
 
diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/ErrorMessageParserTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/ErrorMessageParserTest.java
@@ -624,7 +624,7 @@ public void testCRLF_windows()
         List<CompilerMessage> compilerMessages =
             JavacCompiler.parseModernStream( 0, new BufferedReader( new StringReader( errors ) ) );
         assertEquals( "count", 187, compilerMessages.size() );
-        List<CompilerMessage> compilerErrors = new ArrayList<CompilerMessage>( 3 );
+        List<CompilerMessage> compilerErrors = new ArrayList<>( 3 );
         for ( CompilerMessage message : compilerMessages ) {
             if ( message.getKind() != CompilerMessage.Kind.OTHER ) {
                 compilerErrors.add( message );
diff --git a/plexus-compilers/plexus-compiler-jikes/src/main/java/org/codehaus/plexus/compiler/jikes/JikesCompiler.java b/plexus-compilers/plexus-compiler-jikes/src/main/java/org/codehaus/plexus/compiler/jikes/JikesCompiler.java

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`public abstract class AbstractSourceInclusionScanner`
`32`	`32`	`implements SourceInclusionScanner`
`33`	`33`	`{`
`34`		`- private final List<SourceMapping> sourceMappings = new ArrayList<SourceMapping>();`
	`34`	`+ private final List<SourceMapping> sourceMappings = new ArrayList<>();`
`35`	`35`
`36`	`36`	`public final void addSourceMapping( SourceMapping sourceMapping )`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected void setUp()`
`38`	`38`	`super.setUp();`
`39`	`39`
`40`	`40`	`includes = Collections.singleton( "*.java" );`
`41`		`- excludes = new HashSet<String>();`
	`41`	`+ excludes = new HashSet<>();`
`42`	`42`	`scanner = new SimpleSourceInclusionScanner( includes, excludes );`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,9 @@ public void testDeprecation()`
`77`	`77`
`78`	`78`	`assertFalse( error.isError() );`
`79`	`79`
`80`		`- assertTrue( error.getMessage().indexOf( "Date" ) != -1 );`
	`80`	`+ assertTrue( error.getMessage().contains( "Date" ) );`
`81`	`81`
`82`		`- assertTrue( error.getMessage().indexOf( "deprecated" ) != -1 );`
	`82`	`+ assertTrue( error.getMessage().contains( "deprecated" ) );`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public void testWarning()`
`@@ -111,7 +111,7 @@ public void testWarning()`
`111`	`111`
`112`	`112`	`assertFalse( error.isError() );`
`113`	`113`
`114`		`- assertTrue( error.getMessage().indexOf( "finally block does not complete normally" ) != -1 );`
	`114`	`+ assertTrue( error.getMessage().contains( "finally block does not complete normally" ) );`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`protected List<CompilerMessage> compile( CompilerConfiguration configuration )`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ private AjBuildConfig buildCompilerConfig( CompilerConfiguration config )`
`366`	`366`	`// buildConfig.setJavaOptions( javaOpts );`
`367`	`367`	`}`
`368`	`368`
`369`		`- List<String> cp = new LinkedList<String>( config.getClasspathEntries() );`
	`369`	`+ List<String> cp = new LinkedList<>( config.getClasspathEntries() );`
`370`	`370`
`371`	`371`	`File javaHomeDir = new File( System.getProperty( "java.home" ) );`
`372`	`372`	`File[] jars = new File( javaHomeDir, "lib" ).listFiles();`
`@@ -395,7 +395,7 @@ private AjBuildConfig buildCompilerConfig( CompilerConfiguration config )`
`395`	`395`	`checkForAspectJRT( cp );`
`396`	`396`	`if ( cp != null && !cp.isEmpty() )`
`397`	`397`	`{`
`398`		`- List<String> elements = new ArrayList<String>( cp.size() );`
	`398`	`+ List<String> elements = new ArrayList<>( cp.size() );`
`399`	`399`	`for ( String path : cp )`
`400`	`400`	`{`
`401`	`401`	`elements.add( ( new File( path ) ).getAbsolutePath() );`
`@@ -473,11 +473,7 @@ private List<CompilerMessage> compileInProcess( AjBuildConfig buildConfig )`
`473`	`473`	`{`
`474`	`474`	`manager.batchBuild( buildConfig, messageHandler );`
`475`	`475`	`}`
`476`		`- catch ( AbortException e )`
`477`		`- {`
`478`		`- throw new CompilerException( "Unknown error while compiling", e );`
`479`		`- }`
`480`		`- catch ( IOException e )`
	`476`	`+ catch ( AbortException \| IOException e )`
`481`	`477`	`{`
`482`	`478`	`throw new CompilerException( "Unknown error while compiling", e );`
`483`	`479`	`}`
`@@ -493,7 +489,7 @@ private List<CompilerMessage> compileInProcess( AjBuildConfig buildConfig )`
`493`	`489`
`494`	`490`	`boolean errors = messageHandler.hasAnyMessage( IMessage.ERROR, true );`
`495`	`491`
`496`		`- List<CompilerMessage> messages = new ArrayList<CompilerMessage>();`
	`492`	`+ List<CompilerMessage> messages = new ArrayList<>();`
`497`	`493`	`if ( errors )`
`498`	`494`	`{`
`499`	`495`	`IMessage[] errorMessages = messageHandler.getMessages( IMessage.ERROR, true );`
`@@ -554,7 +550,7 @@ private void checkForAspectJRT( List<String> cp )`
`554`	`550`
`555`	`551`	`private List<File> buildFileList( List<String> locations )`
`556`	`552`	`{`
`557`		`- List<File> fileList = new LinkedList<File>();`
	`553`	`+ List<File> fileList = new LinkedList<>();`
`558`	`554`	`for ( String location : locations )`
`559`	`555`	`{`
`560`	`556`	`fileList.add( new File( location ) );`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public Map<String, String> getAJOptions()`
`109`	`109`
`110`	`110`	`public void setSourcePathResources( Map<String, File> sourcePathResources )`
`111`	`111`	`{`
`112`		`- this.sourcePathResources = new TreeMap<String, File>( sourcePathResources );`
	`112`	`+ this.sourcePathResources = new TreeMap<>( sourcePathResources );`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`public Map<String, File> getSourcePathResources()`
Original file line number	Diff line number	Diff line change
`@@ -526,11 +526,7 @@ private List<CompilerMessage> compileOutOfProcess( File workingDirectory, File t`
`526`	`526`
`527`	`527`	`messages = parseCompilerOutput( new BufferedReader( new StringReader( stringWriter.toString() ) ) );`
`528`	`528`	`}`
`529`		`- catch ( CommandLineException e )`
`530`		`- {`
`531`		`- throw new CompilerException( "Error while executing the external compiler.", e );`
`532`		`- }`
`533`		`- catch ( IOException e )`
	`529`	`+ catch ( CommandLineException \| IOException e )`
`534`	`530`	`{`
`535`	`531`	`throw new CompilerException( "Error while executing the external compiler.", e );`
`536`	`532`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private static boolean isOutputWithNoColumnNumber( String line )`
`62`	`62`
`63`	`63`	`String chunk2 = chunk1.substring( 0, j );`
`64`	`64`
`65`		`- return ( chunk2.indexOf( "," ) == -1 );`
	`65`	`+ return !chunk2.contains( "," );`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`private static CompilerMessage parseLineWithNoColumnNumber( String line )`
`@@ -86,7 +86,7 @@ else if ( line.startsWith( COMPILATION_PREFIX ) )`
`86`	`86`
`87`	`87`	`return null;`
`88`	`88`	`}`
`89`		`- else if ( line.indexOf( MAGIC_LINE_MARKER ) != -1 )`
	`89`	`+ else if ( line.contains( MAGIC_LINE_MARKER ) )`
`90`	`90`	`{`
`91`	`91`	`int i = line.indexOf( MAGIC_LINE_MARKER );`
`92`	`92`
`@@ -102,7 +102,7 @@ else if ( line.indexOf( MAGIC_LINE_MARKER ) != -1 )`
`102`	`102`
`103`	`103`	`message = line.substring( j + 1 + ERROR_PREFIX.length() );`
`104`	`104`
`105`		`- error = line.indexOf( ") error" ) != -1;`
	`105`	`+ error = line.contains( ") error" );`
`106`	`106`	`}`
`107`	`107`	`else`
`108`	`108`	`{`
`@@ -134,7 +134,7 @@ else if ( line.startsWith( COMPILATION_PREFIX ) )`
`134`	`134`	`{`
`135`	`135`	`return null;`
`136`	`136`	`}`
`137`		`- else if ( line.indexOf( MAGIC_LINE_MARKER ) != -1 )`
	`137`	`+ else if ( line.contains( MAGIC_LINE_MARKER ) )`
`138`	`138`	`{`
`139`	`139`	`int i = line.indexOf( MAGIC_LINE_MARKER );`
`140`	`140`
`@@ -147,7 +147,7 @@ else if ( line.indexOf( MAGIC_LINE_MARKER ) != -1 )`
`147`	`147`	`String linenum = null;`
`148`	`148`	`String colnum = null;`
`149`	`149`
`150`		`- if ( linecol.indexOf( "," ) > -1 && linecol.split( "," ).length == 2 )`
	`150`	`+ if ( linecol.contains( "," ) && linecol.split( "," ).length == 2 )`
`151`	`151`	`{`
`152`	`152`	`linenum = linecol.split( "," )[0];`
`153`	`153`	`colnum = linecol.split( "," )[1];`
`@@ -173,7 +173,7 @@ else if ( linecol.split( "," ).length == 1 )`
`173`	`173`
`174`	`174`	`message = line.substring( j + 1 + ERROR_PREFIX.length() );`
`175`	`175`
`176`		`- error = line.indexOf( "): error" ) != -1;`
	`176`	`+ error = line.contains( "): error" );`
`177`	`177`	`}`
`178`	`178`	`else`
`179`	`179`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,20 +21,13 @@ public static void extract( File destDir, File jarFile ) throws IOException`
`21`	`21`	`f.mkdir();`
`22`	`22`	`continue;`
`23`	`23`	`}`
`24`		`- InputStream is = jar.getInputStream( file );`
`25`		`- FileOutputStream fos = new FileOutputStream( f );`
`26`		`- try`
	`24`	`+ try ( InputStream is = jar.getInputStream( file ); FileOutputStream fos = new FileOutputStream( f ) )`
`27`	`25`	`{`
`28`	`26`	`while ( is.available() > 0 )`
`29`	`27`	`{`
`30`	`28`	`fos.write( is.read() );`
`31`	`29`	`}`
`32`	`30`	`}`
`33`		`- finally`
`34`		`- {`
`35`		`- is.close();`
`36`		`- fos.close();`
`37`		`- }`
`38`	`31`	`}`
`39`	`32`	`}`
`40`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public class JavacCompiler`
`104`	`104`
`105`	`105`	`private static volatile Class<?> JAVAC_CLASS;`
`106`	`106`
`107`		`- private List<Class<?>> javaccClasses = new CopyOnWriteArrayList<Class<?>>();`
	`107`	`+ private List<Class<?>> javaccClasses = new CopyOnWriteArrayList<>();`
`108`	`108`
`109`	`109`	`// ----------------------------------------------------------------------`
`110`	`110`	`//`
`@@ -682,26 +682,14 @@ private static CompilerResult compileInProcess0( Class<?> javacClass, String[] a`
`682`	`682`
`683`	`683`	`ok = (Integer) compile.invoke( null, new Object[]{ args, new PrintWriter( out ) } );`
`684`	`684`
`685`		`- messages = parseModernStream( ok.intValue(), new BufferedReader( new StringReader( out.toString() ) ) );`
	`685`	`+ messages = parseModernStream( ok, new BufferedReader( new StringReader( out.toString() ) ) );`
`686`	`686`	`}`
`687`		`- catch ( NoSuchMethodException e )`
`688`		`- {`
`689`		`- throw new CompilerException( "Error while executing the compiler.", e );`
`690`		`- }`
`691`		`- catch ( IllegalAccessException e )`
`692`		`- {`
`693`		`- throw new CompilerException( "Error while executing the compiler.", e );`
`694`		`- }`
`695`		`- catch ( InvocationTargetException e )`
`696`		`- {`
`697`		`- throw new CompilerException( "Error while executing the compiler.", e );`
`698`		`- }`
`699`		`- catch ( IOException e )`
	`687`	`+ catch ( NoSuchMethodException \| IOException \| InvocationTargetException \| IllegalAccessException e )`
`700`	`688`	`{`
`701`	`689`	`throw new CompilerException( "Error while executing the compiler.", e );`
`702`	`690`	`}`
`703`	`691`
`704`		`- boolean success = ok.intValue() == 0;`
	`692`	`+ boolean success = ok == 0;`
`705`	`693`	`return new CompilerResult( success, messages );`
`706`	`694`	`}`
`707`	`695`
`@@ -822,9 +810,9 @@ private static boolean isNote( String line )`
`822`	`810`
`823`	`811`	`private static boolean startsWithPrefix( String line, String[] prefixes )`
`824`	`812`	`{`
`825`		`- for ( int i = 0; i < prefixes.length; i++ )`
	`813`	`+ for ( String prefix : prefixes )`
`826`	`814`	`{`
`827`		`- if ( line.startsWith( prefixes[i] ) )`
	`815`	`+ if ( line.startsWith( prefix ) )`
`828`	`816`	`{`
`829`	`817`	`return true;`
`830`	`818`	`}`
`@@ -966,24 +954,19 @@ else if ( msgLine.endsWith( "^" ) )`
`966`	`954`	`catch ( NoSuchElementException e )`
`967`	`955`	`{`
`968`	`956`	`return new CompilerMessage( "no more tokens - could not parse error message: " + error, isError );`
`969`		`- }`
`970`		`- catch ( NumberFormatException e )`
`971`		`- {`
`972`		`- return new CompilerMessage( "could not parse error message: " + error, isError );`
`973`		`- }`
`974`		`- catch ( Exception e )`
	`957`	`+ } catch ( Exception e )`
`975`	`958`	`{`
`976`	`959`	`return new CompilerMessage( "could not parse error message: " + error, isError );`
`977`	`960`	`}`
`978`	`961`	`}`
`979`	`962`
`980`	`963`	`private static String getWarnPrefix( String msg )`
`981`	`964`	`{`
`982`		`- for ( int i = 0; i < WARNING_PREFIXES.length; i++ )`
	`965`	`+ for ( String warningPrefix : WARNING_PREFIXES )`
`983`	`966`	`{`
`984`		`- if ( msg.startsWith( WARNING_PREFIXES[i] ) )`
	`967`	`+ if ( msg.startsWith( warningPrefix ) )`
`985`	`968`	`{`
`986`		`- return WARNING_PREFIXES[i];`
	`969`	`+ return warningPrefix;`
`987`	`970`	`}`
`988`	`971`	`}`
`989`	`972`	`return null;`
`@@ -1016,9 +999,9 @@ private File createFileWithArguments( String[] args, String outputDirectory )`
`1016`	`999`
`1017`	`1000`	`writer = new PrintWriter( new FileWriter( tempFile ) );`
`1018`	`1001`
`1019`		`- for ( int i = 0; i < args.length; i++ )`
	`1002`	`+ for ( String arg : args )`
`1020`	`1003`	`{`
`1021`		`- String argValue = args[i].replace( File.separatorChar, '/' );`
	`1004`	`+ String argValue = arg.replace( File.separatorChar, '/' );`
`1022`	`1005`
`1023`	`1006`	`writer.write( "\"" + argValue + "\"" );`
`1024`	`1007`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public CompilerResult compileInProcess( String[] args, final CompilerConfigurati`
`113`	`113`	`}`
`114`	`114`	`final String sourceEncoding = config.getSourceEncoding();`
`115`	`115`	`final Charset sourceCharset = sourceEncoding == null ? null : Charset.forName( sourceEncoding );`
`116`		`- final DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<JavaFileObject>();`
	`116`	`+ final DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<>();`
`117`	`117`	`try ( final StandardJavaFileManager standardFileManager =`
`118`	`118`	`compiler.getStandardFileManager( collector, null, sourceCharset ) )`
`119`	`119`	`{`
`@@ -133,7 +133,7 @@ public CompilerResult compileInProcess( String[] args, final CompilerConfigurati`
`133`	`133`	`final JavaCompiler.CompilationTask task =`
`134`	`134`	`compiler.getTask( null, standardFileManager, collector, arguments, null, fileObjects );`
`135`	`135`	`final Boolean result = task.call();`
`136`		`- final ArrayList<CompilerMessage> compilerMsgs = new ArrayList<CompilerMessage>();`
	`136`	`+ final ArrayList<CompilerMessage> compilerMsgs = new ArrayList<>();`
`137`	`137`	`for ( Diagnostic<? extends JavaFileObject> diagnostic : collector.getDiagnostics() )`
`138`	`138`	`{`
`139`	`139`	`CompilerMessage.Kind kind = convertKind(diagnostic);`