HHH-19283: Implementation improvements

Author: VladoKuruc

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmPlugin.java

@@ -15,7 +15,6 @@
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.logging.Logger;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
 
@@ -52,11 +51,10 @@ public void apply(Project project) {
 
 	private void prepareEnhancement(HibernateOrmSpec ormDsl, Project project) {
 		project.getGradle().getTaskGraph().whenReady( (graph) -> {
-			if ( !ormDsl.isEnhancementEnabled() ) {
+			if ( !ormDsl.getEnhancement().isPresent() ) {
 				return;
 			}
 
-			Injected injected = project.getObjects().newInstance(Injected.class);
 			SourceSet sourceSet = resolveSourceSet( ormDsl.getSourceSet().get(), project );
 			final Set<String> languages = ormDsl.getLanguages().getOrNull();
 			if ( languages == null ) {
@@ -75,7 +73,6 @@ private void prepareEnhancement(HibernateOrmSpec ormDsl, Project project) {
 						.getConfigurations()
 						.getByName( sourceSet.getCompileClasspathConfigurationName() );
 				Set<File> dependencyFiles = compileConfig.getFiles();
-				Logger logger = project.getLogger();
 				//noinspection Convert2Lambda
 				languageCompileTask.doLast(new Action<>() {
 					@Override
@@ -84,7 +81,7 @@ public void execute(Task t) {
 							final Method getDestinationDirectory = languageCompileTask.getClass().getMethod("getDestinationDirectory");
 							final DirectoryProperty classesDirectory = (DirectoryProperty) getDestinationDirectory.invoke(languageCompileTask);
 							final ClassLoader classLoader = Helper.toClassLoader(classesDirs, dependencyFiles);
-							EnhancementHelper.enhance(classesDirectory, classLoader, ormDsl, logger, injected.getFileOperations());
+							EnhancementHelper.enhance(classesDirectory, classLoader, ormDsl);
 						}
 						catch (Exception e) {
 							throw new RuntimeException(e);

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmSpec.java

@@ -7,33 +7,42 @@
 import java.util.Arrays;
 
 import org.gradle.api.Action;
+import org.gradle.api.internal.file.FileOperations;
+import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.SetProperty;
-import org.gradle.api.tasks.Nested;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.SourceSet;
 
 import org.hibernate.orm.tooling.gradle.enhance.EnhancementSpec;
 
+import javax.inject.Inject;
+
 /**
  * Main DSL extension for Hibernate ORM.  Available as `project.hibernate`
  */
 public abstract class HibernateOrmSpec {
 	public static final String DSL_NAME = "hibernate";
 
-	private boolean enhancementConfigured = false;
-
 	public HibernateOrmSpec() {
 		getUseSameVersion().convention( true );
 		getSourceSet().convention( SourceSet.MAIN_SOURCE_SET_NAME );
 		getLanguages().convention( Arrays.asList( "java", "kotlin" ) );
 	}
 
+	@Inject
+	abstract public FileOperations getFileOperations();
+
+	@Inject
+	abstract protected ObjectFactory getObjectFactory();
+
+
 	/**
 	 * DSL extension for configuring bytecode enhancement.  Also acts as the trigger for
 	 * opting into bytecode enhancement
 	 */
-	@Nested
-	abstract public EnhancementSpec getEnhancement();
+	@Optional
+	abstract public Property<EnhancementSpec> getEnhancement();
 
 	/**
 	 * Should the plugin inject a dependency on the same version of `hibernate-core`
@@ -61,12 +70,8 @@ public HibernateOrmSpec() {
 	 */
 	@SuppressWarnings("unused")
 	public void enhancement(Action<EnhancementSpec> action) {
-		enhancementConfigured = true;
-		action.execute( getEnhancement() );
-	}
-
-
-	public boolean isEnhancementEnabled() {
-		return enhancementConfigured;
+		EnhancementSpec spec = getObjectFactory().newInstance( EnhancementSpec.class );
+		action.execute( spec );
+		getEnhancement().set( spec );
 	}
 }

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/Injected.java

@@ -16,6 +16,7 @@
 import org.gradle.api.internal.file.FileOperations;
 import org.gradle.api.logging.Logger;
 
+import org.gradle.api.logging.Logging;
 import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
 import org.hibernate.bytecode.enhance.spi.EnhancementContext;
 import org.hibernate.bytecode.enhance.spi.Enhancer;
@@ -30,15 +31,16 @@
  * @author Steve Ebersole
  */
 public class EnhancementHelper {
+	private static final Logger logger = Logging.getLogger( EnhancementHelper.class);
+
 	public static void enhance(
 			DirectoryProperty classesDirectoryProperty,
 			ClassLoader classLoader,
-			HibernateOrmSpec ormDsl,
-			Logger logger, FileOperations fileOperations) {
+			HibernateOrmSpec ormDsl) {
 		final Directory classesDirectory = classesDirectoryProperty.get();
 		final File classesDir = classesDirectory.getAsFile();
 
-		final EnhancementSpec enhancementDsl = ormDsl.getEnhancement();
+		final EnhancementSpec enhancementDsl = ormDsl.getEnhancement().get();
 
 		List<String> classesToEnhance = enhancementDsl.getClassNames().get();
 
@@ -48,10 +50,10 @@ public static void enhance(
 		if ( !enhancementDsl.getEnableDirtyTracking().get() ) {
 			logger.warn( "The 'enableDirtyTracking' configuration is deprecated and will be removed. Set the value to 'true' to get rid of this warning" );
 		}
-		final Enhancer enhancer = generateEnhancer( classLoader, ormDsl );
+		final Enhancer enhancer = generateEnhancer( classLoader, enhancementDsl );
 
-		discoverTypes( classesDir, classesDir, enhancer, logger, fileOperations );
-		doEnhancement( classesDir, classesDir, enhancer, logger, fileOperations, classesToEnhance );
+		discoverTypes( classesDir, classesDir, enhancer, logger, ormDsl.getFileOperations() );
+		doEnhancement( classesDir, classesDir, enhancer, logger, ormDsl.getFileOperations(), classesToEnhance );
 	}
 
 	private static void discoverTypes(File classesDir, File dir, Enhancer enhancer, Logger logger, FileOperations fileOperations) {
@@ -136,8 +138,7 @@ private static byte[] doEnhancement(File javaClassFile, String className, Enhanc
 		}
 	}
 
-	public static Enhancer generateEnhancer(ClassLoader classLoader, HibernateOrmSpec ormDsl) {
-		final EnhancementSpec enhancementDsl = ormDsl.getEnhancement();
+	public static Enhancer generateEnhancer(ClassLoader classLoader, EnhancementSpec enhancementDsl) {
 
 		final EnhancementContext enhancementContext = new DefaultEnhancementContext() {
 			@Override