added new parameters

Author: raydac

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

@@ -62,6 +62,13 @@ public class JBBPExtension {
    */
   public Map<String, String> mapSubClassInterfaces = new HashMap<String, String>();
 
+  /**
+   * Superclasses to be mapped to generated sub-classes
+   *
+   * @since 1.4.0
+   */
+  public Map<String, String> mapSubClassSuperclasses = new HashMap<String, String>();
+
   /**
    * Encoding for text input.
    */
@@ -110,6 +117,13 @@ public class JBBPExtension {
    */
   public boolean disableGenerateFields = false;
 
+  /**
+   * Make inner clases non-static ones
+   *
+   * @since 1.4.0
+   */
+  public boolean doInternalClassesNonStatic = false;
+
   /**
    * Output folder for result classes.
    */

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

@@ -99,6 +99,8 @@ public JBBPAbstractField readCustomFieldType(@Nonnull final JBBPBitInputStream i
         .setSuperClass(ext.superClass)
         .setClassImplements(ext.interfaces)
         .setSubClassInterfaces(ext.mapSubClassInterfaces)
+        .setSubClassSuperclasses(ext.mapSubClassSuperclasses)
+        .setDoInternalClassesNonStatic(ext.doInternalClassesNonStatic)
         .setAddGettersSetters(ext.addGettersSetters)
         .setDoAbstract(ext.doAbstract)
         .setDisableGenerateFields(ext.disableGenerateFields);

jbbp-plugins/jbbp-maven/jbbp-maven-plugin/src/main/java/com/igormaznitsa/jbbp/plugin/mvn/JBBPGenerateMojo.java

@@ -76,6 +76,20 @@ public class JBBPGenerateMojo extends AbstractJBBPMojo {
    */
   @Parameter(alias = "mapStructToInterfaces")
   private final Map<String, String> mapStructToInterfaces = new HashMap<String, String>();
+  /**
+   * Superclasses for structures, structure will be extending mapped superclass.
+   *
+   * @since 1.4.0
+   */
+  @Parameter(alias = "mapStructToSuperclasses")
+  private final Map<String, String> mapStructToSuperclasses = new HashMap<String, String>();
+  /**
+   * Do not make generated inner classes as static ones.
+   *
+   * @since 1.4.0
+   */
+  @Parameter(alias = "doInnerClassesNonStatic")
+  private boolean doInnerClassesNonStatic;
   /**
    * Specify output file encoding; defaults to source encoding.
    */
@@ -113,7 +127,7 @@ public class JBBPGenerateMojo extends AbstractJBBPMojo {
   /**
    * Disable generate fields in result class.
    */
-  @Parameter(alias = "disableGenerateFields",defaultValue = "false")
+  @Parameter(alias = "disableGenerateFields", defaultValue = "false")
   private boolean disableGenerateFields;
   /**
    * Generate getters and setters for class fields (class fields will be private
@@ -137,6 +151,10 @@ public String getSuperClass() {
     return this.superClass;
   }
 
+  public void setDoAbstract(final boolean value) {
+    this.doAbstract = value;
+  }
+
   public boolean getDoAbstract() {
     return this.doAbstract;
   }
@@ -146,6 +164,11 @@ public Map<String, String> getMapStructToInterfaces() {
     return this.mapStructToInterfaces;
   }
 
+  @Nonnull
+  public Map<String, String> getMapStructToSuperclasses() {
+    return this.mapStructToSuperclasses;
+  }
+
   @Nonnull
   @MustNotContainNull
   public Set<String> getInterfaces() {
@@ -201,7 +224,19 @@ public Set<ParserFlags> getParserFlags() {
   public boolean isDisableGenerateFields() {
     return this.disableGenerateFields;
   }
-  
+
+  public void setDisableGenerateFields(final boolean value) {
+    this.disableGenerateFields = value;
+  }
+
+  public void setDoInnerClassesNonStatic(final boolean value) {
+    this.doInnerClassesNonStatic = value;
+  }
+
+  public boolean isDoInnerClassesNonStatic() {
+    return this.doInnerClassesNonStatic;
+  }
+
   @Nullable
   private String makeCapText(@Nonnull final String inEncoding) throws IOException {
     String result = null;
@@ -306,6 +341,8 @@ public JBBPAbstractField readCustomFieldType(@Nonnull final JBBPBitInputStream i
           .setSuperClass(this.superClass)
           .setClassImplements(this.interfaces)
           .setSubClassInterfaces(this.mapStructToInterfaces)
+          .setDoInternalClassesNonStatic(this.doInnerClassesNonStatic)
+          .setSubClassSuperclasses(this.mapStructToSuperclasses)
           .setAddGettersSetters(this.addGettersSetters)
           .setDoAbstract(this.doAbstract)
           .setDisableGenerateFields(this.disableGenerateFields);

jbbp-plugins/jbbp-maven/jbbp-maven-plugin/src/test/java/com/igormaznitsa/jbbp/plugin/mvn/JBBPGenerateMojoTest.java

@@ -89,10 +89,18 @@ public void testConfig() throws Exception {
     assertArrayEquals(new String[] {"path1/**/*.jbbp", "path2/**/*.jbbp"}, set2array(mojo.getIncludes()));
     assertArrayEquals(new String[] {"path3/**/*.jbbp", "path4/**/*.jbbp"}, set2array(mojo.getExcludes()));
 
+    assertTrue(mojo.isDoInnerClassesNonStatic());
+    assertTrue(mojo.isDisableGenerateFields());
+
     final Map<String, String> mapStructToInterfaces = mojo.getMapStructToInterfaces();
     assertEquals(2, mapStructToInterfaces.size());
     assertEquals("com.test.C", mapStructToInterfaces.get("a.b.c"));
     assertEquals("com.test.D", mapStructToInterfaces.get("a.b.d"));
+
+    final Map<String, String> mapStructToSuperclasses = mojo.getMapStructToSuperclasses();
+    assertEquals(2, mapStructToSuperclasses.size());
+    assertEquals("com.test.CC", mapStructToSuperclasses.get("a.b.c"));
+    assertEquals("com.test.DD", mapStructToSuperclasses.get("a.b.d"));
   }
 
 }

jbbp-plugins/jbbp-maven/jbbp-maven-plugin/src/test/resources/com/igormaznitsa/jbbp/plugin/mvn/mojoConfig.xml

@@ -40,6 +40,12 @@
                         <a.b.c>com.test.C</a.b.c>
                         <a.b.d>com.test.D</a.b.d>
                     </mapStructToInterfaces>
+                    <mapStructToSuperclasses>
+                        <a.b.c>com.test.CC</a.b.c>
+                        <a.b.d>com.test.DD</a.b.d>
+                    </mapStructToSuperclasses>
+                    <doInnerClassesNonStatic>true</doInnerClassesNonStatic>
+                    <disableGenerateFields>true</disableGenerateFields>
                     <customTypes>
                         <type>abc</type>
                         <type>def</type>

jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/JBBPScriptTranslator.java

@@ -41,6 +41,20 @@ final class Parameters {
      */
     @Nonnull
     private final Map<String, String> subClassInterfaces = new HashMap<String, String>();
+    /**
+     * Map of superclasses to be extended by subclasses.
+     *
+     * @since 1.4.0
+     */
+    @Nonnull
+    private final Map<String, String> subClassSuperclasses = new HashMap<String, String>();
+
+    /**
+     * Flag to not make generated subclasses as static ones.
+     *
+     * @since 1.4.0
+     */
+    private boolean doInternalClassesNonStatic;
     /**
      * Set of interface names to be implemented by the main class.
      */
@@ -58,6 +72,7 @@ final class Parameters {
     JBBPCustomFieldTypeProcessor customFieldTypeProcessor = null;
     /**
      * Disable generate class fields.
+     *
      * @since 1.4.0
      */
     private boolean disableGenerateFields = false;
@@ -145,7 +160,7 @@ public Parameters setDisableGenerateFields(final boolean value) {
       this.disableGenerateFields = value;
       return this;
     }
-    
+
     @Nonnull
     public Set<String> getClassImplements() {
       return Collections.unmodifiableSet(this.classImplements);
@@ -163,6 +178,28 @@ public Map<String, String> getSubClassInterfaces() {
       return Collections.unmodifiableMap(this.subClassInterfaces);
     }
 
+    @Nonnull
+    public Map<String, String> getSubClassSuperclasses() {
+      return Collections.unmodifiableMap(this.subClassSuperclasses);
+    }
+
+    @Nonnull
+    public Parameters setDoInternalClassesNonStatic(final boolean flag) {
+      this.doInternalClassesNonStatic = flag;
+      return this;
+    }
+
+    public boolean isDoInternalClassesNonStatic() {
+      return this.doInternalClassesNonStatic;
+    }
+
+    @Nonnull
+    public Parameters setSubClassSuperclasses(@Nonnull final Map<String, String> value) {
+      this.subClassSuperclasses.clear();
+      this.subClassSuperclasses.putAll(value);
+      return this;
+    }
+
     @Nonnull
     public Parameters setSubClassInterfaces(@Nonnull final Map<String, String> value) {
       this.subClassInterfaces.clear();

jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/Java16Converter.java

@@ -18,7 +18,7 @@
 public class Java16Converter implements JBBPScriptTranslator {
   @Override
   @Nonnull
-  public Set<File> translate(@Nonnull final JBBPScriptTranslator.Parameters parameters, final boolean dryRun) throws IOException {
+  public Set<File> translate(@Nonnull final Parameters parameters, final boolean dryRun) throws IOException {
     final File scriptToProcess = Assertions.assertNotNull(parameters.getScriptFile());
 
     final String text = FileUtils.readFileToString(scriptToProcess, parameters.getEncodingIn());
@@ -38,6 +38,7 @@ public Set<File> translate(@Nonnull final JBBPScriptTranslator.Parameters parame
 
       final JBBPToJava6Converter.Builder builder = JBBPToJava6Converter.makeBuilder(parser)
           .setMapSubClassesInterfaces(parameters.getSubClassInterfaces())
+          .setMapSubClassesSuperclasses(parameters.getSubClassSuperclasses())
           .setMainClassName(className)
           .setHeadComment(parameters.getHeadComment())
           .setMainClassPackage(packageName)
@@ -48,6 +49,10 @@ public Set<File> translate(@Nonnull final JBBPScriptTranslator.Parameters parame
           .setParserFlags(parameters.getParserFlags())
           .setSuperClass(parameters.superClass);
 
+      if (parameters.isDoInternalClassesNonStatic()) {
+        builder.doInternalClassesNonStatic();
+      }
+
       if (parameters.isDisableGenerateFields()) {
         builder.disableGenerateFields();
       }