fixed spotbug issues

linkedin · Oct 12, 2023 · 2b04244 · 2b04244
1 parent 49f5023
commit 2b04244
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/...venice-client-common/src/main/java/com/linkedin/venice/utils/AvroSupersetSchemaUtils.java b/...venice-client-common/src/main/java/com/linkedin/venice/utils/AvroSupersetSchemaUtils.java
@@ -107,18 +107,22 @@ private static Schema unionSchema(Schema s1, Schema s2) {
     return Schema.createUnion(combinedSchema);
   }
 
+  private static void copyFieldProperties(FieldBuilder fieldBuilder, Schema.Field field) {
+    AvroCompatibilityHelper.getAllPropNames(field).forEach(k -> {
+      String propValue = AvroCompatibilityHelper.getFieldPropAsJsonString(field, k);
+      if (propValue != null) {
+        fieldBuilder.addProp(k, propValue);
+      }
+    });
+  }
+
   private static FieldBuilder deepCopySchemaField(Schema.Field field) {
     FieldBuilder fieldBuilder = AvroCompatibilityHelper.newField(null)
         .setName(field.name())
         .setSchema(field.schema())
         .setDoc(field.doc())
         .setOrder(field.order());
-    field.getObjectProps().forEach((k, ignored) -> {
-      String propValue = field.getProp(k);
-      if (propValue != null) {
-        fieldBuilder.addProp(k, propValue);
-      }
-    });
+    copyFieldProperties(fieldBuilder, field);
 
     // set default as AvroCompatibilityHelper builder might drop defaults if there is type mismatch
     if (field.hasDefaultValue()) {
@@ -139,12 +143,7 @@ private static List<Schema.Field> mergeFieldSchemas(Schema s1, Schema s2) {
         fieldBuilder.setSchema(generateSuperSetSchema(f1.schema(), f2.schema()))
             .setDoc(f1.doc() != null ? f1.doc() : f2.doc());
         // merge props from f2
-        f2.getObjectProps().forEach((k, ignored) -> {
-          String propValue = f2.getProp(k);
-          if (propValue != null) {
-            fieldBuilder.addProp(k, propValue);
-          }
-        });
+        copyFieldProperties(fieldBuilder, f2);
       }
       fields.add(fieldBuilder.build());
     }

diff --git a/...e-client-common/src/test/java/com/linkedin/venice/schema/TestAvroSupersetSchemaUtils.java b/...e-client-common/src/test/java/com/linkedin/venice/schema/TestAvroSupersetSchemaUtils.java
@@ -429,10 +429,10 @@ public void testSupersetSchemaContainsMergeFieldProps() {
     Schema.Field intField = supersetSchema.getField("int_field");
     Schema.Field stringField = supersetSchema.getField("string_field");
 
-    Assert.assertEquals(intField.getProp("prop1"), "prop1_v2");
-    Assert.assertEquals(intField.getProp("prop2"), "prop2_v1");
-    Assert.assertEquals(stringField.getProp("prop3"), "prop3_v1");
-    Assert.assertEquals(stringField.getProp("prop2"), "prop2_v2");
+    Assert.assertEquals(intField.getProp("prop1"), "\"prop1_v2\"");
+    Assert.assertEquals(intField.getProp("prop2"), "\"prop2_v1\"");
+    Assert.assertEquals(stringField.getProp("prop3"), "\"prop3_v1\"");
+    Assert.assertEquals(stringField.getProp("prop2"), "\"prop2_v2\"");
   }
 
   @Test