change file

cloudsufi · Jan 16, 2024 · f5807a5 · f5807a5
1 parent 3eea7c5
commit f5807a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 52 deletions.
diff --git a/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordToJson.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordToJson.java
@@ -250,10 +250,14 @@ private static void writeArray(JsonWriter writer,
         }
         if (element instanceof StructuredRecord) {
           StructuredRecord record = (StructuredRecord) element;
+          path.add(name);
           processRecord(writer, record, Objects.requireNonNull(record.getSchema().getFields()),
                   path, jsonStringFieldsPaths);
+          path.remove(path.size() - 1);
         } else {
+          path.add(name);
           write(writer, name, true, element, componentSchema, path, jsonStringFieldsPaths);
+          path.remove(path.size() - 1);
         }
       }
     }

diff --git a/src/test/java/io/cdap/plugin/gcp/bigquery/BigQueryRecordToJsonTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/BigQueryRecordToJsonTest.java
@@ -422,58 +422,6 @@ public void testJsonStringWithEmptyArray() throws IOException {
     }
   }
 
-  @Test
-  public void testJsonStringWithStringArray() throws IOException {
-    Schema recordSchema = Schema.recordOf("record",
-            Schema.Field.of("arrayOfString", Schema.arrayOf(Schema.of(Schema.Type.STRING))));
-    List<String> jsonStringList = ImmutableList.of("{\"arrayKey1\": \"arrayValue1\"}",
-            "{\"arrayKey2\": \"arrayValue2\"}");
-    StructuredRecord record = StructuredRecord.builder(recordSchema).set("arrayOfString", jsonStringList).build();
-    Set<String> jsonStringFieldsPaths = ImmutableSet.of("arrayOfString");
-    try (JsonTreeWriter writer = new JsonTreeWriter()) {
-      writer.beginObject();
-      for (Schema.Field recordField : Objects.requireNonNull(record.getSchema().getFields())) {
-        if (recordSchema.getField(recordField.getName()) != null) {
-          BigQueryRecordToJson.write(writer, recordField.getName(), record.get(recordField.getName()),
-                  recordField.getSchema(), jsonStringFieldsPaths);
-        }
-      }
-      writer.endObject();
-      JsonObject actual = writer.get().getAsJsonObject();
-      String actualJsonString = actual.get("arrayOfString").getAsJsonArray().toString();
-      String expectedJsonString = "[{\"arrayKey1\":\"arrayValue1\"},{\"arrayKey2\":\"arrayValue2\"}]";
-      Assert.assertEquals(expectedJsonString, actualJsonString);
-    }
-  }
-
-  @Test
-  public void testJsonStringWithArrayAndNestedRecord() throws IOException {
-    Schema nestedRecordSchema = Schema.recordOf("nestedRecord",
-            Schema.Field.of("nestedJsonString", Schema.of(Schema.Type.STRING)));
-    StructuredRecord nestedRecord = StructuredRecord.builder(nestedRecordSchema)
-            .set("nestedJsonString", "{\"nestedKey1\":\"nestedValue1\"}").build();
-    Schema recordSchema = Schema.recordOf("record",
-            Schema.Field.of("arrayOfNestedRecord", Schema.arrayOf(nestedRecordSchema)));
-    List<StructuredRecord> nestedRecordList = ImmutableList.of(nestedRecord);
-    StructuredRecord record = StructuredRecord.builder(recordSchema).set("arrayOfNestedRecord", nestedRecordList)
-            .build();
-
-    Set<String> jsonStringFieldsPaths = ImmutableSet.of("arrayOfNestedRecord.nestedJsonString");
-    try (JsonTreeWriter writer = new JsonTreeWriter()) {
-      writer.beginObject();
-      for (Schema.Field recordField : Objects.requireNonNull(record.getSchema().getFields())) {
-        if (recordSchema.getField(recordField.getName()) != null) {
-          BigQueryRecordToJson.write(writer, recordField.getName(), record.get(recordField.getName()),
-                  recordField.getSchema(), jsonStringFieldsPaths);
-        }
-      }
-      writer.endObject();
-      JsonObject actual = writer.get().getAsJsonObject();
-      String actualJsonString = actual.get("arrayOfNestedRecord").toString();
-      String expectedJsonString = "[{\"nestedJsonString\":{\"nestedKey1\":\"nestedValue1\"}}]";
-      Assert.assertEquals(expectedJsonString, actualJsonString);
-    }
-  }
 
   /**
    * Empty JSON string is not a valid JSON string and should throw an exception.