added flag to not make internal classes as static ones

Author: raydac

jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJava6Converter.java

@@ -270,15 +270,15 @@ public void visitStructureStart(final int offsetInCompiledBlock, final JBBPNamed
     final String structBaseTypeName = structName.toUpperCase(Locale.ENGLISH);
     final String arraySizeIn = nullableArraySize == null ? null : evaluatorToString(NAME_INPUT_STREAM, offsetInCompiledBlock, nullableArraySize, this.flagSet, true);
     final String arraySizeOut = nullableArraySize == null ? null : evaluatorToString(NAME_OUTPUT_STREAM, offsetInCompiledBlock, nullableArraySize, this.flagSet, true);
-    final Struct newStruct = new Struct(this.getCurrentStruct(), structBaseTypeName, "public static");
+    final Struct newStruct = new Struct(this.getCurrentStruct(), structBaseTypeName, "public" + (builder.internalClassesNotStatic ? "" : " static"));
 
     final String fieldModifier = makeModifier(nullableNameFieldInfo);
 
     final String toType;
     if (this.builder.generateFields) {
       toType = "";
     } else {
-      toType = '('+structBaseTypeName+')';
+      toType = '(' + structBaseTypeName + ')';
     }
 
     final String structType;
@@ -293,8 +293,8 @@ public void visitStructureStart(final int offsetInCompiledBlock, final JBBPNamed
 
       this.getCurrentStruct().getReadFunc().indent()
           .printf("if ( this.%1$s == null) { this.%1$s = new %2$s(%3$s);}", structName, structType, this.structStack.size() == 1 ? "this" : "this." + NAME_ROOT_STRUCT)
-          .printf(" %s.read(%s);%n", toType.length() == 0 ? "this." + structName : '('+toType+ "this." + structName+')', NAME_INPUT_STREAM);
-      this.getCurrentStruct().getWriteFunc().indent().print(toType.length() == 0 ? structName : '(' +toType + structName + ')').println(".write(Out);");
+          .printf(" %s.read(%s);%n", toType.length() == 0 ? "this." + structName : '(' + toType + "this." + structName + ')', NAME_INPUT_STREAM);
+      this.getCurrentStruct().getWriteFunc().indent().print(toType.length() == 0 ? structName : '(' + toType + structName + ')').println(".write(Out);");
     } else {
       structType = structBaseTypeName + " []";
       if (this.builder.generateFields) {
@@ -310,7 +310,7 @@ public void visitStructureStart(final int offsetInCompiledBlock, final JBBPNamed
                 structBaseTypeName,
                 (this.structStack.size() == 1 ? "this" : NAME_ROOT_STRUCT),
                 NAME_INPUT_STREAM);
-        this.getCurrentStruct().getWriteFunc().indent().printf("for (int I=0;I<this.%1$s.length;I++){ %2$s.write(%3$s); }%n", structName, toType.length() == 0 ? "this."+structName + "[I]" : '(' + toType +"this."+structName + "[I])", NAME_OUTPUT_STREAM);
+        this.getCurrentStruct().getWriteFunc().indent().printf("for (int I=0;I<this.%1$s.length;I++){ %2$s.write(%3$s); }%n", structName, toType.length() == 0 ? "this." + structName + "[I]" : '(' + toType + "this." + structName + "[I])", NAME_OUTPUT_STREAM);
       } else {
         this.getCurrentStruct().getReadFunc().indent()
             .printf("if (this.%1$s == null || this.%1$s.length != %2$s){ this.%1$s = new %3$s[%2$s]; for(int I=0;I<%2$s;I++){ this.%1$s[I] = new %3$s(%4$s);}}", structName, arraySizeIn, structBaseTypeName, (this.structStack.size() == 1 ? "this" : "this." + NAME_ROOT_STRUCT))
@@ -971,6 +971,11 @@ public static final class Builder {
      * Superclasses to be extended by generated subclasses.
      */
     private final Map<String, String> mapSubClassesSuperclasses = new HashMap<String, String>();
+
+    /**
+     * Imternal classes must not be static.
+     */
+    public boolean internalClassesNotStatic;
     /**
      * The Package name for the result class.
      */
@@ -1129,6 +1134,18 @@ public Builder setMainClassName(final String value) {
       return this;
     }
 
+    /**
+     * Don't make insternal generated classes as static ones
+     *
+     * @return the builder instance, must not be null
+     * @since 1.4.0
+     */
+    public Builder doInternalClassesNonStatic() {
+      assertNonLocked();
+      this.internalClassesNotStatic = true;
+      return this;
+    }
+
     /**
      * Set the superclass for the main generated class. <b>NB! Also it affects read and write methods of the main class, the class will be used as the return type.</b>
      *

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

@@ -62,7 +62,7 @@ private byte[] loadResource(final String name) throws Exception {
     }
   }
 
-  public static abstract class TestSuperclass {
+  public static class TestSuperclass {
     public String str;
     public String[] strarr;
     public float flt;
@@ -71,12 +71,12 @@ public static abstract class TestSuperclass {
     public double[] dblarr;
     public char len;
 
-    public static abstract class Ins {
+    public class Ins {
       public byte[] a;
       public byte b;
       public byte c;
 
-      public static abstract class InsIns {
+      public class InsIns {
         public byte a;
       }
 
@@ -112,17 +112,20 @@ public void testReadWrite_ExtendsSuperClassAndUseItsFields() throws Exception {
     superclasses.put("ins",TestSuperclass.Ins.class.getCanonicalName());
     superclasses.put("ins.insins",TestSuperclass.Ins.InsIns.class.getCanonicalName());
 
+    final String thePackage = JBBPToJava6ConverterReadWriteTest.class.getPackage().getName();
+
     final String text = JBBPToJava6Converter.makeBuilder(parser)
         .setMainClassName(CLASS_NAME)
-        .setMainClassPackage(PACKAGE_NAME)
+        .setMainClassPackage(thePackage)
         .disableGenerateFields()
         .setSuperClass(TestSuperclass.class.getCanonicalName())
         .setMapSubClassesSuperclasses(superclasses)
         .setAddGettersSetters(false)
+        .doInternalClassesNonStatic()
         .build()
         .convert();
 
-    final String fullClassName = PACKAGE_NAME + '.' + CLASS_NAME;
+    final String fullClassName = thePackage + '.' + CLASS_NAME;
     final ClassLoader classLoader = saveAndCompile(new JavaClassContent(fullClassName, text));
 
     final Object instance = ReflectUtils.newInstance(classLoader.loadClass(fullClassName));

jbbp/src/test/java/com/igormaznitsa/jbbp/testaux/AbstractJBBPToJava6ConverterTest.java

@@ -98,8 +98,8 @@ protected Object callRead(final Object instance, final JBBPBitInputStream inStre
       instance.getClass().getMethod("read", JBBPBitInputStream.class).invoke(instance, inStream);
       return instance;
     } catch (InvocationTargetException ex) {
-      if (ex.getCause() != null) {
-        throw (Exception) ex.getCause();
+      if (ex.getTargetException() != null) {
+        throw (Exception) ex.getTargetException();
       } else {
         throw ex;
       }