Introduce provider methods to allow replacement by subclassing

Author: nicerloop

plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java

@@ -173,7 +173,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
             {
                 // use fqcn to prevent loading of the class on 1.5 environment !
                 result =
-                    new org.codehaus.plexus.compiler.javac.JavaxToolsCompiler().compileInProcess( args, config, sourceFiles );
+                    javaxToolsCompiler().compileInProcess( args, config, sourceFiles );
             }
             else
             {
@@ -184,6 +184,11 @@ public CompilerResult performCompile( CompilerConfiguration config )
         return result;
     }
 
+	protected JavaxToolsCompiler javaxToolsCompiler()
+	{
+		return new org.codehaus.plexus.compiler.javac.JavaxToolsCompiler();
+	}
+
     protected static boolean isJava16()
     {
         try

plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompiler.java

@@ -47,7 +47,12 @@ public class JavaxToolsCompiler
      * is that thread safe ???
      */
     @SuppressWarnings( "restriction" )
-    private final JavaCompiler COMPILER = ToolProvider.getSystemJavaCompiler();
+    private final JavaCompiler COMPILER = newJavaCompiler();
+
+	protected JavaCompiler newJavaCompiler()
+	{
+		return ToolProvider.getSystemJavaCompiler();
+	}
 
     private List<JavaCompiler> JAVA_COMPILERS = new CopyOnWriteArrayList<>();
 
@@ -56,7 +61,7 @@ private JavaCompiler getJavaCompiler( CompilerConfiguration compilerConfiguratio
         switch ( compilerConfiguration.getCompilerReuseStrategy() )
         {
             case AlwaysNew:
-                return ToolProvider.getSystemJavaCompiler();
+                return newJavaCompiler();
             case ReuseCreated:
                 JavaCompiler javaCompiler;
                 synchronized ( JAVA_COMPILERS )
@@ -68,7 +73,7 @@ private JavaCompiler getJavaCompiler( CompilerConfiguration compilerConfiguratio
                         return javaCompiler;
                     }
                 }
-                javaCompiler = ToolProvider.getSystemJavaCompiler();
+                javaCompiler = newJavaCompiler();
                 return javaCompiler;
             case ReuseSame:
             default: