Merge pull request #17 from rhowe/tidyups

olamy · web-flow · commit de5e97af6b30 · 2019-05-20T16:31:35.000+10:00
Miscellaneous code cleanups
diff --git a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
@@ -1667,7 +1667,7 @@ private List<String> resolveProcessorPathEntries()
 
             resolutionErrorHandler.throwErrors( request, resolutionResult );
 
-            List<String> elements = new ArrayList<String>( resolutionResult.getArtifacts().size() );
+            List<String> elements = new ArrayList<>( resolutionResult.getArtifacts().size() );
 
             for ( Object resolved : resolutionResult.getArtifacts() )
             {
diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
@@ -230,7 +230,7 @@ protected void preparePaths( Set<File> sourceFiles )
                                        .setMainModuleDescriptor( moduleDescriptorPath );
                 
                 Toolchain toolchain = getToolchain();
-                if ( toolchain != null && toolchain instanceof DefaultJavaToolChain )
+                if ( toolchain instanceof DefaultJavaToolChain )
                 {
                     request.setJdkHome( new File( ( (DefaultJavaToolChain) toolchain ).getJavaHome() ) );
                 }
@@ -256,27 +256,22 @@ protected void preparePaths( Set<File> sourceFiles )
                 {
                     pathElements.put( entry.getKey().getPath(), entry.getValue() );
                 }
-                
+
+                if ( compilerArgs == null )
+                {
+                    compilerArgs = new ArrayList<>();
+                }
+
                 for ( File file : resolvePathsResult.getClasspathElements() )
                 {
                     classpathElements.add( file.getPath() );
                     
                     if ( multiReleaseOutput )
                     {
-                        if ( compilerArgs == null )
-                        {
-                            compilerArgs = new ArrayList<>();
-                        }
-                        
                         if ( getOutputDirectory().toPath().startsWith( file.getPath() ) )
                         {
                             compilerArgs.add( "--patch-module" );
-                            
-                            StringBuilder patchModuleValue = new StringBuilder( moduleDescriptor.name() )
-                                            .append( '=' )
-                                            .append( file.getPath() );
-                            
-                            compilerArgs.add( patchModuleValue.toString() );
+                            compilerArgs.add( String.format( "%s=%s", moduleDescriptor.name(), file.getPath() ) );
                         }
                     }
                 }
@@ -286,10 +281,6 @@ protected void preparePaths( Set<File> sourceFiles )
                     modulepathElements.add( file.getPath() );
                 }
                 
-                if ( compilerArgs == null )
-                {
-                    compilerArgs = new ArrayList<>();
-                }
                 compilerArgs.add( "--module-version" );
                 compilerArgs.add( getProject().getVersion() );
                 
diff --git a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
@@ -241,7 +241,7 @@ protected void preparePaths( Set<File> sourceFiles )
                                 .setMainModuleDescriptor( mainModuleDescriptorClassFile.getAbsolutePath() );
 
                 Toolchain toolchain = getToolchain();
-                if ( toolchain != null && toolchain instanceof DefaultJavaToolChain )
+                if ( toolchain instanceof DefaultJavaToolChain )
                 {
                     request.setJdkHome( ( (DefaultJavaToolChain) toolchain ).getJavaHome() );
                 }
@@ -285,7 +285,7 @@ protected void preparePaths( Set<File> sourceFiles )
                                 .setMainModuleDescriptor( testModuleDescriptorJavaFile.getAbsolutePath() );
 
                 Toolchain toolchain = getToolchain();
-                if ( toolchain != null && toolchain instanceof DefaultJavaToolChain )
+                if ( toolchain instanceof DefaultJavaToolChain )
                 {
                     request.setJdkHome( ( (DefaultJavaToolChain) toolchain ).getJavaHome() );
                 }
@@ -336,7 +336,7 @@ else if ( Double.valueOf( getTarget() ) < Double.valueOf( MODULE_INFO_TARGET ) )
                 {
                     if ( compilerArgs == null )
                     {
-                        compilerArgs = new ArrayList<String>();
+                        compilerArgs = new ArrayList<>();
                     }
                     compilerArgs.add( "--patch-module" );
 
@@ -380,7 +380,7 @@ else if ( Double.valueOf( getTarget() ) < Double.valueOf( MODULE_INFO_TARGET ) )
             {
                 if ( compilerArgs == null )
                 {
-                    compilerArgs = new ArrayList<String>();
+                    compilerArgs = new ArrayList<>();
                 }
                 compilerArgs.add( "--patch-module" );
                 
diff --git a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
@@ -161,11 +161,11 @@ public void testCompilerIncludesExcludes()
         CompilerMojo compileMojo =
             getCompilerMojo( "target/test-classes/unit/compiler-includes-excludes-test/plugin-config.xml" );
 
-        Set<String> includes = new HashSet<String>();
+        Set<String> includes = new HashSet<>();
         includes.add( "**/TestCompile4*.java" );
         setVariableValueToObject( compileMojo, "includes", includes );
 
-        Set<String> excludes = new HashSet<String>();
+        Set<String> excludes = new HashSet<>();
         excludes.add( "**/TestCompile2*.java" );
         excludes.add( "**/TestCompile3*.java" );
         setVariableValueToObject( compileMojo, "excludes", excludes );
@@ -275,11 +275,11 @@ public void testOneOutputFileForAllInput2()
 
         setVariableValueToObject( compileMojo, "compilerManager", new CompilerManagerStub() );
 
-        Set<String> includes = new HashSet<String>();
+        Set<String> includes = new HashSet<>();
         includes.add( "**/TestCompile4*.java" );
         setVariableValueToObject( compileMojo, "includes", includes );
 
-        Set<String> excludes = new HashSet<String>();
+        Set<String> excludes = new HashSet<>();
         excludes.add( "**/TestCompile2*.java" );
         excludes.add( "**/TestCompile3*.java" );
         setVariableValueToObject( compileMojo, "excludes", excludes );
@@ -414,7 +414,7 @@ private TestCompilerMojo getTestCompilerMojo( CompilerMojo compilerMojo, String
         File testClassesDir = new File( buildDir, "test-classes" );
         setVariableValueToObject( mojo, "outputDirectory", testClassesDir );
 
-        List<String> testClasspathList = new ArrayList<String>();
+        List<String> testClasspathList = new ArrayList<>();
         
         Artifact junitArtifact = mock( Artifact.class );
         ArtifactHandler handler = mock( ArtifactHandler.class );
diff --git a/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerManagerStub.java b/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerManagerStub.java
@@ -20,7 +20,6 @@
  */
 
 import org.codehaus.plexus.compiler.manager.CompilerManager;
-import org.codehaus.plexus.compiler.manager.NoSuchCompilerException;
 
 /**
  * @author Edwin Punzalan
@@ -41,7 +40,6 @@ public CompilerManagerStub( boolean shouldFail )
     }
 
     public org.codehaus.plexus.compiler.Compiler getCompiler( String compilerId )
-        throws NoSuchCompilerException
     {
         return new CompilerStub( shouldFail );
     }
diff --git a/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerStub.java b/src/test/java/org/apache/maven/plugin/compiler/stubs/CompilerStub.java
@@ -55,25 +55,21 @@ public CompilerOutputStyle getCompilerOutputStyle()
     }
 
     public String getInputFileEnding( CompilerConfiguration compilerConfiguration )
-        throws CompilerException
     {
         return "java";
     }
 
     public String getOutputFileEnding( CompilerConfiguration compilerConfiguration )
-        throws CompilerException
     {
         return "class";
     }
 
     public String getOutputFile( CompilerConfiguration compilerConfiguration )
-        throws CompilerException
     {
         return "output-file";
     }
 
     public boolean canUpdateTarget( CompilerConfiguration compilerConfiguration )
-        throws CompilerException
     {
         return false;
     }
@@ -126,7 +122,6 @@ public CompilerResult performCompile( CompilerConfiguration compilerConfiguratio
     }
 
     public String[] createCommandLine( CompilerConfiguration compilerConfiguration )
-        throws CompilerException
     {
         return new String[0];
     }

Original file line number	Diff line number	Diff line change
`@@ -1667,7 +1667,7 @@ private List<String> resolveProcessorPathEntries()`
`1667`	`1667`
`1668`	`1668`	`resolutionErrorHandler.throwErrors( request, resolutionResult );`
`1669`	`1669`
`1670`		`- List<String> elements = new ArrayList<String>( resolutionResult.getArtifacts().size() );`
	`1670`	`+ List<String> elements = new ArrayList<>( resolutionResult.getArtifacts().size() );`
`1671`	`1671`
`1672`	`1672`	`for ( Object resolved : resolutionResult.getArtifacts() )`
`1673`	`1673`	`{`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ protected void preparePaths( Set<File> sourceFiles )`
`230`	`230`	`.setMainModuleDescriptor( moduleDescriptorPath );`
`231`	`231`
`232`	`232`	`Toolchain toolchain = getToolchain();`
`233`		`- if ( toolchain != null && toolchain instanceof DefaultJavaToolChain )`
	`233`	`+ if ( toolchain instanceof DefaultJavaToolChain )`
`234`	`234`	`{`
`235`	`235`	`request.setJdkHome( new File( ( (DefaultJavaToolChain) toolchain ).getJavaHome() ) );`
`236`	`236`	`}`
`@@ -256,27 +256,22 @@ protected void preparePaths( Set<File> sourceFiles )`
`256`	`256`	`{`
`257`	`257`	`pathElements.put( entry.getKey().getPath(), entry.getValue() );`
`258`	`258`	`}`
`259`		`-`
	`259`	`+`
	`260`	`+ if ( compilerArgs == null )`
	`261`	`+ {`
	`262`	`+ compilerArgs = new ArrayList<>();`
	`263`	`+ }`
	`264`	`+`
`260`	`265`	`for ( File file : resolvePathsResult.getClasspathElements() )`
`261`	`266`	`{`
`262`	`267`	`classpathElements.add( file.getPath() );`
`263`	`268`
`264`	`269`	`if ( multiReleaseOutput )`
`265`	`270`	`{`
`266`		`- if ( compilerArgs == null )`
`267`		`- {`
`268`		`- compilerArgs = new ArrayList<>();`
`269`		`- }`
`270`		`-`
`271`	`271`	`if ( getOutputDirectory().toPath().startsWith( file.getPath() ) )`
`272`	`272`	`{`
`273`	`273`	`compilerArgs.add( "--patch-module" );`
`274`		`-`
`275`		`- StringBuilder patchModuleValue = new StringBuilder( moduleDescriptor.name() )`
`276`		`- .append( '=' )`
`277`		`- .append( file.getPath() );`
`278`		`-`
`279`		`- compilerArgs.add( patchModuleValue.toString() );`
	`274`	`+ compilerArgs.add( String.format( "%s=%s", moduleDescriptor.name(), file.getPath() ) );`
`280`	`275`	`}`
`281`	`276`	`}`
`282`	`277`	`}`
`@@ -286,10 +281,6 @@ protected void preparePaths( Set<File> sourceFiles )`
`286`	`281`	`modulepathElements.add( file.getPath() );`
`287`	`282`	`}`
`288`	`283`
`289`		`- if ( compilerArgs == null )`
`290`		`- {`
`291`		`- compilerArgs = new ArrayList<>();`
`292`		`- }`
`293`	`284`	`compilerArgs.add( "--module-version" );`
`294`	`285`	`compilerArgs.add( getProject().getVersion() );`
`295`	`286`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ protected void preparePaths( Set<File> sourceFiles )`
`241`	`241`	`.setMainModuleDescriptor( mainModuleDescriptorClassFile.getAbsolutePath() );`
`242`	`242`
`243`	`243`	`Toolchain toolchain = getToolchain();`
`244`		`- if ( toolchain != null && toolchain instanceof DefaultJavaToolChain )`
	`244`	`+ if ( toolchain instanceof DefaultJavaToolChain )`
`245`	`245`	`{`
`246`	`246`	`request.setJdkHome( ( (DefaultJavaToolChain) toolchain ).getJavaHome() );`
`247`	`247`	`}`
`@@ -285,7 +285,7 @@ protected void preparePaths( Set<File> sourceFiles )`
`285`	`285`	`.setMainModuleDescriptor( testModuleDescriptorJavaFile.getAbsolutePath() );`
`286`	`286`
`287`	`287`	`Toolchain toolchain = getToolchain();`
`288`		`- if ( toolchain != null && toolchain instanceof DefaultJavaToolChain )`
	`288`	`+ if ( toolchain instanceof DefaultJavaToolChain )`
`289`	`289`	`{`
`290`	`290`	`request.setJdkHome( ( (DefaultJavaToolChain) toolchain ).getJavaHome() );`
`291`	`291`	`}`
`@@ -336,7 +336,7 @@ else if ( Double.valueOf( getTarget() ) < Double.valueOf( MODULE_INFO_TARGET ) )`
`336`	`336`	`{`
`337`	`337`	`if ( compilerArgs == null )`
`338`	`338`	`{`
`339`		`- compilerArgs = new ArrayList<String>();`
	`339`	`+ compilerArgs = new ArrayList<>();`
`340`	`340`	`}`
`341`	`341`	`compilerArgs.add( "--patch-module" );`
`342`	`342`
`@@ -380,7 +380,7 @@ else if ( Double.valueOf( getTarget() ) < Double.valueOf( MODULE_INFO_TARGET ) )`
`380`	`380`	`{`
`381`	`381`	`if ( compilerArgs == null )`
`382`	`382`	`{`
`383`		`- compilerArgs = new ArrayList<String>();`
	`383`	`+ compilerArgs = new ArrayList<>();`
`384`	`384`	`}`
`385`	`385`	`compilerArgs.add( "--patch-module" );`
`386`	`386`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`*/`
`21`	`21`
`22`	`22`	`import org.codehaus.plexus.compiler.manager.CompilerManager;`
`23`		`-import org.codehaus.plexus.compiler.manager.NoSuchCompilerException;`
`24`	`23`
`25`	`24`	`/**`
`26`	`25`	`* @author Edwin Punzalan`
`@@ -41,7 +40,6 @@ public CompilerManagerStub( boolean shouldFail )`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`public org.codehaus.plexus.compiler.Compiler getCompiler( String compilerId )`
`44`		`- throws NoSuchCompilerException`
`45`	`43`	`{`
`46`	`44`	`return new CompilerStub( shouldFail );`
`47`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,25 +55,21 @@ public CompilerOutputStyle getCompilerOutputStyle()`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public String getInputFileEnding( CompilerConfiguration compilerConfiguration )`
`58`		`- throws CompilerException`
`59`	`58`	`{`
`60`	`59`	`return "java";`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`public String getOutputFileEnding( CompilerConfiguration compilerConfiguration )`
`64`		`- throws CompilerException`
`65`	`63`	`{`
`66`	`64`	`return "class";`
`67`	`65`	`}`
`68`	`66`
`69`	`67`	`public String getOutputFile( CompilerConfiguration compilerConfiguration )`
`70`		`- throws CompilerException`
`71`	`68`	`{`
`72`	`69`	`return "output-file";`
`73`	`70`	`}`
`74`	`71`
`75`	`72`	`public boolean canUpdateTarget( CompilerConfiguration compilerConfiguration )`
`76`		`- throws CompilerException`
`77`	`73`	`{`
`78`	`74`	`return false;`
`79`	`75`	`}`
`@@ -126,7 +122,6 @@ public CompilerResult performCompile( CompilerConfiguration compilerConfiguratio`
`126`	`122`	`}`
`127`	`123`
`128`	`124`	`public String[] createCommandLine( CompilerConfiguration compilerConfiguration )`
`129`		`- throws CompilerException`
`130`	`125`	`{`
`131`	`126`	`return new String[0];`
`132`	`127`	`}`