HHH-PENDING build(local plugins): make xjc plugin cache compatible

Description:
XjcListenerImpl use Logger directly instead of project.getLogger()
XjcTask refactor to make an abstract class and receive inputs and outputs injected

Author: kingg22

local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcListenerImpl.java

@@ -5,7 +5,7 @@
 package org.hibernate.build.xjc;
 
 import com.sun.tools.xjc.XJCListener;
-import org.gradle.api.Project;
+import org.gradle.api.logging.Logger;
 import org.xml.sax.SAXParseException;
 
 /**
@@ -15,12 +15,12 @@
  */
 public class XjcListenerImpl extends XJCListener {
 	private final String schemaName;
-	private final Project project;
+	private final Logger logger;
 	private boolean hadErrors;
 
-	public XjcListenerImpl(String schemaName, Project project) {
+	public XjcListenerImpl(String schemaName, Logger logger) {
 		this.schemaName = schemaName;
-		this.project = project;
+		this.logger = logger;
 	}
 
 	public boolean hadErrors() {
@@ -29,33 +29,33 @@ public boolean hadErrors() {
 
 	@Override
 	public void generatedFile(String fileName, int current, int total) {
-		project.getLogger().info( "XJC generated file ({}) : {}", schemaName, fileName );
+		logger.info( "XJC generated file ({}) : {}", schemaName, fileName );
 	}
 
 	@Override
 	public void message(String msg) {
-		project.getLogger().info( "XJC message ({}) : {}", schemaName, msg );
+		logger.info( "XJC message ({}) : {}", schemaName, msg );
 	}
 
 	@Override
 	public void info(SAXParseException exception) {
-		project.getLogger().info( "XJC info ({})", schemaName, exception );
+		logger.info( "XJC info ({})", schemaName, exception );
 	}
 
 	@Override
 	public void warning(SAXParseException exception) {
-		project.getLogger().warn( "XJC warning ({})",schemaName,  exception );
+		logger.warn( "XJC warning ({})",schemaName,  exception );
 	}
 
 	@Override
 	public void error(SAXParseException exception) {
 		hadErrors = true;
-		project.getLogger().error( "XJC error ({})", schemaName, exception );
+		logger.error( "XJC error ({})", schemaName, exception );
 	}
 
 	@Override
 	public void fatalError(SAXParseException exception) {
 		hadErrors = true;
-		project.getLogger().error( "XJC fatal error ({})", schemaName, exception );
+		logger.error( "XJC fatal error ({})", schemaName, exception );
 	}
 }

local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcTask.java

@@ -15,11 +15,13 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.PathSensitive;
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskAction;
 
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Set;
@@ -30,57 +32,33 @@
  * @author Steve Ebersole
  */
 @CacheableTask
-public class XjcTask extends DefaultTask {
-	private final Property<String> schemaName;
-	private final DirectoryProperty outputDirectory;
-	private final RegularFileProperty xsdFile;
-	private final RegularFileProperty xjcBindingFile;
-	private final SetProperty<String> xjcPlugins;
+public abstract class XjcTask extends DefaultTask {
 
+	@Inject
 	public XjcTask() {
-		schemaName = getProject().getObjects().property( String.class );
-
-		xsdFile = getProject().getObjects().fileProperty();
-		xjcBindingFile = getProject().getObjects().fileProperty();
-		xjcPlugins = getProject().getObjects().setProperty( String.class );
-
-		outputDirectory = getProject().getObjects().directoryProperty();
-
-		schemaName.convention( xsdFile.map( regularFile -> regularFile.getAsFile().getName() ) );
 	}
 
 	@Internal
-	public Property<String> getSchemaName() {
-		return schemaName;
-	}
+	public abstract Property<String> getSchemaName();
 
 	@InputFile
 	@PathSensitive(PathSensitivity.RELATIVE)
-	public RegularFileProperty getXsdFile() {
-		return xsdFile;
-	}
+	public abstract RegularFileProperty getXsdFile();
 
+	@Optional
 	@InputFile
 	@PathSensitive(PathSensitivity.RELATIVE)
-	public RegularFileProperty getXjcBindingFile() {
-		return xjcBindingFile;
-	}
+	public abstract RegularFileProperty getXjcBindingFile();
 
 	@Input
-	public SetProperty<String> getXjcPlugins() {
-		return xjcPlugins;
-	}
+	public abstract SetProperty<String> getXjcPlugins();
 
 	@OutputDirectory
-	public DirectoryProperty getOutputDirectory() {
-		return outputDirectory;
-	}
+	public abstract DirectoryProperty getOutputDirectory();
 
 	@TaskAction
 	public void generateJaxbBindings() {
-		getProject().delete( outputDirectory.get().getAsFileTree() );
-
-		final XjcListenerImpl listener = new XjcListenerImpl( schemaName.get(), getProject() );
+		final XjcListenerImpl listener = new XjcListenerImpl( getSchemaName().get(), getLogger() );
 		final String[] args = buildXjcArgs();
 
 		try {
@@ -94,23 +72,23 @@ public void generateJaxbBindings() {
 	private String[] buildXjcArgs() {
 		final ArrayList<String> argsList = new ArrayList<>();
 
-		Collections.addAll( argsList, "-d", outputDirectory.get().getAsFile().getAbsolutePath() );
-		Collections.addAll( argsList,  "-b", xjcBindingFile.get().getAsFile().getAbsolutePath());
+		Collections.addAll( argsList, "-d", getOutputDirectory().get().getAsFile().getAbsolutePath() );
+		Collections.addAll( argsList,  "-b", getXjcBindingFile().get().getAsFile().getAbsolutePath());
 
 		argsList.add( "-extension" );
 		argsList.add( "-no-header" );
 		argsList.add( "-npa" );
 
-		if ( xjcPlugins.isPresent() ) {
-			final Set<String> xjcPluginsToEnable = xjcPlugins.get();
+		if ( getXjcPlugins().isPresent() ) {
+			final Set<String> xjcPluginsToEnable = getXjcPlugins().get();
 			if ( !xjcPluginsToEnable.isEmpty() ) {
 				xjcPluginsToEnable.forEach( (ext) -> {
 					argsList.add( "-X" + ext );
 				} );
 			}
 		}
 
-		argsList.add( xsdFile.get().getAsFile().getAbsolutePath() );
+		argsList.add( getXsdFile().get().getAsFile().getAbsolutePath() );
 
 		return argsList.toArray( new String[0] );
 	}