#42 fixed END_STRUCT leak from parent class in collectAnnotatedFields call

Author: raydac

jbbp-plugins/jbbp-gradle-tests/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-main-plugin-pom</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-gradle-tests</artifactId>

jbbp-plugins/jbbp-gradle/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-main-plugin-pom</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-gradle-plugin</artifactId>

jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-maven-plugin-pom</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-maven-plugin-tests</artifactId>

jbbp-plugins/jbbp-maven/jbbp-maven-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-maven-plugin-pom</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-maven-plugin</artifactId>

jbbp-plugins/jbbp-maven/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-main-plugin-pom</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-maven-plugin-pom</artifactId>

jbbp-plugins/jbbp-plugin-common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-main-plugin-pom</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-plugin-common</artifactId>

jbbp-plugins/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-main-pom</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp-main-plugin-pom</artifactId>

jbbp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.igormaznitsa</groupId>
         <artifactId>jbbp-main-pom</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>jbbp</artifactId>

jbbp/src/main/java/com/igormaznitsa/jbbp/utils/JBBPDslBuilder.java

@@ -1641,7 +1641,7 @@ protected BinFieldContainer collectAnnotatedFields(final Class<?> annotatedClass
     if (superClass != null && superClass != Object.class) {
       final BinFieldContainer parentFields = collectAnnotatedFields(superClass);
       if (!parentFields.fields.isEmpty()) {
-        result.addAllFromContainer(parentFields);
+        result.addAllFromContainerExcludeEndStruct(parentFields);
       }
     }
 
@@ -1660,9 +1660,7 @@ protected BinFieldContainer collectAnnotatedFields(final Class<?> annotatedClass
             if (foundFieldBin != null) {
               result.addBinField(foundFieldBin, true, f);
             } else {
-              if (defaultBin != null) {
-                result.addBinField(defaultBin, false, f);
-              }
+              result.addBinField(defaultBin, false, f);
             }
           } else {
             final BinFieldContainer container = collectAnnotatedFields(type);
@@ -2148,6 +2146,14 @@ void addAllFromContainer(final BinFieldContainer container) {
       this.fields.addAll(container.fields);
     }
 
+    void addAllFromContainerExcludeEndStruct(final BinFieldContainer container) {
+      for(final BinField field : container.fields) {
+        if (field != END_STRUCT) {
+          this.fields.add(field);
+        }
+      }
+    }
+
     void addContainer(final BinFieldContainer container) {
       this.fields.add(container);
     }

jbbp/src/test/java/com/igormaznitsa/jbbp/it/BasedOnQuestionsAndCasesTest.java

@@ -663,4 +663,29 @@ class Klazz {
     assertEquals(7890, parsed.c);
   }
 
+  @Bin
+  public class Parent {
+    @Bin(order = 1, type = BinType.USHORT, comment = "Size of package header")
+    public int headerSize;
+  }
+
+  @Bin
+  public class Child extends Parent {
+    @Bin(order = 2, type = BinType.BYTE_ARRAY, arraySizeExpr = "2")
+    public String body;
+  }
+
+  /*
+   * Test for reported issue #42 https://github.com/raydac/java-binary-block-parser/issues/42
+   */
+  @Test
+  public void testCase_github_bug42_ThereIsNotAnyOpenedStruct() throws Exception {
+    byte[] data = new byte[] {0x12, 0x34, 0x20, 0x20};
+    final JBBPParser parser = JBBPParser.prepare(JBBPDslBuilder.Begin().AnnotatedClass(Child.class).End());
+    JBBPFieldStruct parsed = parser.parse(data);
+    final Child parsedPackage = parsed.findFieldForNameAndType("Child", JBBPFieldStruct.class).mapTo(new Child());
+    assertEquals(0x1234, parsedPackage.headerSize);
+    assertEquals("  ", parsedPackage.body);
+  }
+
 }