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

  - Iterate over the 'fileSets' parameter in 'EnhanceMojo#assembleSourceSet()' and call 'EnhanceMojo#addFileSetToSourceSet(FileSet)' for each fileSet found
  - Adapt test class EnhanceMojoTest
    * Add a new field 'fileSetsField' and populate it in the 'EnhanceMojoTest#beforeEach()' method
    * Change test method 'EnhanceMojoTest#testAssembleSourceSet()' to prepare and set a fileSet in the 'enhanceMojo' object under test
    * Use the new 'fileSetsField' instance variable in the test method 'EnhanceMojoTest#testProcessParameters()'
  - Adapt the integration test
    * Add a new java class 'org.foo.Baz'
    * Add some new 'fileSets' configuration to the 'pom.xml'
    * Add some new assertions to the 'verify.groovy' script

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

Author: koentsje

src/it/enhance/pom.xml

@@ -25,6 +25,14 @@
             <id>enhance</id>
             <phase>process-classes</phase>
             <configuration>
+              <fileSets>
+                <fileSet>
+                  <directory>${project.build.directory}/classes</directory>
+                  <excludes>
+                    <exclude>**/Baz.class</exclude>
+                  </excludes>
+                </fileSet>
+              </fileSets>
               <enableLazyInitialization>true</enableLazyInitialization>
             </configuration>
             <goals>

src/it/enhance/src/main/java/org/foo/Baz.java

@@ -0,0 +1,18 @@
+package org.foo;
+
+import jakarta.persistence.Entity;
+
+@Entity
+public class Baz {
+
+    private String foo;
+
+    String getFoo() {
+        return foo;
+    }
+
+    public void setFoo(String f) {
+        foo = f;
+    }
+
+}

src/it/enhance/verify.groovy

@@ -27,6 +27,11 @@ if (!fooClassFile.exists()) {
     throw new FileNotFoundException("File should exist: " + fooClassFile);
 }
 
+File bazClassFile = new File(classesFolder, "org/foo/Baz.class");
+if (!bazClassFile.exists()) {
+    throw new FileNotFoundException("File should exist: " + bazClassFile);
+}
+
 File buildLog = new File(basedir, "build.log");
 if (!buildLog.exists()) {
     throw new FileNotFoundException("File should exist: " + buildLog);
@@ -41,7 +46,12 @@ assert listOfStrings.contains("[DEBUG]   (f) enableLazyInitialization = true");
 assert listOfStrings.contains("[DEBUG]   (f) enableExtendedEnhancement = false");
 assert listOfStrings.contains("[DEBUG] Starting execution of enhance mojo");
 assert listOfStrings.contains("[DEBUG] Starting assembly of the source set");
+assert listOfStrings.contains("[DEBUG] Processing FileSet");
+assert listOfStrings.contains("[DEBUG] Using base directory: " + classesFolder);
 assert listOfStrings.contains("[INFO] Added file to source set: " + barClassFile);
+assert listOfStrings.contains("[INFO] Added file to source set: " + fooClassFile);
+assert !listOfStrings.contains("[INFO] Added file to source set: " + bazClassFile);
+assert listOfStrings.contains("[DEBUG] FileSet was processed succesfully");
 assert listOfStrings.contains("[DEBUG] Ending the assembly of the source set");
 assert listOfStrings.contains("[DEBUG] Creating bytecode enhancer");
 assert listOfStrings.contains("[DEBUG] Creating enhancement context");

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

@@ -104,7 +104,9 @@ private void processParameters() {
 
     private void assembleSourceSet() {
         getLog().debug("Starting assembly of the source set");
-        addToSourceSetIfNeeded(classesDirectory);
+        for (FileSet fileSet : fileSets) {
+            addFileSetToSourceSet(fileSet);
+        }
         getLog().debug("Ending the assembly of the source set");
     }
 

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

@@ -56,6 +56,7 @@ public class EnhanceMojoTest {
     private List<String> logMessages = new ArrayList<String>();
 
     private Field classesDirectoryField;
+    private Field fileSetsField;
     private Field sourceSetField;
     private Field enhancerField;
 
@@ -71,6 +72,8 @@ public class EnhanceMojoTest {
     void beforeEach() throws Exception {
         classesDirectoryField = EnhanceMojo.class.getDeclaredField("classesDirectory");
         classesDirectoryField.setAccessible(true);
+        fileSetsField = EnhanceMojo.class.getDeclaredField("fileSets");
+        fileSetsField.setAccessible(true);
         sourceSetField = EnhanceMojo.class.getDeclaredField("sourceSet");
         sourceSetField.setAccessible(true);  
         enhancerField = EnhanceMojo.class.getDeclaredField("enhancer");
@@ -94,6 +97,10 @@ void beforeEach() throws Exception {
     void testAssembleSourceSet() throws Exception {
         Method assembleSourceSetMethod = EnhanceMojo.class.getDeclaredMethod("assembleSourceSet");
         assembleSourceSetMethod.setAccessible(true);
+        FileSet[] fileSets = new FileSet[1];
+        fileSets[0] = new FileSet();
+        fileSets[0].setDirectory(classesDirectory.getAbsolutePath());
+        fileSetsField.set(enhanceMojo, fileSets);
         List<?> sourceSet = (List<?>)sourceSetField.get(enhanceMojo);
         assertTrue(sourceSet.isEmpty());
         assembleSourceSetMethod.invoke(enhanceMojo);
@@ -492,8 +499,6 @@ void testProcessParameters() throws Exception {
         enableLazyInitializationField.setAccessible(true);
         Field enableDirtyTrackingField = EnhanceMojo.class.getDeclaredField("enableDirtyTracking");
         enableDirtyTrackingField.setAccessible(true);
-        Field fileSetsField = EnhanceMojo.class.getDeclaredField("fileSets");
-        fileSetsField.setAccessible(true);
         assertTrue(logMessages.isEmpty());
         assertNull(fileSetsField.get(enhanceMojo));
         verifyParametersMethod.invoke(enhanceMojo);