fix for issue #2 "NullPointerException in JBBPTextWriter for String field mapped to byte array"

Author: raydac

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

@@ -115,7 +115,11 @@ protected void onArrayEnd(final Object obj, final Field field, final com.igormaz
       try {
         IndentDec();
         HR();
-        Comment("END ARRAY : " + makeArrayDescription(field, annotation));
+        if (field.getType() == String.class){
+          Comment("END STRING : " + makeArrayDescription(field, annotation));
+        }else{
+          Comment("END ARRAY : " + makeArrayDescription(field, annotation));
+        }
         HR();
       }
       catch (IOException ex) {
@@ -130,7 +134,11 @@ protected void onArrayEnd(final Object obj, final Field field, final com.igormaz
     protected void onArrayStart(final Object obj, final Field field, final com.igormaznitsa.jbbp.mapper.Bin annotation, final int length) {
       try {
         HR();
-        Comment("START ARRAY : " + makeArrayDescription(field, annotation) + " OF " + field.getType().getComponentType().getSimpleName() + " [" + length + ']');
+        if (field.getType() == String.class){
+          Comment("STRING: " + makeFieldDescription(field, annotation));
+        }else{
+          Comment("START ARRAY : " + makeArrayDescription(field, annotation) + " OF " + field.getType().getComponentType().getSimpleName() + " [" + length + ']');
+        }
         HR();
         IndentInc();
       }

src/test/java/com/igormaznitsa/jbbp/utils/JBBPTextWriterTest.java

@@ -19,6 +19,7 @@
 import com.igormaznitsa.jbbp.io.JBBPByteOrder;
 import com.igormaznitsa.jbbp.it.AbstractParserIntegrationTest;
 import com.igormaznitsa.jbbp.mapper.Bin;
+import com.igormaznitsa.jbbp.mapper.BinType;
 import com.igormaznitsa.jbbp.utils.JBBPTextWriter.Extra;
 import java.io.*;
 import java.lang.reflect.Field;
@@ -637,7 +638,7 @@ class SomeClass {
 
     final String text = writer.SetCommentPrefix("; ").Bin(cl).Close().toString();
     System.out.println(text);
-    assertFile("testwriterbin1.txt", text);;
+    assertFile("testwriterbin1.txt", text);
   }
 
   @Test
@@ -682,13 +683,28 @@ class Png {
 
       System.out.println(text);
 
-      assertFile("testwriterbin2.txt", text);;
+      assertFile("testwriterbin2.txt", text);
     }
     finally {
       JBBPUtils.closeQuietly(pngStream);
     }
   }
 
+  @Test
+  public void testBin_ByteArrayMappedToString() throws Exception {
+    class Parsed {
+      @Bin (type = BinType.BYTE_ARRAY) String str1;
+      @Bin (type = BinType.UBYTE_ARRAY) String str2;
+    }
+
+    final Parsed parsed = JBBPParser.prepare("byte [5] str1; ubyte [4] str2;").parse(new byte[]{49,50,51,52,53,54,55,56,57}).mapTo(Parsed.class);
+    final String text = writer.Bin(parsed).Close().toString();
+
+    System.out.println(text);
+    
+    assertFile("testwriterbin5.txt", text);
+  }
+  
   @Test
   public void testCustomFieldInMappedClass() throws Exception {
     class TestClass {

src/test/resources/com/igormaznitsa/jbbp/utils/testwriterbin5.txt

@@ -0,0 +1,20 @@
+~--------------------------------------------------------------------------------
+;START : Parsed
+~--------------------------------------------------------------------------------
+    ~--------------------------------------------------------------------------------
+    ;STRING: str1
+    ~--------------------------------------------------------------------------------
+        .0x31,0x32,0x33,0x34,0x35
+    ~--------------------------------------------------------------------------------
+    ;END STRING : str1
+    ~--------------------------------------------------------------------------------
+    ~--------------------------------------------------------------------------------
+    ;STRING: str2
+    ~--------------------------------------------------------------------------------
+        .0x36,0x37,0x38,0x39
+    ~--------------------------------------------------------------------------------
+    ;END STRING : str2
+    ~--------------------------------------------------------------------------------
+~--------------------------------------------------------------------------------
+;END : Parsed
+~--------------------------------------------------------------------------------