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 index 45abc8c5..02137c17 100644 --- 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 sourceMappings = new ArrayList(); + private final List 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 index 27e9ca1a..32f4dad6 100644 --- 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(); + 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 index cf980658..cdab5047 100644 --- 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 targets = new HashSet(); + Set targets = new HashSet<>(); targets.add( ".class" ); targets.add( ".xml" ); @@ -88,7 +88,7 @@ public void testShouldReturnNoTargetFilesWhenSourceFileHasWrongSuffix() File basedir = new File( "." ); - Set targets = new HashSet(); + Set 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 index d9f72f02..7487cf2c 100644 --- 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 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 index 0f70efca..156e166e 100644 --- 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 cp = new LinkedList( config.getClasspathEntries() ); + List 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 elements = new ArrayList( cp.size() ); + List elements = new ArrayList<>( cp.size() ); for ( String path : cp ) { elements.add( ( new File( path ) ).getAbsolutePath() ); @@ -473,11 +473,7 @@ private List 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 compileInProcess( AjBuildConfig buildConfig ) boolean errors = messageHandler.hasAnyMessage( IMessage.ERROR, true ); - List messages = new ArrayList(); + List messages = new ArrayList<>(); if ( errors ) { IMessage[] errorMessages = messageHandler.getMessages( IMessage.ERROR, true ); @@ -554,7 +550,7 @@ private void checkForAspectJRT( List cp ) private List buildFileList( List locations ) { - List fileList = new LinkedList(); + List 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 index aceb8762..8ef8aefb 100644 --- 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 getAJOptions() public void setSourcePathResources( Map sourcePathResources ) { - this.sourcePathResources = new TreeMap( sourcePathResources ); + this.sourcePathResources = new TreeMap<>( sourcePathResources ); } public Map 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 index fb4bac05..3266f925 100644 --- 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 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 index a548d3d4..54643673 100644 --- 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 index 695b7e00..5b897378 100644 --- 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 index 33766bb7..5c2348bc 100644 --- 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 index babdc696..b4902e7d 100644 --- 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 Jason van Zyl 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 index 63bc5722..55f655ce 100644 --- 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> javaccClasses = new CopyOnWriteArrayList>(); + private List> javaccClasses = new CopyOnWriteArrayList<>(); // ---------------------------------------------------------------------- // @@ -686,26 +686,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 ); } @@ -826,9 +814,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; } @@ -970,12 +958,7 @@ 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 ); } @@ -983,11 +966,11 @@ else if ( msgLine.endsWith( "^" ) ) 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; @@ -1020,9 +1003,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 index 4928f650..d0b0bd1b 100644 --- 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 collector = new DiagnosticCollector(); + final DiagnosticCollector 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 compilerMsgs = new ArrayList(); + final ArrayList compilerMsgs = new ArrayList<>(); for ( Diagnostic 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 index 0f413940..7632d0f5 100644 --- 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 customCompilerArguments = new LinkedHashMap(); + Map 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 classpathEntries = new ArrayList(); + List classpathEntries = new ArrayList<>(); classpathEntries.add( "/myjar1.jar" ); @@ -508,7 +508,7 @@ private void populateArguments( CompilerConfiguration compilerConfiguration, Lis // sourceRoots - List compileSourceRoots = new ArrayList(); + List compileSourceRoots = new ArrayList<>(); compileSourceRoots.add( "/src/main/one" ); @@ -580,7 +580,7 @@ private void populateArguments( CompilerConfiguration compilerConfiguration, Lis // customerCompilerArguments - Map customerCompilerArguments = new LinkedHashMap(); + Map 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 index cb14c8bb..75ed8a79 100644 --- 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 compilerMessages = JavacCompiler.parseModernStream( 0, new BufferedReader( new StringReader( errors ) ) ); assertEquals( "count", 187, compilerMessages.size() ); - List compilerErrors = new ArrayList( 3 ); + List 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 index fa5121c9..ef9b8ee5 100644 --- 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 @@ -278,9 +278,9 @@ public String[] createCommandLine( CompilerConfiguration config ) getLogger().debug( "create TempFile" + tempFileName ); tempFile.getParentFile().mkdirs(); - for ( int i = 0; i < sourceFiles.length; i++ ) + for ( String sourceFile : sourceFiles ) { - fw.write( sourceFiles[i] ); + fw.write( sourceFile ); fw.newLine(); } tempFile.deleteOnExit(); @@ -295,9 +295,9 @@ public String[] createCommandLine( CompilerConfiguration config ) } else { - for ( int i = 0; i < sourceFiles.length; i++ ) + for ( String sourceFile : sourceFiles ) { - args.add( sourceFiles[i] ); + args.add( sourceFile ); } } @@ -471,7 +471,7 @@ private CompilerMessage parseError( String error ) message.append( ':' ).append( errorBits[i++] ); } - return new CompilerMessage( file, type.indexOf( "Error" ) > -1, startline, startcolumn, endline, endcolumn, + return new CompilerMessage( file, type.contains("Error"), startline, startcolumn, endline, endcolumn, message.toString() ); } }