Merge: b5ee1f4 185f7bb

David Astle · David Astle · commit 48aa89211ab9 · 2016-01-07T12:45:39.000-05:00
Merge branch 'topic/avro-translate-default'

RB=630569
G=si-dev
R=gogenc,sihde,eleshem
A=sihde,eleshem
diff --git a/data-avro/src/main/java/com/linkedin/data/avro/DataTranslator.java b/data-avro/src/main/java/com/linkedin/data/avro/DataTranslator.java
@@ -553,8 +553,8 @@ else if (fieldValue == null)
               else
               {
                 appendMessage("required field is absent");
-                _path.removeLast();
               }
+              _path.removeLast();
               continue;
             }
             Object fieldAvroValue = translate(fieldValue, fieldDataSchema, fieldAvroSchema);
diff --git a/data-avro/src/test/java/com/linkedin/data/avro/TestDataTranslator.java b/data-avro/src/test/java/com/linkedin/data/avro/TestDataTranslator.java
@@ -927,7 +927,7 @@ public void testAvroSchemaMissingFields() throws IOException
   @Test
   public void testMissingDefaultFieldsOnDataMap() throws IOException
   {
-    final String P_SCHEMA =
+    final String SCHEMA =
         "{" +
             "   \"type\":\"record\"," +
             "   \"name\":\"Foo\"," +
@@ -946,27 +946,8 @@ public void testMissingDefaultFieldsOnDataMap() throws IOException
             "      }" +
             "   ]" +
             "}";
-    final String A_SCHEMA =
-        "{" +
-            "   \"type\":\"record\"," +
-            "   \"name\":\"Foo\"," +
-            "   \"fields\":[" +
-            "      {\n" +
-            "         \"name\":\"field1\"," +
-            "         \"type\":\"string\"" +
-            "      },\n" +
-            "      {\n" +
-            "         \"name\":\"field2\"," +
-            "         \"type\":{\n" +
-            "            \"type\":\"array\"," +
-            "            \"items\":\"string\"" +
-            "         }," +
-            "         \"default\":[ ]" +
-            "      }" +
-            "   ]" +
-            "}";
-    RecordDataSchema pegasusSchema = (RecordDataSchema)TestUtil.dataSchemaFromString(P_SCHEMA);
-    Schema avroShema = Schema.parse(A_SCHEMA);
+    RecordDataSchema pegasusSchema = (RecordDataSchema)TestUtil.dataSchemaFromString(SCHEMA);
+    Schema avroShema = Schema.parse(SCHEMA);
     DataMap dataMap = new DataMap();
     dataMap.put("field1", "test");
     GenericRecord record = DataTranslator.dataMapToGenericRecord(dataMap, pegasusSchema, avroShema);

Original file line number	Diff line number	Diff line change
`@@ -553,8 +553,8 @@ else if (fieldValue == null)`
`553`	`553`	`else`
`554`	`554`	`{`
`555`	`555`	`appendMessage("required field is absent");`
`556`		`- _path.removeLast();`
`557`	`556`	`}`
	`557`	`+ _path.removeLast();`
`558`	`558`	`continue;`
`559`	`559`	`}`
`560`	`560`	`Object fieldAvroValue = translate(fieldValue, fieldDataSchema, fieldAvroSchema);`