refactoring

Author: raydac

.gitignore

@@ -1,3 +1,4 @@
+/jbbp/target
 /target/
 /nbproject/
 /.idea/

jbbp-plugins/jbbp-gradle/build.gradle

@@ -6,13 +6,19 @@ version = jbbpVersion
 
 apply plugin: 'groovy'
 apply plugin: 'maven'
+apply plugin: "com.gradle.plugin-publish"
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
 dependencies {
     compile gradleApi()
 
+    compile "commons-io:commons-io:2.5"
+    compile "com.igormaznitsa:jbbp:" + jbbpVersion
+    compile "com.igormaznitsa:meta-annotations:" + metalibVersion
+    compile "com.igormaznitsa:meta-utils:" + metalibVersion
+
     testCompile 'junit:junit:4.12'
 }
 
@@ -21,11 +27,15 @@ repositories {
     mavenLocal()
 }
 
-dependencies {
-    compile "commons-io:commons-io:2.5"
-    compile "com.igormaznitsa:jbbp:" + jbbpVersion
-    compile "com.igormaznitsa:meta-annotations:" + metalibVersion
-    compile "com.igormaznitsa:meta-utils:" + metalibVersion
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "com.gradle.publish:plugin-publish-plugin:0.9.7"
+    }
 }
 
 sourceSets {
@@ -36,3 +46,17 @@ sourceSets {
         }
     }
 }
+
+pluginBundle {
+    website = 'http://www.igormaznitsa.com/'
+    vcsUrl = 'https://github.com/raydac/java-binary-block-parser'
+    description = 'JBBP translator!'
+    tags = ['jbbp','converter']
+
+    plugins {
+        JBBPPlugin {
+            id = 'com.igormaznitsa.jbbp'
+            displayName = 'Translator of JBBPscripts into executable sources'
+        }
+    }
+}

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

@@ -1,54 +1,56 @@
 package com.igormaznitsa.jbbp.plugin.gradle;
 
-import com.igormaznitsa.jbbp.plugin.common.converters.Target;
+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 javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.File;
+import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
-public abstract class AbstractJBBPTask extends SourceTask {
-
-    @Input
-    @Optional
-    protected Target target = Target.JAVA_1_6;
-
-    @OutputDirectory
-    @Optional
-    protected File output = new File(getProject().getBuildDir(), "generated-src");
+public abstract class AbstractJBBPTask extends DefaultTask {
 
     public AbstractJBBPTask() {
-        this.source.add(getProject().fileTree("src/jbbp"));
-        this.include("**/*.jbbp");
-    }
-
-    public File getOutput() {
-        return this.output;
-    }
-
-    public void setOutput(final File file) {
-        this.output = file;
-    }
-
-    public Target getTarget() {
-        return this.target;
+        super();
     }
 
-    public void setTarget(final Target value) {
-        this.target = value;
+    @Nullable
+    public static String getTextOrFileContent(@Nonnull final JBBPExtension extension, @Nullable final String text, @Nullable final File file) {
+        String result = 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);
+            }
+        }
+        return result;
     }
 
     @TaskAction
     public final void doAction() {
-        doTaskAction();
+        JBBPExtension ext = getProject().getExtensions().findByType(JBBPExtension.class);
+        if (ext == null) {
+            ext = new JBBPExtension(getProject());
+        }
+        doTaskAction(ext);
     }
 
-    protected Set<File> findScripts() {
+    @Nonnull
+    protected static Set<File> findScripts(@Nonnull final JBBPExtension ext) {
         final Set<File> result = new HashSet<File>();
 
-        this.getSource().visit(new FileVisitor() {
+        ext.source.visit(new FileVisitor() {
             @Override
             public void visitDir(final FileVisitDetails fileVisitDetails) {
 
@@ -62,6 +64,6 @@ public void visitFile(final FileVisitDetails fileVisitDetails) {
         return result;
     }
 
-    protected abstract void doTaskAction();
+    protected abstract void doTaskAction(@Nonnull JBBPExtension extension);
 
 }

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

@@ -1,9 +1,42 @@
 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 {
 
     @Override
-    protected void doTaskAction() {
+    protected void doTaskAction(@Nonnull final JBBPExtension ext) {
+        final JBBPScriptTranslator.Parameters parameters = new JBBPScriptTranslator.Parameters();
+
+        parameters
+                .setPackageName(ext.packageName)
+                .setOutputDir(ext.output);
+
+        for(final File aScript : findScripts(ext)) {
+            getLogger().debug("Script file : "+aScript);
+            parameters.setScriptFile(aScript);
+            try {
+                for (final File f : ext.target.getTranslator().translate(parameters, true)) {
+                    if (f.isFile()){
+                        if (f.delete()){
+                            getLogger().info("File "+f+" has been deleted");
+                        } else {
+                            getLogger().error("Can't delete file "+f);
+                        }
+                    }
+                }
+            }catch(IOException ex){
+                throw new GradleException("Error during processing JBBP script "+aScript, ex);
+            }
+        }
 
     }
 }

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

@@ -0,0 +1,46 @@
+package com.igormaznitsa.jbbp.plugin.gradle;
+
+import com.igormaznitsa.jbbp.plugin.common.converters.ParserFlags;
+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;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class JBBPExtension {
+    public static final String NAME = "jbbp";
+
+    public Target target = Target.JAVA_1_6;
+    public boolean addGettersSetters = false;
+    public boolean doAbstract = false;
+    public Set<String> interfaces = new HashSet<String>();
+    public Set<ParserFlags> parserFlags = new HashSet<ParserFlags>();
+    public Set<String> customTypes = new HashSet<String>();
+    public Map<String, String> mapSubClassInterfaces = new HashMap<String, String>();
+    public String inEncoding = "UTF-8";
+    public String outEncoding = "UTF-8";
+    public File headCommentFile = null;
+    public String  headComment = null;
+    public File customTextFile = null;
+    public String customText = null;
+    public String superClass = null;
+    public String packageName = null;
+    public File output;
+    public ConfigurableFileTree source;
+
+    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");
+    }
+
+}