Use Property<Boolean> in ValidatePlugins

Author: lptr

subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/tasks/ValidatePlugins.java

@@ -34,6 +34,7 @@
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.internal.DocumentationRegistry;
 import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -45,7 +46,6 @@
 import org.gradle.api.tasks.SkipWhenEmpty;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.TaskValidationException;
-import org.gradle.api.tasks.VerificationTask;
 import org.gradle.internal.classanalysis.AsmConstants;
 import org.gradle.internal.classloader.ClassLoaderFactory;
 import org.gradle.internal.classloader.ClassLoaderUtils;
@@ -76,19 +76,22 @@
  */
 @CacheableTask
 @Incubating
-public class ValidatePlugins extends DefaultTask implements VerificationTask {
+public class ValidatePlugins extends DefaultTask {
     private final ConfigurableFileCollection classes;
     private final ConfigurableFileCollection classpath;
     private final RegularFileProperty outputFile;
-    private boolean enableStricterValidation;
-    private boolean ignoreFailures;
-    private boolean failOnWarning = true;
+    private final Property<Boolean> enableStricterValidation;
+    private final Property<Boolean> ignoreFailures;
+    private final Property<Boolean> failOnWarning;
 
     @Inject
     public ValidatePlugins(ObjectFactory objects) {
         this.classes = objects.fileCollection();
         this.classpath = objects.fileCollection();
         this.outputFile = objects.fileProperty();
+        this.enableStricterValidation = objects.property(Boolean.class).convention(false);
+        this.ignoreFailures = objects.property(Boolean.class).convention(false);
+        this.failOnWarning = objects.property(Boolean.class).convention(true);
     }
 
     @TaskAction
@@ -137,7 +140,7 @@ public void visitFile(FileVisitDetails fileDetails) {
                         throw new GradleException("Could not load class: " + className, e);
                     }
                     try {
-                        validatorMethod.invoke(null, clazz, taskValidationProblems, enableStricterValidation);
+                        validatorMethod.invoke(null, clazz, taskValidationProblems, enableStricterValidation.get());
                     } catch (IllegalAccessException | InvocationTargetException e) {
                         throw new RuntimeException(e);
                     }
@@ -162,8 +165,8 @@ private void communicateResult(List<String> problemMessages, boolean hasErrors)
         if (problemMessages.isEmpty()) {
             getLogger().info("Plugin validation finished without warnings.");
         } else {
-            if (hasErrors || getFailOnWarning()) {
-                if (getIgnoreFailures()) {
+            if (hasErrors || failOnWarning.get()) {
+                if (ignoreFailures.get()) {
                     getLogger().warn("Plugin validation finished with errors. See {} for more information on how to annotate task properties.{}", getDocumentationRegistry().getDocumentationFor("more_about_tasks", "sec:task_input_output_annotations"), toMessageList(problemMessages));
                 } else {
                     throw new TaskValidationException(String.format("Plugin validation failed. See %s for more information on how to annotate task properties.", getDocumentationRegistry().getDocumentationFor("more_about_tasks", "sec:task_input_output_annotations")), toExceptionList(problemMessages));
@@ -201,22 +204,6 @@ private static List<InvalidUserDataException> toExceptionList(List<String> probl
             .collect(Collectors.toList());
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getIgnoreFailures() {
-        return ignoreFailures;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setIgnoreFailures(boolean ignoreFailures) {
-        this.ignoreFailures = ignoreFailures;
-    }
-
     /**
      * The classes to validate.
      */
@@ -236,26 +223,29 @@ public ConfigurableFileCollection getClasspath() {
     }
 
     /**
-     * Returns whether the build should break when the verifications performed by this task detects a warning.
+     * Specifies whether the build should break when plugin verifications fails.
+     *
+     * @return {@code false} when the build should break on failure, {@code true} when failures should be ignored.
      */
     @Input
-    public boolean getFailOnWarning() {
-        return failOnWarning;
+    public Property<Boolean> getIgnoreFailures() {
+        return ignoreFailures;
     }
 
     /**
-     * Enable the stricter validation for cacheable tasks for all tasks.
+     * Returns whether the build should break when the verifications performed by this task detects a warning.
      */
     @Input
-    public boolean getEnableStricterValidation() {
-        return enableStricterValidation;
+    public Property<Boolean> getFailOnWarning() {
+        return failOnWarning;
     }
 
     /**
      * Enable the stricter validation for cacheable tasks for all tasks.
      */
-    public void setEnableStricterValidation(boolean enableStricterValidation) {
-        this.enableStricterValidation = enableStricterValidation;
+    @Input
+    public Property<Boolean> getEnableStricterValidation() {
+        return enableStricterValidation;
     }
 
     /**
@@ -267,16 +257,6 @@ public RegularFileProperty getOutputFile() {
         return outputFile;
     }
 
-    /**
-     * Specifies whether the build should break when the verifications performed by this task detects a warning.
-     *
-     * @param failOnWarning {@code true} to break the build on warning, {@code false} to ignore warnings. The default is {@code true}.
-     */
-    @SuppressWarnings("unused")
-    public void setFailOnWarning(boolean failOnWarning) {
-        this.failOnWarning = failOnWarning;
-    }
-
     @Inject
     protected ClassLoaderFactory getClassLoaderFactory() {
         throw new UnsupportedOperationException();

subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/tasks/ValidateTaskProperties.java

@@ -81,7 +81,7 @@ public ValidateTaskProperties(TaskProvider<ValidatePlugins> delegate, Runnable d
     @Override
     public boolean getIgnoreFailures() {
         deprecationNagger.run();
-        return delegate.get().getIgnoreFailures();
+        return delegate.get().getIgnoreFailures().get();
     }
 
     /**
@@ -90,7 +90,7 @@ public boolean getIgnoreFailures() {
     @Override
     public void setIgnoreFailures(boolean ignoreFailures) {
         deprecationNagger.run();
-        delegate.get().setIgnoreFailures(ignoreFailures);
+        delegate.get().getIgnoreFailures().set(ignoreFailures);
     }
 
     /**
@@ -119,7 +119,7 @@ public ConfigurableFileCollection getClasspath() {
     @Internal
     public boolean getFailOnWarning() {
         deprecationNagger.run();
-        return delegate.get().getFailOnWarning();
+        return delegate.get().getFailOnWarning().get();
     }
 
     /**
@@ -130,7 +130,7 @@ public boolean getFailOnWarning() {
     @Internal
     public boolean getEnableStricterValidation() {
         deprecationNagger.run();
-        return delegate.get().getEnableStricterValidation();
+        return delegate.get().getEnableStricterValidation().get();
     }
 
     /**
@@ -140,7 +140,7 @@ public boolean getEnableStricterValidation() {
      */
     public void setEnableStricterValidation(boolean enableStricterValidation) {
         deprecationNagger.run();
-        delegate.get().setEnableStricterValidation(enableStricterValidation);
+        delegate.get().getEnableStricterValidation().set(enableStricterValidation);
     }
 
     /**
@@ -161,6 +161,6 @@ public RegularFileProperty getOutputFile() {
      */
     public void setFailOnWarning(boolean failOnWarning) {
         deprecationNagger.run();
-        delegate.get().setFailOnWarning(failOnWarning);
+        delegate.get().getFailOnWarning().set(failOnWarning);
     }
 }