fixes

Author: raydac

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

@@ -1,11 +1,14 @@
 package com.igormaznitsa.jcp.gradle;
 
+import javax.annotation.Nonnull;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 
 public class JcpGradlePlugin implements Plugin<Project> {
-  public void apply(Project project) {
-    project.getTasks().create("preprocess", JcpPreprocessTask.class);
-    project.getExtensions().create("preprocessSettings", JcpPreprocessExtension.class, project);
+
+  @Override
+  public void apply(@Nonnull final Project project) {
+    project.getTasks().create(JcpPreprocessTask.ID, JcpPreprocessTask.class);
+    project.getExtensions().create(JcpPreprocessExtension.ID, JcpPreprocessExtension.class, project);
   }
 }

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

@@ -10,11 +10,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nullable;
 import org.gradle.execution.commandline.TaskConfigurationException;
 
 @Data
 public class JcpPreprocessExtension {
 
+  public static final String ID = "preprocessSettings";
+
   /**
    * Source root folders for preprocessing, if it is empty then project provided
    * folders will be used.
@@ -72,7 +75,7 @@ public class JcpPreprocessExtension {
   private boolean unknownVarAsFalse = false;
 
   /**
-   * Dry run, making preprocessing but without output
+   * Dry run, making pre-processing but without output
    */
   private boolean dryRun = false;
 
@@ -155,38 +158,38 @@ public class JcpPreprocessExtension {
   public JcpPreprocessExtension(final Project project) {
     if (this.baseDir == null) {
       this.baseDir = project.getProjectDir();
-      project.getLogger().debug("Got basedir from project: " + this.baseDir);
+      project.getLogger().debug("Basedir of the project: " + this.baseDir);
     }
   }
 
-  private void assertCharSet(final String name) {
-    if (!Charset.isSupported(name)) {
-      throw new TaskConfigurationException("preprocess", "Unsupported charset: " + name, null);
+  private void assertCharSet(@Nullable final String name) {
+    if (name == null || !Charset.isSupported(name)) {
+      throw new TaskConfigurationException(JcpPreprocessTask.ID, "Unsupported charset: " + name, null);
     }
   }
 
   public void validate(final Project project) {
     if (this.baseDir == null) {
-      throw new TaskConfigurationException("preprocess", "Basedir must be defined", null);
+      throw new TaskConfigurationException(JcpPreprocessTask.ID, "Basedir must be defined", null);
     }
 
     if (!this.baseDir.isDirectory()) {
-      throw new TaskConfigurationException("preprocess", "Basedir doesn't exist: " + this.baseDir, null);
+      throw new TaskConfigurationException(JcpPreprocessTask.ID, "Basedir doesn't exist: " + this.baseDir, null);
     }
 
     assertCharSet(this.sourceEncoding);
     assertCharSet(this.targetEncoding);
 
     if (this.sources == null) {
-      throw new TaskConfigurationException("preprocess", "Source folders are not deined in 'sources'", null);
+      throw new TaskConfigurationException(JcpPreprocessTask.ID, "Source folders are not deined in 'sources'", null);
     }
 
     if (this.sources.isEmpty()) {
-      throw new TaskConfigurationException("preprocess", "Source folders are empty", null);
+      throw new TaskConfigurationException(JcpPreprocessTask.ID, "Source folder list is empty", null);
     }
 
     if (this.target == null) {
-      throw new TaskConfigurationException("preprocess", "Target folder is not deined in 'target'", null);
+      throw new TaskConfigurationException(JcpPreprocessTask.ID, "Target folder is not deined in 'target'", null);
     }
   }
 

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

@@ -2,6 +2,7 @@
 
 import com.igormaznitsa.jcp.JcpPreprocessor;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
+import com.igormaznitsa.jcp.exceptions.PreprocessorException;
 import com.igormaznitsa.jcp.expression.Value;
 import com.igormaznitsa.jcp.logger.PreprocessorLogger;
 import org.gradle.api.DefaultTask;
@@ -12,9 +13,12 @@
 import java.nio.charset.Charset;
 import java.util.Map;
 import org.gradle.api.logging.Logger;
+import org.gradle.api.tasks.TaskExecutionException;
 
 public class JcpPreprocessTask extends DefaultTask {
 
+  public static final String ID = "preprocess";
+
   @TaskAction
   public void preprocessTask() throws IOException {
     final Logger logger = getProject().getLogger();
@@ -51,13 +55,16 @@ public void warning(@Nullable final String message) {
     preprocessorContext.setTarget(preprocessExtension.getTarget());
     preprocessorContext.setSources(preprocessExtension.getSources());
 
-    if (preprocessExtension.getEol() != null) {
-      preprocessorContext.setEol(preprocessExtension.getEol());
-    } else {
+    if (preprocessExtension.getEol() == null) {
       logger.debug("Using default EOL");
+    } else {
+      preprocessorContext.setEol(preprocessExtension.getEol());
+    }
+
+    if (preprocessExtension.getExcludeFolders() != null) {
+      preprocessorContext.setExcludeFolders(preprocessExtension.getExcludeFolders());
     }
 
-    preprocessorContext.setExcludeFolders(preprocessExtension.getExcludeFolders());
     preprocessorContext.setDontOverwriteSameContent(preprocessExtension.isDontOverwriteSameContent());
     preprocessorContext.setClearTarget(preprocessExtension.isClearTarget());
     preprocessorContext.setCareForLastEol(preprocessExtension.isCareForLastEol());
@@ -77,9 +84,11 @@ public void warning(@Nullable final String message) {
       preprocessorContext.setExtensions(preprocessExtension.getExtensions());
     }
 
-    for (final Map.Entry<String, String> var : preprocessExtension.getVars().entrySet()) {
-      logger.debug(String.format("Registering global variable: %s=%s", var.getKey(), var.getValue()));
-      preprocessorContext.setGlobalVariable(var.getKey(), Value.recognizeRawString(var.getValue()));
+    if (preprocessExtension.getVars() != null) {
+      for (final Map.Entry<String, String> var : preprocessExtension.getVars().entrySet()) {
+        logger.debug(String.format("Registering global variable: %s=%s", var.getKey(), var.getValue()));
+        preprocessorContext.setGlobalVariable(var.getKey(), Value.recognizeRawString(var.getValue()));
+      }
     }
 
     preprocessorContext.setPreserveIndents(preprocessExtension.isPreserveIndents());
@@ -90,6 +99,11 @@ public void warning(@Nullable final String message) {
 
     final JcpPreprocessor preprocessor = new JcpPreprocessor(preprocessorContext);
     logger.debug("Start preprocessing...");
-    preprocessor.execute();
+
+    try {
+      preprocessor.execute();
+    } catch (final PreprocessorException ex) {
+      throw new TaskExecutionException(this, ex);
+    }
   }
 }