HHH-15597 - Gradle plugin should use full compilation classpath for e…

…nhancement
hibernate · Oct 19, 2022 · 578fbed · 578fbed
1 parent dd2973f
commit 578fbed
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 45 deletions.
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/Helper.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/Helper.java
@@ -12,10 +12,15 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import org.gradle.api.GradleException;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.tasks.SourceSet;
 
 import org.hibernate.bytecode.enhance.spi.Enhancer;
 
@@ -24,57 +29,34 @@
  */
 public class Helper {
 
-	public static String determineCompileSourceSetName(String name) {
-		return determineCompileNameParts( name )[0];
-	}
-
-	public static String[] determineCompileNameParts(String name) {
-		StringBuilder firstPart = null;
-		StringBuilder secondPart = null;
-
-		boolean processingFirstPart = false;
-		boolean processingSecondPart = false;
-		final char[] nameChars = name.toCharArray();
-		for ( int i = 0; i < nameChars.length; i++ ) {
-			final char nameChar = nameChars[ i ];
-			if ( processingFirstPart ) {
-				if ( Character.isUpperCase( nameChar ) ) {
-					// this is the start of the second-part
-					processingFirstPart = false;
-					processingSecondPart = true;
-					secondPart = new StringBuilder( String.valueOf( Character.toLowerCase( nameChar ) ) );
-				}
-				else {
-					firstPart.append( nameChar );
-				}
-			}
-			else if ( processingSecondPart ) {
-				if ( Character.isUpperCase( nameChar ) ) {
-					throw new RuntimeException( "Unexpected compilation task name : " + name );
-				}
-				else {
-					secondPart.append( nameChar );
-				}
-			}
-			else {
-				if ( Character.isUpperCase( nameChar ) ) {
-					processingFirstPart = true;
-					firstPart = new StringBuilder( String.valueOf( Character.toLowerCase( nameChar ) ) );
-				}
-			}
-		}
+	public static ClassLoader toClassLoader(SourceSet sourceSet, Project project) {
+		final List<URL> urls = new ArrayList<>();
 
-		if ( firstPart == null ) {
-			throw new RuntimeException( "Unexpected compilation task name : " + name );
+		final FileCollection classesDirs = sourceSet.getOutput().getClassesDirs();
+		for ( File classesDir : classesDirs ) {
+			urls.add( toUrl( classesDir ) );
 		}
 
-		if ( secondPart == null ) {
-			return new String[] { "main", firstPart.toString() };
+		final Configuration compileConfig = project
+				.getConfigurations()
+				.getByName( sourceSet.getCompileClasspathConfigurationName() );
+		final Set<File> dependencyFiles = compileConfig.getResolvedConfiguration().getFiles();
+		for ( File dependencyFile : dependencyFiles ) {
+			urls.add( toUrl( dependencyFile ) );
 		}
 
-		return new String[] { firstPart.toString(), secondPart.toString() };
+		return new URLClassLoader( urls.toArray(new URL[0]), Enhancer.class.getClassLoader() );
 	}
 
+	private static URL toUrl(File file) {
+		final URI classesDirUri = file.toURI();
+		try {
+			return classesDirUri.toURL();
+		}
+		catch (MalformedURLException e) {
+			throw new GradleException( "Unable to resolve classpath entry to URL : " + file.getAbsolutePath(), e );
+		}
+	}
 
 	public static ClassLoader toClassLoader(FileCollection directories) {
 		final Set<File> files = directories.getFiles();

diff --git a/...nate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmPlugin.java b/...nate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmPlugin.java
@@ -79,7 +79,7 @@ private void prepareEnhancement(HibernateOrmSpec ormDsl, Project project) {
 					@Override
 					public void execute(Task t) {
 						final DirectoryProperty classesDirectory = languageCompileTask.getDestinationDirectory();
-						final ClassLoader classLoader = Helper.toClassLoader( sourceSet.getOutput().getClassesDirs() );
+						final ClassLoader classLoader = Helper.toClassLoader( sourceSet, project );
 
 						EnhancementHelper.enhance( classesDirectory, classLoader, ormDsl, project );
 					}