cleanup

Author: larsgrefer

plantuml-plugin/src/main/java/io/freefair/gradle/plugins/plantuml/PlantumlAction.java

@@ -7,7 +7,10 @@
 import org.gradle.workers.WorkAction;
 
 /**
+ * Gradle {@link WorkAction} for PlantUML {@link SourceFileReader}.
+ *
  * @author Lars Grefer
+ * @see SourceFileReader
  */
 public abstract class PlantumlAction implements WorkAction<PlantumlParameters> {
 
@@ -21,6 +24,7 @@ public void execute() {
                 .getOrElse(FileFormat.PNG);
 
         FileFormatOption fileFormatOption = new FileFormatOption(fileFormat, getParameters().getWithMetadata().get());
+
         SourceFileReader sourceFileReader = new SourceFileReader(
                 getParameters().getInputFile().getAsFile().get(),
                 getParameters().getOutputDirectory().getAsFile().get(),

plantuml-plugin/src/main/java/io/freefair/gradle/plugins/plantuml/PlantumlParameters.java

@@ -6,7 +6,10 @@
 import org.gradle.workers.WorkParameters;
 
 /**
+ * {@link WorkParameters} for {@link PlantumlAction}.
+ *
  * @author Lars Grefer
+ * @see PlantumlPlugin
  */
 public interface PlantumlParameters extends WorkParameters {
 

plantuml-plugin/src/main/java/io/freefair/gradle/plugins/plantuml/PlantumlTask.java

@@ -3,8 +3,10 @@
 import lombok.Getter;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.*;
+import org.gradle.workers.WorkQueue;
 import org.gradle.workers.WorkerExecutor;
 
 import javax.inject.Inject;
@@ -17,6 +19,8 @@ public class PlantumlTask extends SourceTask {
 
     private final WorkerExecutor workerExecutor;
 
+    private final FileSystemOperations fileSystemOperations;
+
     @Getter
     @Classpath
     private final ConfigurableFileCollection plantumlClasspath = getProject().files();
@@ -39,28 +43,29 @@ public class PlantumlTask extends SourceTask {
     private final Property<String> includePattern = getProject().getObjects().property(String.class).convention("**/*.puml");
 
     @Inject
-    public PlantumlTask(WorkerExecutor workerExecutor) {
-        this.setGroup("plantuml");
+    public PlantumlTask(WorkerExecutor workerExecutor, FileSystemOperations fileSystemOperations) {
+        this.fileSystemOperations = fileSystemOperations;
         this.workerExecutor = workerExecutor;
+        this.setGroup("plantuml");
     }
 
     @TaskAction
     public void execute() {
 
-        getProject().delete(outputDirectory);
+        fileSystemOperations.delete(deleteSpec -> deleteSpec.delete(outputDirectory));
+
+        WorkQueue workQueue = workerExecutor.processIsolation(process -> {
+            process.getClasspath().from(plantumlClasspath);
+            process.getForkOptions().systemProperty("java.awt.headless", true);
+        });
 
         for (File file : getSource().matching(p -> p.include(includePattern.get()))) {
-            workerExecutor
-                    .processIsolation(iso -> {
-                        iso.getClasspath().from(plantumlClasspath);
-                        iso.getForkOptions().systemProperty("java.awt.headless", true);
-                    })
-                    .submit(PlantumlAction.class, params -> {
-                        params.getInputFile().set(file);
-                        params.getOutputDirectory().set(outputDirectory);
-                        params.getFileFormat().set(fileFormat);
-                        params.getWithMetadata().set(withMetadata);
-                    });
+            workQueue.submit(PlantumlAction.class, params -> {
+                params.getInputFile().set(file);
+                params.getOutputDirectory().set(outputDirectory);
+                params.getFileFormat().set(fileFormat);
+                params.getWithMetadata().set(withMetadata);
+            });
         }
     }
 }