added disable generate fields flag

Author: raydac

.gitignore

@@ -6,4 +6,5 @@
 /jbbp-plugins/jbbp-gradle/.gradle/
 /jbbp-plugins/jbbp-gradle/build/
 /jbbp/BenchmarkList
-/jbbp/CompilerHints
+/jbbp/CompilerHints
+/jbbp/nb-configuration.xml

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

@@ -18,6 +18,7 @@
  * @since 1.3.0
  */
 public class JBBPExtension {
+
   /**
    * The Registered name of the extension.
    */
@@ -29,12 +30,14 @@ public class JBBPExtension {
   public Target target = Target.JAVA_1_6;
 
   /**
-   * Flag to generate getters and setters in result class, all fields will be protected ones.
+   * Flag to generate getters and setters in result class, all fields will be
+   * protected ones.
    */
   public boolean addGettersSetters = false;
 
   /**
-   * Make the result class as abstract one even if it doesn't have abstract methods.
+   * Make the result class as abstract one even if it doesn't have abstract
+   * methods.
    */
   public boolean doAbstract = false;
 
@@ -54,7 +57,8 @@ public class JBBPExtension {
   public Set<String> customTypes = new HashSet<String>();
 
   /**
-   * Interface names mapped to generated sub-classes, mapped interface will be used in getters instead of the sub-class type.
+   * Interface names mapped to generated sub-classes, mapped interface will be
+   * used in getters instead of the sub-class type.
    */
   public Map<String, String> mapSubClassInterfaces = new HashMap<String, String>();
 
@@ -74,7 +78,8 @@ public class JBBPExtension {
   public String headComment = null;
 
   /**
-   * Text file which content will be added into head of generated class as comments.
+   * Text file which content will be added into head of generated class as
+   * comments.
    */
   public File headCommentFile = null;
 
@@ -98,6 +103,13 @@ public class JBBPExtension {
    */
   public String packageName = null;
 
+  /**
+   * Disable generate fields for target class.
+   *
+   * @since 1.4.0
+   */
+  public boolean disableGenerateFields = false;
+
   /**
    * Output folder for result classes.
    */

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

@@ -100,7 +100,8 @@ public JBBPAbstractField readCustomFieldType(@Nonnull final JBBPBitInputStream i
         .setClassImplements(ext.interfaces)
         .setSubClassInterfaces(ext.mapSubClassInterfaces)
         .setAddGettersSetters(ext.addGettersSetters)
-        .setDoAbstract(ext.doAbstract);
+        .setDoAbstract(ext.doAbstract)
+        .setDisableGenerateFields(ext.disableGenerateFields);
 
 
     for (final File aScript : findScripts(ext)) {

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

@@ -110,6 +110,11 @@ public class JBBPGenerateMojo extends AbstractJBBPMojo {
    */
   @Parameter(alias = "customText")
   private String customText;
+  /**
+   * Disable generate fields in result class.
+   */
+  @Parameter(alias = "disableGenerateFields",defaultValue = "false")
+  private boolean disableGenerateFields;
   /**
    * Generate getters and setters for class fields (class fields will be private
    * ones).
@@ -193,6 +198,10 @@ public Set<ParserFlags> getParserFlags() {
     return this.parserFlags;
   }
 
+  public boolean isDisableGenerateFields() {
+    return this.disableGenerateFields;
+  }
+  
   @Nullable
   private String makeCapText(@Nonnull final String inEncoding) throws IOException {
     String result = null;
@@ -298,7 +307,8 @@ public JBBPAbstractField readCustomFieldType(@Nonnull final JBBPBitInputStream i
           .setClassImplements(this.interfaces)
           .setSubClassInterfaces(this.mapStructToInterfaces)
           .setAddGettersSetters(this.addGettersSetters)
-          .setDoAbstract(this.doAbstract);
+          .setDoAbstract(this.doAbstract)
+          .setDisableGenerateFields(this.disableGenerateFields);
 
       for (final File aScript : foundJBBPScripts) {
         parameters.setScriptFile(aScript).assertAllOk();

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

@@ -81,6 +81,7 @@ public void testConfig() throws Exception {
     assertEquals("OUT-8", mojo.getOutputEncoding());
     assertEquals("com.igormaznitsa.Super", mojo.getSuperClass());
     assertEquals("SOME_TARGET", mojo.getTarget());
+    assertTrue(mojo.isDisableGenerateFields());
     assertTrue(mojo.getDoAbstract());
     assertTrue(mojo.getAddGettersSetters());
     assertArrayEquals(new String[] {"abc", "def"}, set2array(mojo.getCustomTypes()));

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

@@ -35,6 +35,7 @@
                     <superClass>com.igormaznitsa.Super</superClass>
                     <doAbstract>true</doAbstract>
                     <target>SOME_TARGET</target>
+                    <disableGenerateFields>true</disableGenerateFields>
                     <mapStructToInterfaces>
                         <a.b.c>com.test.C</a.b.c>
                         <a.b.d>com.test.D</a.b.d>

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

@@ -56,6 +56,11 @@ final class Parameters {
      */
     @Nullable
     JBBPCustomFieldTypeProcessor customFieldTypeProcessor = null;
+    /**
+     * Disable generate class fields.
+     * @since 1.4.0
+     */
+    private boolean disableGenerateFields = false;
     /**
      * Flag to force abstract main class.
      */
@@ -131,6 +136,16 @@ public Parameters setAddGettersSetters(final boolean value) {
       return this;
     }
 
+    public boolean isDisableGenerateFields() {
+      return this.disableGenerateFields;
+    }
+
+    @Nonnull
+    public Parameters setDisableGenerateFields(final boolean value) {
+      this.disableGenerateFields = value;
+      return this;
+    }
+    
     @Nonnull
     public Set<String> getClassImplements() {
       return Collections.unmodifiableSet(this.classImplements);

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

@@ -36,7 +36,7 @@ public Set<File> translate(@Nonnull final JBBPScriptTranslator.Parameters parame
       final String[] implementsSorted = parameters.getClassImplements().toArray(new String[parameters.getClassImplements().size()]);
       Arrays.sort(implementsSorted);
 
-      final JBBPToJava6Converter converter = JBBPToJava6Converter.makeBuilder(parser)
+      final JBBPToJava6Converter.Builder builder = JBBPToJava6Converter.makeBuilder(parser)
           .setMapSubClassesInterfaces(parameters.getSubClassInterfaces())
           .setMainClassName(className)
           .setHeadComment(parameters.getHeadComment())
@@ -46,9 +46,13 @@ public Set<File> translate(@Nonnull final JBBPScriptTranslator.Parameters parame
           .setDoMainClassAbstract(parameters.isDoAbstract())
           .setMainClassImplements(implementsSorted)
           .setParserFlags(parameters.getParserFlags())
-          .setSuperClass(parameters.superClass).build();
+          .setSuperClass(parameters.superClass);
 
-      FileUtils.write(resultJavaFile, converter.convert(), parameters.getEncodingOut());
+      if (parameters.isDisableGenerateFields()) {
+        builder.disableGenerateFields();
+      }
+      
+      FileUtils.write(resultJavaFile, builder.build().convert(), parameters.getEncodingOut());
     }
     return resultFiles;
   }

jbbp/src/test/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJava6ConverterReadWriteTest.java

@@ -74,7 +74,6 @@ public static abstract class TestSuperclass {
   public void testReadWrite_ExtendsSuperClassAndUseItsFields() throws Exception {
     final JBBPParser parser = JBBPParser.prepare("stringj str; stringj [2] strarr;  floatj flt; floatj [2] fltarr; doublej dbl; doublej [2] dblarr;");
     final String text = JBBPToJava6Converter.makeBuilder(parser).setMainClassName(CLASS_NAME).setMainClassPackage(PACKAGE_NAME).disableGenerateFields().setSuperClass(TestSuperclass.class.getCanonicalName()).setAddGettersSetters(true).build().convert();
-    System.out.println(text);
     final String fullClassName = PACKAGE_NAME + '.' + CLASS_NAME;
     final ClassLoader classLoader = saveAndCompile(new JavaClassContent(fullClassName, text));