Merge branch '2.8'

Author: cowtowncoder

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/AmbiguousUnionWriteTest.java

@@ -24,9 +24,9 @@ public class AmbiguousUnionWriteTest extends AvroTestBase
             );
 
     static class StringWrapper {
-        public String value;
+        public Object value;
 
-        public StringWrapper(String v) { value = v; }
+        public StringWrapper(Object v) { value = v; }
         protected StringWrapper() { }
     }
 
@@ -41,9 +41,12 @@ protected StringWrapper() { }
     public void testWriteNoAmbiguity() throws Exception
     {
         AvroSchema schema = MAPPER.schemaFrom(SCHEMA_WITH_AMBIGUITY);
+        StringWrapper input = new StringWrapper("foobar");
+        // 23-Aug-2017, tatu: we could trigger exception with this, however:
+//        StringWrapper input = new StringWrapper(new java.util.HashMap<String,Integer>());
         byte[] b = MAPPER.writerFor(StringWrapper.class)
                 .with(schema)
-                .writeValueAsBytes(new StringWrapper("foobar"));
+                .writeValueAsBytes(input);
         StringWrapper output = MAPPER.readerFor(StringWrapper.class)
                 .with(schema)
                 .readValue(b);

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ReadSimpleTest.java

@@ -49,14 +49,14 @@ public NamedStrings(String n, String... v) {
         }
     }
 
-    final ObjectMapper MAPPER = new ObjectMapper(new ProtobufFactory());
-    
     /*
     /**********************************************************
     /* Test methods
     /**********************************************************
      */
 
+    final ObjectMapper MAPPER = new ProtobufMapper();
+
     public void testReadPointInt() throws Exception
     {
         ProtobufSchema schema = ProtobufSchemaLoader.std.parse(PROTOC_BOX, "Point");

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ReadUnkownFieldsTest.java

@@ -0,0 +1,90 @@
+package com.fasterxml.jackson.dataformat.protobuf;
+
+import com.fasterxml.jackson.annotation.*;
+
+import com.fasterxml.jackson.core.*;
+
+import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
+
+public class ReadUnkownFieldsTest extends ProtobufTestBase
+{
+    static class OneField {
+
+        @JsonProperty(value = "f3", index = 3)
+        private int f3;
+
+        public int getF3() {
+          return f3;
+        }
+
+        public void setF3(int f3) {
+          this.f3 = f3;
+        }
+      }
+
+      static class ThreeField {
+
+        @JsonProperty(value = "f1", index = 1)
+        private int f1;
+
+        @JsonProperty(value = "f2", index = 2)
+        private int f2;
+
+        @JsonProperty(value = "f3", index = 3)
+        private int f3;
+
+        public int getF1() {
+          return f1;
+        }
+
+        public void setF1(int f1) {
+          this.f1 = f1;
+        }
+
+        public int getF2() {
+          return f2;
+        }
+
+        public void setF2(int f2) {
+          this.f2 = f2;
+        }
+
+        public int getF3() {
+          return f3;
+        }
+
+        public void setF3(int f3) {
+          this.f3 = f3;
+        }
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    final ProtobufMapper MAPPER = new ProtobufMapper();
+
+    public void testMultipleUnknown() throws Exception
+    {
+        ProtobufMapper mapper = new ProtobufMapper();
+
+        ThreeField threeField = new ThreeField();
+        threeField.setF1(1);
+        threeField.setF2(2);
+        threeField.setF3(3);
+
+        ProtobufSchema schemaWith3 = MAPPER.generateSchemaFor(ThreeField.class);
+        byte[] in = mapper.writerFor(ThreeField.class).with(schemaWith3)
+                .writeValueAsBytes(threeField);
+
+        ProtobufSchema schemaWith1 = MAPPER.generateSchemaFor(OneField.class);
+        OneField oneField = mapper.readerFor(OneField.class).with(schemaWith1)
+                // important: skip through unknown
+                .with(JsonParser.Feature.IGNORE_UNDEFINED)
+                .readValue(in);
+
+        assertEquals(threeField.getF3(), oneField.getF3());
+    }
+}

release-notes/CREDITS

@@ -26,6 +26,8 @@ marsqing@github
  (2.8.9)
 * Reported #94: (protobuf) Should _ensureRoom in ProtobufGenerator.writeString()
  (2.8.10)
+* Reported #106 (protobuf), contributed fix for: calling _skipUnknownValue() twice
+ (2.8.11 / 2.9.1)
 
 baharclerode@github:
 

release-notes/VERSION

@@ -38,7 +38,12 @@ Modules:
  (reported by coder-hub@github)
 - (avro): Upgrade `avro-core` dep from 1.7.7 to 1.8.1
 
-2.8.10 (not yet released)
+2.8.11 (not yet released)
+
+#106: fix calling _skipUnknownValue() twice
+ (reported, contributed fix for by marsqing@github@github)
+
+2.8.10 (24-Aug-2017)
 
 #94: Should _ensureRoom in ProtobufGenerator.writeString()
  (reported by marsqing@github)