share "Compiling" log message logic in AbstractCompiler

codehaus-plexus · Dec 15, 2022 · 37f6843 · 37f6843
1 parent b396872
commit 37f6843
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 18 deletions.
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
@@ -299,4 +299,16 @@ protected static String[] toStringArray( List<String> arguments )
 
         return args;
     }
+
+    protected void logCompiling( String[] sourceFiles, CompilerConfiguration config )
+    {
+        if ( ( getLogger() != null ) && getLogger().isInfoEnabled() )
+        {
+            String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() :
+                config.getWorkingDirectory().toPath().relativize( new File( config.getOutputLocation() ).toPath() ).toString();
+            getLogger().info( "Compiling " +
+                                  ( sourceFiles == null ? "" : ( sourceFiles.length + " source file" + ( sourceFiles.length == 1 ? " " : "s " ) ) ) +
+                                  "to " + to );
+        }
+  }
 }
diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml
@@ -65,6 +65,23 @@
             </path>
           </annotationProcessorPaths>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-api</artifactId>
+            <version>${plexus.compiler.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-javac-errorprone</artifactId>
+            <version>${plexus.compiler.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-javac</artifactId>
+            <version>${plexus.compiler.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/...exus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java b/...exus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java
@@ -320,11 +320,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
             return new CompilerResult();
         }
 
-        String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() :
-            config.getWorkingDirectory().toPath().relativize( destinationDir.toPath() ).toString();
-        System.out.println(
-            "Compiling " + sourceFiles.length + " " + "source file" + ( sourceFiles.length == 1 ? "" : "s" ) + " to "
-                + to );
+        logCompiling( sourceFiles, config );
 
         //        String[] args = buildCompilerArguments( config, sourceFiles );
         AjBuildConfig buildConfig = buildCompilerConfig( config );

diff --git a/...xus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java b/...xus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java
@@ -115,8 +115,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
             return new CompilerResult().success( true );
         }
 
-        System.out.println( "Compiling " + sourceFiles.length + " " + "source file" +
-                                ( sourceFiles.length == 1 ? "" : "s" ) + " to " + destinationDir.getAbsolutePath() );
+        logCompiling( sourceFiles, config );
 
         String[] args = buildCompilerArguments( config, sourceFiles );
 

diff --git a/...piler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/...piler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
@@ -251,6 +251,8 @@ public CompilerResult performCompile( CompilerConfiguration config )
 
         allSources = resortSourcesToPutModuleInfoFirst( allSources );
 
+        logCompiling( null, config );
+
         // Compile
         try
         {

diff --git a/...xus-compiler-j2objc/src/main/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompiler.java b/...xus-compiler-j2objc/src/main/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompiler.java
@@ -122,9 +122,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
             return new CompilerResult().success( true );
         }
 
-        System.out.println(
-            "Compiling " + sourceFiles.length + " " + "source file" + ( sourceFiles.length == 1 ? "" : "s" ) + " to "
-                + destinationDir.getAbsolutePath() );
+        logCompiling( sourceFiles, config );
 
         String[] args = buildCompilerArguments( config, sourceFiles );
 

diff --git a/...plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/...plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
@@ -141,14 +141,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
             return new CompilerResult();
         }
 
-        if ( ( getLogger() != null ) && getLogger().isInfoEnabled() )
-        {
-            String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() :
-                config.getWorkingDirectory().toPath().relativize( destinationDir.toPath() ).toString();
-            getLogger().info( "Compiling " + sourceFiles.length + " " +
-                                  "source file" + ( sourceFiles.length == 1 ? "" : "s" ) +
-                                  " to " + to );
-        }
+        logCompiling( sourceFiles, config );
 
         String[] args = buildCompilerArguments( config, sourceFiles );