minor cleanup (#198)

olamy · web-flow · commit 84bcd28c8af7 · 2022-03-06T15:34:44.000+10:00
* minor cleanup

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
@@ -46,13 +46,13 @@ public abstract class AbstractCompiler
 
     protected static final String PS = System.getProperty( "path.separator" );
 
-    private CompilerOutputStyle compilerOutputStyle;
+    private final CompilerOutputStyle compilerOutputStyle;
 
-    private String inputFileEnding;
+    private final String inputFileEnding;
 
-    private String outputFileEnding;
+    private final String outputFileEnding;
 
-    private String outputFile;
+    private final String outputFile;
 
     // ----------------------------------------------------------------------
     //
@@ -152,7 +152,7 @@ protected static Set<String> getSourceFilesForSourceRoot( CompilerConfiguration
 
         if ( includes != null && !includes.isEmpty() )
         {
-            String[] inclStrs = includes.toArray( new String[includes.size()] );
+            String[] inclStrs = includes.toArray( new String[0] );
             scanner.setIncludes( inclStrs );
         }
         else
@@ -164,7 +164,7 @@ protected static Set<String> getSourceFilesForSourceRoot( CompilerConfiguration
 
         if ( excludes != null && !excludes.isEmpty() )
         {
-            String[] exclStrs = excludes.toArray( new String[excludes.size()] );
+            String[] exclStrs = excludes.toArray( new String[0] );
             scanner.setExcludes( exclStrs );
         }
 
@@ -213,7 +213,7 @@ protected static String[] getSourceFiles( CompilerConfiguration config )
         }
         else
         {
-            result = sources.toArray( new String[sources.size()] );
+            result = sources.toArray( new String[0] );
         }
 
         return result;
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerMessage.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerMessage.java
@@ -339,11 +339,8 @@ public enum Kind
          */
         WARNING( "warning" );
 
-        private String type;
-
-        private Kind( final String type )
+        Kind( String type )
         {
-            this.type = type;
         }
     }
 }
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerOutputStyle.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerOutputStyle.java
@@ -57,7 +57,7 @@ public String toString()
 
     public boolean equals( Object other )
     {
-        if ( other == null || !( other instanceof CompilerOutputStyle ) )
+        if ( !( other instanceof CompilerOutputStyle ) )
         {
             return false;
         }
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/StreamPumper.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/StreamPumper.java
@@ -36,13 +36,13 @@ public class StreamPumper
 {
     private static final int BUFFER_SIZE = 512;
 
-    private BufferedInputStream stream;
+    private final BufferedInputStream stream;
 
     private boolean endOfStream = false;
 
     private int SLEEP_TIME = 5;
 
-    private OutputStream out;
+    private final OutputStream out;
 
     public StreamPumper( BufferedInputStream is, OutputStream out )
     {
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
@@ -56,7 +56,7 @@ protected String[] scanForSources( File sourceDir, Set<String> sourceIncludes, S
         }
         else
         {
-            includes = sourceIncludes.toArray( new String[sourceIncludes.size()] );
+            includes = sourceIncludes.toArray( new String[0] );
         }
 
         ds.setIncludes( includes );
@@ -68,7 +68,7 @@ protected String[] scanForSources( File sourceDir, Set<String> sourceIncludes, S
         }
         else
         {
-            excludes = sourceExcludes.toArray( new String[sourceExcludes.size()] );
+            excludes = sourceExcludes.toArray( new String[0] );
         }
 
         ds.setExcludes( excludes );
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
@@ -38,9 +38,9 @@
 public class SimpleSourceInclusionScanner
     extends AbstractSourceInclusionScanner
 {
-    private Set<String> sourceIncludes;
+    private final Set<String> sourceIncludes;
 
-    private Set<String> sourceExcludes;
+    private final Set<String> sourceExcludes;
 
     public SimpleSourceInclusionScanner( Set<String> sourceIncludes, Set<String> sourceExcludes )
     {
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
@@ -42,12 +42,12 @@ public class StaleSourceScanner
 
     public StaleSourceScanner()
     {
-        this( 0, Collections.singleton( "**/*" ), Collections.<String>emptySet() );
+        this( 0, Collections.singleton( "**/*" ), Collections.emptySet() );
     }
 
     public StaleSourceScanner( long lastUpdatedWithinMsecs )
     {
-        this( lastUpdatedWithinMsecs, Collections.singleton( "**/*" ), Collections.<String>emptySet() );
+        this( lastUpdatedWithinMsecs, Collections.singleton( "**/*" ), Collections.emptySet() );
     }
 
     public StaleSourceScanner( long lastUpdatedWithinMsecs, Set<String> sourceIncludes, Set<String> sourceExcludes )
diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SingleTargetSourceMapping.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SingleTargetSourceMapping.java
@@ -38,9 +38,9 @@
 public class SingleTargetSourceMapping
     implements SourceMapping
 {
-    private String sourceSuffix;
+    private final String sourceSuffix;
 
-    private String outputFile;
+    private final String outputFile;
 
     public SingleTargetSourceMapping( String sourceSuffix, String outputFile )
     {
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
@@ -105,7 +105,7 @@ public class JavacCompiler
 
     private static volatile Class<?> JAVAC_CLASS;
 
-    private List<Class<?>> javaccClasses = new CopyOnWriteArrayList<>();
+    private final List<Class<?>> javaccClasses = new CopyOnWriteArrayList<>();
 
     @Requirement
     private InProcessCompiler inProcessCompiler;
@@ -432,7 +432,7 @@ else if ( !suppressSource( config ) )
             args.add( value );
         }
 
-        return args.toArray( new String[args.size()] );
+        return args.toArray( new String[0] );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,13 @@ public abstract class AbstractCompiler`
`46`	`46`
`47`	`47`	`protected static final String PS = System.getProperty( "path.separator" );`
`48`	`48`
`49`		`- private CompilerOutputStyle compilerOutputStyle;`
	`49`	`+ private final CompilerOutputStyle compilerOutputStyle;`
`50`	`50`
`51`		`- private String inputFileEnding;`
	`51`	`+ private final String inputFileEnding;`
`52`	`52`
`53`		`- private String outputFileEnding;`
	`53`	`+ private final String outputFileEnding;`
`54`	`54`
`55`		`- private String outputFile;`
	`55`	`+ private final String outputFile;`
`56`	`56`
`57`	`57`	`// ----------------------------------------------------------------------`
`58`	`58`	`//`
`@@ -152,7 +152,7 @@ protected static Set<String> getSourceFilesForSourceRoot( CompilerConfiguration`
`152`	`152`
`153`	`153`	`if ( includes != null && !includes.isEmpty() )`
`154`	`154`	`{`
`155`		`- String[] inclStrs = includes.toArray( new String[includes.size()] );`
	`155`	`+ String[] inclStrs = includes.toArray( new String[0] );`
`156`	`156`	`scanner.setIncludes( inclStrs );`
`157`	`157`	`}`
`158`	`158`	`else`
`@@ -164,7 +164,7 @@ protected static Set<String> getSourceFilesForSourceRoot( CompilerConfiguration`
`164`	`164`
`165`	`165`	`if ( excludes != null && !excludes.isEmpty() )`
`166`	`166`	`{`
`167`		`- String[] exclStrs = excludes.toArray( new String[excludes.size()] );`
	`167`	`+ String[] exclStrs = excludes.toArray( new String[0] );`
`168`	`168`	`scanner.setExcludes( exclStrs );`
`169`	`169`	`}`
`170`	`170`
`@@ -213,7 +213,7 @@ protected static String[] getSourceFiles( CompilerConfiguration config )`
`213`	`213`	`}`
`214`	`214`	`else`
`215`	`215`	`{`
`216`		`- result = sources.toArray( new String[sources.size()] );`
	`216`	`+ result = sources.toArray( new String[0] );`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -339,11 +339,8 @@ public enum Kind`
`339`	`339`	`*/`
`340`	`340`	`WARNING( "warning" );`
`341`	`341`
`342`		`- private String type;`
`343`		`-`
`344`		`- private Kind( final String type )`
	`342`	`+ Kind( String type )`
`345`	`343`	`{`
`346`		`- this.type = type;`
`347`	`344`	`}`
`348`	`345`	`}`
`349`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public String toString()`
`57`	`57`
`58`	`58`	`public boolean equals( Object other )`
`59`	`59`	`{`
`60`		`- if ( other == null \|\| !( other instanceof CompilerOutputStyle ) )`
	`60`	`+ if ( !( other instanceof CompilerOutputStyle ) )`
`61`	`61`	`{`
`62`	`62`	`return false;`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,13 @@ public class StreamPumper`
`36`	`36`	`{`
`37`	`37`	`private static final int BUFFER_SIZE = 512;`
`38`	`38`
`39`		`- private BufferedInputStream stream;`
	`39`	`+ private final BufferedInputStream stream;`
`40`	`40`
`41`	`41`	`private boolean endOfStream = false;`
`42`	`42`
`43`	`43`	`private int SLEEP_TIME = 5;`
`44`	`44`
`45`		`- private OutputStream out;`
	`45`	`+ private final OutputStream out;`
`46`	`46`
`47`	`47`	`public StreamPumper( BufferedInputStream is, OutputStream out )`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ protected String[] scanForSources( File sourceDir, Set<String> sourceIncludes, S`
`56`	`56`	`}`
`57`	`57`	`else`
`58`	`58`	`{`
`59`		`- includes = sourceIncludes.toArray( new String[sourceIncludes.size()] );`
	`59`	`+ includes = sourceIncludes.toArray( new String[0] );`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`ds.setIncludes( includes );`
`@@ -68,7 +68,7 @@ protected String[] scanForSources( File sourceDir, Set<String> sourceIncludes, S`
`68`	`68`	`}`
`69`	`69`	`else`
`70`	`70`	`{`
`71`		`- excludes = sourceExcludes.toArray( new String[sourceExcludes.size()] );`
	`71`	`+ excludes = sourceExcludes.toArray( new String[0] );`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`ds.setExcludes( excludes );`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@`
`38`	`38`	`public class SimpleSourceInclusionScanner`
`39`	`39`	`extends AbstractSourceInclusionScanner`
`40`	`40`	`{`
`41`		`- private Set<String> sourceIncludes;`
	`41`	`+ private final Set<String> sourceIncludes;`
`42`	`42`
`43`		`- private Set<String> sourceExcludes;`
	`43`	`+ private final Set<String> sourceExcludes;`
`44`	`44`
`45`	`45`	`public SimpleSourceInclusionScanner( Set<String> sourceIncludes, Set<String> sourceExcludes )`
`46`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@ public class StaleSourceScanner`
`42`	`42`
`43`	`43`	`public StaleSourceScanner()`
`44`	`44`	`{`
`45`		`- this( 0, Collections.singleton( "*/" ), Collections.<String>emptySet() );`
	`45`	`+ this( 0, Collections.singleton( "*/" ), Collections.emptySet() );`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public StaleSourceScanner( long lastUpdatedWithinMsecs )`
`49`	`49`	`{`
`50`		`- this( lastUpdatedWithinMsecs, Collections.singleton( "*/" ), Collections.<String>emptySet() );`
	`50`	`+ this( lastUpdatedWithinMsecs, Collections.singleton( "*/" ), Collections.emptySet() );`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public StaleSourceScanner( long lastUpdatedWithinMsecs, Set<String> sourceIncludes, Set<String> sourceExcludes )`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public class JavacCompiler`
`105`	`105`
`106`	`106`	`private static volatile Class<?> JAVAC_CLASS;`
`107`	`107`
`108`		`- private List<Class<?>> javaccClasses = new CopyOnWriteArrayList<>();`
	`108`	`+ private final List<Class<?>> javaccClasses = new CopyOnWriteArrayList<>();`
`109`	`109`
`110`	`110`	`@Requirement`
`111`	`111`	`private InProcessCompiler inProcessCompiler;`
`@@ -432,7 +432,7 @@ else if ( !suppressSource( config ) )`
`432`	`432`	`args.add( value );`
`433`	`433`	`}`
`434`	`434`
`435`		`- return args.toArray( new String[args.size()] );`
	`435`	`+ return args.toArray( new String[0] );`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`/**`