refactoring

raydac · raydac · commit 7b83e5d5f542 · 2019-09-15T15:02:27.000+03:00
diff --git a/jbbp-plugins/jbbp-gradle/build.gradle b/jbbp-plugins/jbbp-gradle/build.gradle
@@ -7,7 +7,7 @@ def getProp(name, dflt) {
     }
 }
 
-def jbbpVersion = getProp('jbbp_plugin_version', '1.4.2-SNAPSHOT')
+def jbbpVersion = getProp('jbbp_plugin_version', '2.0.0-SNAPSHOT')
 def metaLibVersion = getProp('meta_lib_version', '1.1.2')
 
 group = 'com.igormaznitsa'
@@ -17,8 +17,8 @@ apply plugin: 'groovy'
 apply plugin: 'maven'
 apply plugin: "com.gradle.plugin-publish"
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 dependencies {
     compile gradleApi()
diff --git a/jbbp-plugins/jbbp-gradle/pom.xml b/jbbp-plugins/jbbp-gradle/pom.xml
@@ -79,7 +79,7 @@
                             <properties>
                                 <property>
                                     <name>gradle.prop.jbbp_plugin_version</name>
-                                    <value>${project.version}</value>
+                                    <value>${jbbp.plugin.version}</value>
                                 </property>
                                 <property>
                                     <name>gradle.prop.meta_lib_version</name>
diff --git a/jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/JBBPExtension.java b/jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/JBBPExtension.java
@@ -27,7 +27,7 @@ public class JBBPExtension {
   /**
    * Target of translation.
    */
-  public Target target = Target.JAVA_1_6;
+  public Target target = Target.JAVA;
 
   /**
    * Flag to generate getters and setters in result class, all fields will be
@@ -134,6 +134,16 @@ public class JBBPExtension {
    */
   public ConfigurableFileTree source;
 
+  /**
+   * Generate methods newInstance in generated classes.
+   */
+  public boolean genNewInstance;
+
+  /**
+   * Generate Bin annotations for fields
+   */
+  public boolean addBinAnnotations;
+
   public JBBPExtension(@Nonnull final Project project) {
     this.source = project.fileTree("src/jbbp");
   }
diff --git a/jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/JBBPGenerateTask.java b/jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/JBBPGenerateTask.java
@@ -46,7 +46,7 @@ public class JBBPGenerateTask extends AbstractJBBPTask {
 
   @Override
   protected void doTaskAction(@Nonnull final JBBPExtension ext) {
-    final Target target = GetUtils.ensureNonNull(ext.target, Target.JAVA_1_6);
+    final Target target = GetUtils.ensureNonNull(ext.target, Target.JAVA);
 
     final Set<String> normalizedCustomTypeNames = new HashSet<String>();
     if (ext.customTypes != null) {
@@ -99,6 +99,8 @@ public JBBPAbstractField readCustomFieldType(@Nonnull final JBBPBitInputStream i
         .setEncodingOut(CommonUtils.ensureEncodingName(ext.outEncoding))
         .setCustomFieldTypeProcessor(customFieldProcessor)
         .setSuperClass(ext.superClass)
+        .setGenNewInstance(ext.genNewInstance)
+        .setAddBinAnnotations(ext.addBinAnnotations)
         .setClassImplements(ext.interfaces)
         .setSubClassInterfaces(ext.mapSubClassInterfaces)
         .setSubClassSuperclasses(ext.mapSubClassSuperclasses)
diff --git a/jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-getterssetters/pom.xml b/jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-getterssetters/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-maven-plugin-tests</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>0.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-mvn-test-getterssetters</artifactId>
@@ -16,7 +16,7 @@
             <plugin>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>jbbp-maven-plugin</artifactId>
-                <version>${project.version}</version>
+                <version>${jbbp.plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-test-customvars/pom.xml b/jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-test-customvars/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-maven-plugin-tests</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>0.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-mvn-test-customvars</artifactId>
@@ -16,7 +16,7 @@
             <plugin>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>jbbp-maven-plugin</artifactId>
-                <version>${project.version}</version>
+                <version>${jbbp.plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-test-primitives/pom.xml b/jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-test-primitives/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-maven-plugin-tests</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>0.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-mvn-test-primitives</artifactId>
@@ -16,7 +16,7 @@
             <plugin>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>jbbp-maven-plugin</artifactId>
-                <version>${project.version}</version>
+                <version>${jbbp.plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/pom.xml b/jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/pom.xml
@@ -10,6 +10,7 @@
 
     <artifactId>jbbp-maven-plugin-tests</artifactId>
     <packaging>pom</packaging>
+    <version>0.0.0-SNAPSHOT</version>
 
     <description>Integration tests for JBBP Maven plugin</description>
 
diff --git a/jbbp-plugins/jbbp-maven/jbbp-maven-plugin/src/main/java/com/igormaznitsa/jbbp/plugin/mvn/AbstractJBBPMojo.java b/jbbp-plugins/jbbp-maven/jbbp-maven-plugin/src/main/java/com/igormaznitsa/jbbp/plugin/mvn/AbstractJBBPMojo.java
@@ -60,7 +60,7 @@ public abstract class AbstractJBBPMojo extends AbstractMojo {
    *
    * @see Target
    */
-  @Parameter(alias = "target", defaultValue = "JAVA_1_6")
+  @Parameter(alias = "target", defaultValue = "JAVA")
   protected String target;
   /**
    * Flag to skip processing of the plug-in.
diff --git a/jbbp-plugins/jbbp-plugin-common/pom.xml b/jbbp-plugins/jbbp-plugin-common/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jbbp</artifactId>
-            <version>${project.version}</version>
+            <version>${jbbp.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/JBBPScriptTranslator.java b/jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/JBBPScriptTranslator.java
@@ -123,6 +123,18 @@ final class Parameters {
      * Parser flags.
      */
     private int parserFlags;
+    /**
+     * Turn on generate Bin annotations for fields.
+     *
+     * @since 2.0.0
+     */
+    private boolean addBinAnnotations;
+    /**
+     * Generate newInstance methods in classes.
+     *
+     * @since 2.0.0
+     */
+    private boolean genNewInstance;
 
     @Nullable
     public String getPackageName() {
@@ -193,6 +205,26 @@ public boolean isDoInternalClassesNonStatic() {
       return this.doInternalClassesNonStatic;
     }
 
+    public boolean isGenNewInstance() {
+      return this.genNewInstance;
+    }
+
+    @Nonnull
+    public Parameters setGenNewInstance(final boolean flag) {
+      this.genNewInstance = flag;
+      return this;
+    }
+
+    public boolean isAddBinAnnotations() {
+      return this.addBinAnnotations;
+    }
+
+    @Nonnull
+    public Parameters setAddBinAnnotations(final boolean flag) {
+      this.addBinAnnotations = flag;
+      return this;
+    }
+
     @Nonnull
     public Parameters setSubClassSuperclasses(@Nonnull final Map<String, String> value) {
       this.subClassSuperclasses.clear();
@@ -311,5 +343,6 @@ public Parameters assertAllOk() {
       }
       return this;
     }
+
   }
 }
diff --git a/jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/JavaConverter.java b/jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/JavaConverter.java
@@ -1,7 +1,7 @@
 package com.igormaznitsa.jbbp.plugin.common.converters;
 
 import com.igormaznitsa.jbbp.JBBPParser;
-import com.igormaznitsa.jbbp.compiler.conversion.JBBPToJava6Converter;
+import com.igormaznitsa.jbbp.compiler.conversion.JBBPToJavaConverter;
 import com.igormaznitsa.jbbp.io.JBBPBitOrder;
 import com.igormaznitsa.jbbp.plugin.common.utils.CommonUtils;
 import com.igormaznitsa.meta.common.utils.Assertions;
@@ -17,7 +17,7 @@
 
 import static com.igormaznitsa.jbbp.utils.JBBPUtils.ARRAY_STRING_EMPTY;
 
-public class Java16Converter implements JBBPScriptTranslator {
+public class JavaConverter implements JBBPScriptTranslator {
   @Override
   @Nonnull
   public Set<File> translate(@Nonnull final Parameters parameters, final boolean dryRun) throws IOException {
@@ -38,7 +38,7 @@ public Set<File> translate(@Nonnull final Parameters parameters, final boolean d
       final String[] implementsSorted = parameters.getClassImplements().toArray(ARRAY_STRING_EMPTY);
       Arrays.sort(implementsSorted);
 
-      final JBBPToJava6Converter.Builder builder = JBBPToJava6Converter.makeBuilder(parser)
+      final JBBPToJavaConverter.Builder builder = JBBPToJavaConverter.makeBuilder(parser)
           .setMapSubClassesInterfaces(parameters.getSubClassInterfaces())
           .setMapSubClassesSuperclasses(parameters.getSubClassSuperclasses())
           .setMainClassName(className)
@@ -51,6 +51,14 @@ public Set<File> translate(@Nonnull final Parameters parameters, final boolean d
           .setParserFlags(parameters.getParserFlags())
           .setSuperClass(parameters.superClass);
 
+      if (parameters.isAddBinAnnotations()) {
+        builder.addBinAnnotations();
+      }
+
+      if (parameters.isGenNewInstance()) {
+        builder.genNewInstance();
+      }
+
       if (parameters.isDoInternalClassesNonStatic()) {
         builder.doInternalClassesNonStatic();
       }
diff --git a/jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/Target.java b/jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/Target.java
@@ -3,7 +3,7 @@
 import javax.annotation.Nonnull;
 
 public enum Target {
-  JAVA_1_6(new Java16Converter());
+  JAVA(new JavaConverter());
 
   private final JBBPScriptTranslator JBBPScriptTranslator;
 
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,8 @@
         <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
         <mvn.version>3.0</mvn.version>
         <meta.version>1.1.2</meta.version>
-        <jbbp.version>${project.version}</jbbp.version>
+        <jbbp.version>2.0.0-SNAPSHOT</jbbp.version>
+        <jbbp.plugin.version>${jbbp.version}</jbbp.plugin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <junit5.version>5.5.1</junit5.version>

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public abstract class AbstractJBBPMojo extends AbstractMojo {`
`60`	`60`	`*`
`61`	`61`	`* @see Target`
`62`	`62`	`*/`
`63`		`- @Parameter(alias = "target", defaultValue = "JAVA_1_6")`
	`63`	`+ @Parameter(alias = "target", defaultValue = "JAVA")`
`64`	`64`	`protected String target;`
`65`	`65`	`/**`
`66`	`66`	`* Flag to skip processing of the plug-in.`