refactoring

Author: raydac

jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/AbstractJBBPTask.java

@@ -1,13 +1,12 @@
 package com.igormaznitsa.jbbp.plugin.gradle;
 
-import com.igormaznitsa.jbbp.plugin.common.converters.ParserFlags;
 import com.igormaznitsa.meta.common.utils.GetUtils;
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileVisitDetails;
 import org.gradle.api.file.FileVisitor;
-import org.gradle.api.tasks.*;
+import org.gradle.api.tasks.TaskAction;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -25,27 +24,18 @@ public AbstractJBBPTask() {
     @Nullable
     public static String getTextOrFileContent(@Nonnull final JBBPExtension extension, @Nullable final String text, @Nullable final File file) {
         String result = null;
-        if (text!=null) {
+        if (text != null) {
             result = text;
         } else if (file != null) {
             try {
-                result = FileUtils.readFileToString(file, GetUtils.ensureNonNull(extension.inEncoding,"UTF-8"));
-            }catch(IOException ex){
-                throw new GradleException("Can't read file "+file,ex);
+                result = FileUtils.readFileToString(file, GetUtils.ensureNonNull(extension.inEncoding, "UTF-8"));
+            } catch (IOException ex) {
+                throw new GradleException("Can't read file " + file, ex);
             }
         }
         return result;
     }
 
-    @TaskAction
-    public final void doAction() {
-        JBBPExtension ext = getProject().getExtensions().findByType(JBBPExtension.class);
-        if (ext == null) {
-            ext = new JBBPExtension(getProject());
-        }
-        doTaskAction(ext);
-    }
-
     @Nonnull
     protected static Set<File> findScripts(@Nonnull final JBBPExtension ext) {
         final Set<File> result = new HashSet<File>();
@@ -64,6 +54,15 @@ public void visitFile(final FileVisitDetails fileVisitDetails) {
         return result;
     }
 
+    @TaskAction
+    public final void doAction() {
+        JBBPExtension ext = getProject().getExtensions().findByType(JBBPExtension.class);
+        if (ext == null) {
+            ext = new JBBPExtension(getProject());
+        }
+        doTaskAction(ext);
+    }
+
     protected abstract void doTaskAction(@Nonnull JBBPExtension extension);
 
 }

jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/JBBPCleanTask.java

@@ -1,14 +1,11 @@
 package com.igormaznitsa.jbbp.plugin.gradle;
 
 import com.igormaznitsa.jbbp.plugin.common.converters.JBBPScriptTranslator;
-import com.igormaznitsa.jbbp.plugin.common.converters.ParserFlags;
-import com.igormaznitsa.jbbp.plugin.common.utils.CommonUtils;
 import org.gradle.api.GradleException;
 
 import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
-import java.util.Set;
 
 public class JBBPCleanTask extends AbstractJBBPTask {
 

jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/JBBPExtension.java

@@ -4,10 +4,6 @@
 import com.igormaznitsa.jbbp.plugin.common.converters.Target;
 import org.gradle.api.Project;
 import org.gradle.api.file.ConfigurableFileTree;
-import org.gradle.api.file.FileTree;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.Optional;
-import org.gradle.api.tasks.OutputDirectory;
 
 import javax.annotation.Nonnull;
 import java.io.File;
@@ -29,7 +25,7 @@ public class JBBPExtension {
     public String inEncoding = "UTF-8";
     public String outEncoding = "UTF-8";
     public File headCommentFile = null;
-    public String  headComment = null;
+    public String headComment = null;
     public File customTextFile = null;
     public String customText = null;
     public String superClass = null;
@@ -40,7 +36,7 @@ public class JBBPExtension {
     public JBBPExtension(@Nonnull final Project project) {
         this.source = project.fileTree("src/jbbp");
         this.source.include("**/*.jbbp");
-        this.output = new File(project.getBuildDir(),"generated-jbbp-dir");
+        this.output = new File(project.getBuildDir(), "generated-jbbp-dir");
     }
 
 }

jbbp-plugins/jbbp-gradle/src/test/groovy/com/igormaznitsa/jbbp/gradle/JBBPPluginTest.groovy renamed to jbbp-plugins/jbbp-gradle/src/test/groovy/com/igormaznitsa/jbbp/plugin/gradle/JBBPPluginTest.groovy

@@ -1,4 +1,4 @@
-package com.igormaznitsa.jbbp.plugin.gradle
+
 
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder