Leverage constructor injection in Gradle extension plugin

quarkusio · May 17, 2022 · 39ec8d0 · 39ec8d0
1 parent 9e4e596
commit 39ec8d0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/...le-extension-plugin/src/main/java/io/quarkus/extension/gradle/QuarkusExtensionPlugin.java b/...le-extension-plugin/src/main/java/io/quarkus/extension/gradle/QuarkusExtensionPlugin.java
@@ -48,19 +48,18 @@ private void registerTasks(Project project, QuarkusExtensionConfiguration quarku
                 .getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME);
 
         TaskProvider<ExtensionDescriptorTask> extensionDescriptorTask = tasks.register(EXTENSION_DESCRIPTOR_TASK_NAME,
-                ExtensionDescriptorTask.class, task -> {
-                    JavaPluginConvention convention = project.getConvention().getPlugin(JavaPluginConvention.class);
-                    SourceSet mainSourceSet = convention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-                    task.setOutputResourcesDir(mainSourceSet.getOutput().getResourcesDir());
-                    task.setInputResourcesDir(mainSourceSet.getResources().getSourceDirectories().getAsPath());
-                    task.setQuarkusExtensionConfiguration(quarkusExt);
-                    task.setClasspath(runtimeModuleClasspath);
-                });
+                ExtensionDescriptorTask.class, quarkusExt);
+        extensionDescriptorTask.configure(task -> {
+            JavaPluginConvention convention = project.getConvention().getPlugin(JavaPluginConvention.class);
+            SourceSet mainSourceSet = convention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+            task.setOutputResourcesDir(mainSourceSet.getOutput().getResourcesDir());
+            task.setInputResourcesDir(mainSourceSet.getResources().getSourceDirectories().getAsPath());
+            task.setClasspath(runtimeModuleClasspath);
+        });
 
         TaskProvider<ValidateExtensionTask> validateExtensionTask = tasks.register(VALIDATE_EXTENSION_TASK_NAME,
                 ValidateExtensionTask.class, task -> {
                     task.setRuntimeModuleClasspath(runtimeModuleClasspath);
-                    task.setQuarkusExtensionConfiguration(quarkusExt);
                     task.onlyIf(t -> !quarkusExt.isValidationDisabled().get());
                 });
 

diff --git a/...nsion-plugin/src/main/java/io/quarkus/extension/gradle/tasks/ExtensionDescriptorTask.java b/...nsion-plugin/src/main/java/io/quarkus/extension/gradle/tasks/ExtensionDescriptorTask.java
@@ -39,12 +39,14 @@
 import io.quarkus.fs.util.ZipUtils;
 import io.quarkus.maven.dependency.GACT;
 
+import javax.inject.Inject;
+
 /**
  * Task that generates extension descriptor files.
  */
 public class ExtensionDescriptorTask extends DefaultTask {
 
-    private QuarkusExtensionConfiguration quarkusExtensionConfiguration;
+    private final QuarkusExtensionConfiguration quarkusExtensionConfiguration;
     private Configuration classpath;
     private File outputResourcesDir;
     private String inputResourcesDir;
@@ -53,7 +55,10 @@ public class ExtensionDescriptorTask extends DefaultTask {
     private static final String ARTIFACT_ID = "artifact-id";
     private static final String METADATA = "metadata";
 
-    public ExtensionDescriptorTask() {
+    @Inject
+    public ExtensionDescriptorTask(QuarkusExtensionConfiguration quarkusExtensionConfiguration) {
+        this.quarkusExtensionConfiguration = quarkusExtensionConfiguration;
+
         setDescription("Generate extension descriptor file");
         setGroup("quarkus");
     }
@@ -66,10 +71,6 @@ public void setInputResourcesDir(String inputResourcesDir) {
         this.inputResourcesDir = inputResourcesDir;
     }
 
-    public void setQuarkusExtensionConfiguration(QuarkusExtensionConfiguration quarkusExtensionConfiguration) {
-        this.quarkusExtensionConfiguration = quarkusExtensionConfiguration;
-    }
-
     public void setClasspath(Configuration classpath) {
         this.classpath = classpath;
     }

diff --git a/...tension-plugin/src/main/java/io/quarkus/extension/gradle/tasks/ValidateExtensionTask.java b/...tension-plugin/src/main/java/io/quarkus/extension/gradle/tasks/ValidateExtensionTask.java
@@ -20,7 +20,6 @@
 
 public class ValidateExtensionTask extends DefaultTask {
 
-    private QuarkusExtensionConfiguration extensionConfiguration;
     private Configuration runtimeModuleClasspath;
     private Configuration deploymentModuleClasspath;
 
@@ -29,10 +28,6 @@ public ValidateExtensionTask() {
         setGroup("quarkus");
     }
 
-    public void setQuarkusExtensionConfiguration(QuarkusExtensionConfiguration extensionConfiguration) {
-        this.extensionConfiguration = extensionConfiguration;
-    }
-
     @Internal
     public Configuration getRuntimeModuleClasspath() {
         return this.runtimeModuleClasspath;