HHH-18644: New and improved hibernate-maven-plugin

          - Isolate the message strings for method 'EnhanceMojo#enhanceClass(File)'
  - Use the isolated messages above and add verifications concerning the logging in 'EnhanceMojoTest#testEnhanceClass()'

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

src/main/java/org/hibernate/orm/tooling/maven/enhance/EnhanceMojo.java

@@ -205,19 +205,19 @@ private void performEnhancement() {
      }
 
     private void enhanceClass(File classFile) {
-        getLog().debug("Trying to enhance class file: " + classFile);
+        getLog().debug(TRYING_TO_ENHANCE_CLASS_FILE.formatted(classFile));
         try {
             byte[] newBytes = enhancer.enhance(
                 determineClassName(classFile), 
                 Files.readAllBytes(classFile.toPath()));
             if (newBytes != null) {
                 writeByteCodeToFile(newBytes, classFile);
-                getLog().info("Succesfully enhanced class file: " + classFile);
+                getLog().info(SUCCESFULLY_ENHANCED_CLASS_FILE.formatted(classFile));
             } else {
-                getLog().info("Skipping file: " + classFile);
+                getLog().info(SKIPPING_FILE.formatted(classFile));
             }
         } catch (EnhancementException | IOException e) {
-            getLog().error("An exception occurred while trying to class file: " + classFile, e);;
+            getLog().error(ERROR_WHILE_ENHANCING_CLASS_FILE.formatted(classFile), e);;
          }
     }
 
@@ -261,6 +261,8 @@ private boolean clearFile(File file) {
 
     // info messages
     static final String SUCCESFULLY_CLEARED_FILE = "Succesfully cleared the contents of file: %s";
+    static final String SUCCESFULLY_ENHANCED_CLASS_FILE = "Succesfully enhanced class file: %s";
+    static final String SKIPPING_FILE = "Skipping file: %s";
 
     // warning messages
     static final String PROBLEM_CLEARING_FILE = "Problem clearing file for writing out enhancements [ %s ]";
@@ -270,11 +272,13 @@ private boolean clearFile(File file) {
     static final String UNABLE_TO_DELETE_FILE = "Unable to delete file: %s"; 
     static final String ERROR_WRITING_BYTES_TO_FILE = "Error writing bytes to file : %s";
     static final String ERROR_OPENING_FILE_FOR_WRITING = "Error opening file for writing : %s";
+    static final String ERROR_WHILE_ENHANCING_CLASS_FILE = "An exception occurred while trying to class file: %s";
 
     // debug messages
     static final String TRYING_TO_CLEAR_FILE = "Trying to clear the contents of file: %s";
     static final String AMOUNT_BYTES_WRITTEN_TO_FILE = "%s bytes were succesfully written to file: %s";
     static final String WRITING_BYTE_CODE_TO_FILE = "Writing byte code to file: %s";
     static final String DETERMINE_CLASS_NAME_FOR_FILE = "Determining class name for file: %s";
+    static final String TRYING_TO_ENHANCE_CLASS_FILE = "Trying to enhance class file: %s";
 
 }

src/test/java/org/hibernate/orm/tooling/maven/enhance/EnhanceMojoTest.java

@@ -375,9 +375,14 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                  }               
             });
         long beforeRuns = barClassFile.lastModified();
+        // First Run -> file is modified
         enhancerField.set(enhanceMojo, enhancer);
         assertEquals(0, calls.get(0));
         enhanceClassMethod.invoke(enhanceMojo, barClassFile);
+        // check log messages
+        for (String s: logMessages) {
+        	System.out.println(s);
+        }
         long afterFirstRun = barClassFile.lastModified();
         assertEquals(1, calls.get(0));
         assertTrue(afterFirstRun >= beforeRuns);