#21 GradlePlugin: removed auto-processing of source folders

Author: raydac

jcp-tests/jcp-test-android/app/build.gradle

@@ -40,19 +40,13 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
-def preprocessTargetFolder = file('build/java-comment-preprocessor/app1')
-
 preprocess {
-    target = file(preprocessTargetFolder)
-    sources = [file('src/main/java')]
-
+    sources = android.sourceSets.main.java.srcDirs
     keepComments = false
-
     vars = [
             'action.text':'Non-secret action!',
             'remove.secret':'true'
     ]
-
 }
 
 task (changeSourceFolder) {

jcp-tests/jcp-test-gradle/build.gradle

@@ -35,7 +35,7 @@ jar {
 
 
 preprocess {
-
+        sources = sourceSets.main.java.srcDirs
         allowWhitespaces = true
         eol = '\r\n'
         keepAttributes=true
@@ -57,8 +57,11 @@ preprocess {
         preserveIndents=true
         dontOverwriteSameContent=false
         vars = ['some.test.global': 'Some Test Global Value']
-        autoReplaceSources=true
 }
+task (changeSourceFolder) {
+    sourceSets.main.java.srcDirs = [preprocess.target]
+}.dependsOn preprocess
+
 
 compileJava.dependsOn preprocess
 

jcp-tests/jcp-test-gradle/src/main/java/com/igormaznitsa/jcp/it/gradle/Some.java

@@ -0,0 +1,9 @@
+package com.igormaznitsa.jcp.it.gradle;
+
+public class Some {
+
+  public String getText() {
+    return "Some text";
+  }
+
+}

jcp/src/main/java/com/igormaznitsa/jcp/gradle/JcpGradlePlugin.java

@@ -8,6 +8,6 @@ public class JcpGradlePlugin implements Plugin<Project> {
 
   @Override
   public void apply(@Nonnull final Project project) {
-    project.getTasks().create(JcpPreprocessTask.ID, JcpPreprocessTask.class);
+    project.getTasks().create(JcpTask.ID, JcpTask.class);
   }
 }

…znitsa/jcp/gradle/JcpPreprocessTask.java …com/igormaznitsa/jcp/gradle/JcpTask.javajcp/src/main/java/com/igormaznitsa/jcp/gradle/JcpPreprocessTask.java renamed to jcp/src/main/java/com/igormaznitsa/jcp/gradle/JcpTask.java jcp/src/main/java/com/igormaznitsa/jcp/gradle/JcpPreprocessTask.java renamed to jcp/src/main/java/com/igormaznitsa/jcp/gradle/JcpTask.java

@@ -1,8 +1,6 @@
 package com.igormaznitsa.jcp.gradle;
 
-import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
-import static org.gradle.api.tasks.SourceSet.MAIN_SOURCE_SET_NAME;
 
 
 import com.igormaznitsa.jcp.JcpPreprocessor;
@@ -17,29 +15,25 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import org.apache.commons.io.FilenameUtils;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.model.ObjectFactory;
-import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.ProviderFactory;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.TaskExecutionException;
 import org.gradle.execution.commandline.TaskConfigurationException;
 
-public class JcpPreprocessTask extends DefaultTask {
+public class JcpTask extends DefaultTask {
 
   public static final String ID = "preprocess";
 
@@ -149,13 +143,8 @@ public class JcpPreprocessTask extends DefaultTask {
    */
   private final Property<Boolean> dontOverwriteSameContent;
 
-  /**
-   * Auto replace java source folders by the target folder.
-   */
-  private final Property<Boolean> autoReplaceSources;
-
   @Inject
-  public JcpPreprocessTask(ProviderFactory providerFactory) {
+  public JcpTask(ProviderFactory providerFactory) {
     super();
     final ObjectFactory factory = this.getProject().getObjects();
 
@@ -178,58 +167,17 @@ public JcpPreprocessTask(ProviderFactory providerFactory) {
 
     this.vars = factory.mapProperty(String.class, String.class);
 
-    this.sources = factory.listProperty(File.class).convention(providerFactory.provider(() -> findJavaSourceFolders().orElse(emptyList())));
+    this.sources = factory.listProperty(File.class);
 
     this.configFiles = factory.listProperty(String.class);
     this.excludeExtensions = factory.listProperty(String.class).convention(Collections.singletonList("xml"));
     this.excludeFolders = factory.listProperty(String.class);
     this.fileExtensions = factory.listProperty(String.class).convention(new ArrayList<>(Arrays.asList("java", "txt", "htm", "html")));
 
     this.baseDir = factory.property(File.class).convention(this.getProject().getProjectDir());
-    this.autoReplaceSources = factory.property(Boolean.class).convention(false);
     this.target = factory.property(File.class).convention(new File(this.getProject().getBuildDir(), "java-comment-preprocessor" + File.separatorChar + this.getTaskIdentity().name));
   }
 
-  private Optional<List<File>> findJavaSourceFolders() {
-    final JavaPluginConvention javaPluginConvention = this.getProject().getConvention().findPlugin(JavaPluginConvention.class);
-
-    if (javaPluginConvention == null) {
-      this.getLogger().debug("Can't find Java plugin");
-      return Optional.empty();
-    }
-
-    final SourceSetContainer srcSetContainer = javaPluginConvention.getSourceSets();
-    return Optional.of(srcSetContainer
-        .stream()
-        .filter(x -> MAIN_SOURCE_SET_NAME.equals(x.getName()))
-        .flatMap(x -> x.getJava().getSrcDirs().stream())
-        .collect(Collectors.toList()));
-  }
-
-  private boolean replaceJavaSourceFolders(final File targetFolder) {
-    final JavaPluginConvention javaPluginConvention = this.getProject().getConvention().findPlugin(JavaPluginConvention.class);
-    final AtomicBoolean replaced = new AtomicBoolean();
-    if (javaPluginConvention == null) {
-      this.getLogger().debug("Can't find Java plugin");
-    } else {
-      this.getLogger().debug("Detected Java plugin, trying to replace its main source set");
-      final SourceSetContainer srcSetContainer = javaPluginConvention.getSourceSets();
-      srcSetContainer
-          .stream()
-          .filter(x -> MAIN_SOURCE_SET_NAME.equals(x.getName()))
-          .forEach(x -> {
-            x.getJava().setSrcDirs(Collections.singletonList(targetFolder));
-            replaced.set(true);
-          });
-    }
-    return replaced.get();
-  }
-
-  @Input
-  public Property<Boolean> getAutoReplaceSources() {
-    return this.autoReplaceSources;
-  }
-
   @InputFiles
   public ListProperty<File> getSources() {
     return this.sources;
@@ -398,7 +346,7 @@ public void warning(@Nullable final String message) {
 
     final List<File> sourcesList = this.sources.get();
     if (sourcesList.isEmpty()) {
-      throw new TaskConfigurationException(JcpPreprocessTask.ID, "Source folder list must be defined as 'sources'", null);
+      throw new TaskConfigurationException(JcpTask.ID, "Source folder list must be defined as 'sources'", null);
     }
 
     List<File> preparedSourcesList = new ArrayList<>();
@@ -412,7 +360,7 @@ public void warning(@Nullable final String message) {
       }
     }
 
-    logger.info("Sources: " + preparedSourcesList);
+    logger.info("Source folders in use: " + preparedSourcesList);
 
     preprocessorContext.setSources(preparedSourcesList.stream().map(File::getAbsolutePath).collect(Collectors.toList()));
     preprocessorContext.setEol(this.eol.get());
@@ -439,15 +387,8 @@ public void warning(@Nullable final String message) {
     });
 
     final JcpPreprocessor preprocessor = new JcpPreprocessor(preprocessorContext);
-    logger.debug("Start preprocessing...");
 
+    logger.debug("Preprocessing starting");
     preprocessor.execute();
-
-    if (this.autoReplaceSources.get()) {
-      logger.info("Trying auto-replace source folders by the preprocessed one: " + targetFolder);
-      if (!this.replaceJavaSourceFolders(targetFolder)) {
-        throw new TaskExecutionException(this, new IllegalStateException("Can't replace sources automatically, may be some unsupported type of project, use manual replacement!"));
-      }
-    }
   }
 }