Fix #74

Author: cowtowncoder

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ser/GeneratorIgnoreUnknown51Test.java

@@ -4,8 +4,9 @@
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
+
 import com.fasterxml.jackson.core.JsonGenerator;
+
 import com.fasterxml.jackson.dataformat.csv.CsvMapper;
 import com.fasterxml.jackson.dataformat.csv.CsvMappingException;
 import com.fasterxml.jackson.dataformat.csv.CsvSchema;

properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java

@@ -50,7 +50,7 @@ public class JavaPropsParser extends ParserMinimalBase
     /* Parsing state
     /**********************************************************
      */
-    
+
     protected JPropReadContext _readContext;
 
     protected boolean _closed;
@@ -60,11 +60,11 @@ public class JavaPropsParser extends ParserMinimalBase
     /* Recycled helper objects
     /**********************************************************
      */
-    
+
     protected ByteArrayBuilder _byteArrayBuilder;
-    
+
     protected byte[] _binaryValue;
-    
+
     /*
     /**********************************************************
     /* Life-cycle
@@ -209,7 +209,7 @@ public String getCurrentName() throws IOException {
 
     @Override
     public JsonToken nextToken() throws IOException {
-
+        _binaryValue = null;
         if (_readContext == null) {
             if (_closed) {
                 return null;
@@ -225,7 +225,6 @@ public JsonToken nextToken() throws IOException {
 System.err.println("\n>>");
 */
         }
-
         while ((_currToken = _readContext.nextToken()) == null) {
             _readContext = _readContext.nextContext();
             if (_readContext == null) { // end of content

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/ArrayParsingTest.java

@@ -49,14 +49,14 @@ static class StringArrayWrapper {
         public String[] str;
     }
 
-    private final ObjectMapper MAPPER = mapperForProps();
-    
     /*
     /**********************************************************************
     /* Test methods
     /**********************************************************************
      */
 
+    private final ObjectMapper MAPPER = mapperForProps();
+
     public void testArrayWithBranch() throws Exception
     {
         // basically "extra" branch should become as first element, and

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/BinaryParsingTest.java

@@ -0,0 +1,46 @@
+package com.fasterxml.jackson.dataformat.javaprop;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import java.nio.ByteBuffer;
+import java.util.Properties;
+
+public class BinaryParsingTest extends ModuleTestBase
+{
+    // [dataformats-text#74]: problem with multiple binary fields
+    static class MyBean {
+        public byte[] a;
+        public byte[] b;
+        public ByteBuffer c;
+
+        protected MyBean() { }
+        public MyBean(boolean bogus) {
+            a = new byte[] { 1 };
+            b = new byte[] { 3, 28, 7 };
+            c = ByteBuffer.wrap(new byte[] { 1, 2, 3, 4, 5, 67 });
+        }
+    }
+
+    /*
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
+     */
+
+    private final JavaPropsMapper MAPPER = mapperForProps();
+
+    // [dataformats-text#74]
+    public void testMultipleBinaryFields() throws Exception
+    {
+        MyBean src = new MyBean(true);
+        Properties props = MAPPER.writeValueAsProperties(src);
+
+        MyBean result = MAPPER.readPropertiesAs(props, MyBean.class);
+        assertArrayEquals(src.a, result.a);
+        assertArrayEquals(src.b, result.b);
+        ByteBuffer b1 = src.c;
+        ByteBuffer b2 = result.c;
+
+        assertEquals(b1, b2);
+    }
+}

release-notes/CREDITS renamed to release-notes/CREDITS-2.x

@@ -15,3 +15,9 @@ Mike Kobit (mkobit@github.com)
 
 * Reported #65 (yaml): `YAMLParser` incorrectly handles numbers with underscores in them
  (2.9.4)
+
+Fabrice Delhoste (spifd@github)
+
+* Reported #74 (properties): `JavaPropsMapper` issue deserializing multiple byte array properties
+ (2.9.5)
+

release-notes/VERSION renamed to release-notes/VERSION-2.x

@@ -14,6 +14,8 @@ Modules:
  (reported by mbechler@github)
 #65 (yaml): `YAMLParser` incorrectly handles numbers with underscores in them
  (reported by Mike K)
+#74 (properties): `JavaPropsMapper` issue deserializing multiple byte array properties
+ (reported by Fabrice D)
 
 2.9.3 (09-Dec-2017)
 

yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/ser/GeneratorFeature34Test.java

@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.dataformat.yaml.ModuleTestBase;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature;
 
 public class GeneratorFeature34Test extends ModuleTestBase
 {