[INLONG-10957][SDK] Improve some code structures (#10958)

apache · Sep 2, 2024 · 9f9acbd · 9f9acbd
1 parent de98601
commit 9f9acbd
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 38 deletions.
diff --git a/...dk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/decode/JsonSourceData.java b/...dk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/decode/JsonSourceData.java
@@ -111,20 +111,22 @@ public String getField(int rowNum, String fieldName) {
                     // error data
                     return "";
                 }
+                // node is not array
                 if (!node.isArray()) {
                     current = newElement;
-                } else {
-                    if (!newElement.isJsonArray()) {
-                        // error data
-                        return "";
-                    }
-                    JsonArray newArray = newElement.getAsJsonArray();
-                    if (node.getArrayIndex() >= newArray.size()) {
-                        // error data
-                        return "";
-                    }
-                    current = newArray.get(node.getArrayIndex());
+                    continue;
+                }
+                // node is an array
+                if (!newElement.isJsonArray()) {
+                    // error data
+                    return "";
+                }
+                JsonArray newArray = newElement.getAsJsonArray();
+                if (node.getArrayIndex() >= newArray.size()) {
+                    // error data
+                    return "";
                 }
+                current = newArray.get(node.getArrayIndex());
             }
             return current.getAsString();
         } catch (Exception e) {

diff --git a/...transform-sdk/src/main/java/org/apache/inlong/sdk/transform/decode/JsonSourceDecoder.java b/...transform-sdk/src/main/java/org/apache/inlong/sdk/transform/decode/JsonSourceDecoder.java
@@ -85,39 +85,40 @@ public SourceData decode(byte[] srcBytes, Context context) {
     public SourceData decode(String srcString, Context context) {
         JsonObject root = gson.fromJson(srcString, JsonObject.class);
         JsonArray childRoot = null;
-        if (CollectionUtils.isNotEmpty(childNodes)) {
-            JsonElement current = root;
-            for (JsonNode node : childNodes) {
-                if (!current.isJsonObject()) {
+        if (CollectionUtils.isEmpty(childNodes)) {
+            return new JsonSourceData(root, null);
+        }
+        JsonElement current = root;
+        for (JsonNode node : childNodes) {
+            if (!current.isJsonObject()) {
+                // error data
+                return new JsonSourceData(root, null);
+            }
+            JsonElement newElement = current.getAsJsonObject().get(node.getName());
+            if (newElement == null) {
+                // error data
+                return new JsonSourceData(root, null);
+            }
+            if (!node.isArray()) {
+                current = newElement;
+            } else {
+                if (!newElement.isJsonArray()) {
                     // error data
-                    return new JsonSourceData(root, childRoot);
+                    return new JsonSourceData(root, null);
                 }
-                JsonElement newElement = current.getAsJsonObject().get(node.getName());
-                if (newElement == null) {
+                JsonArray newArray = newElement.getAsJsonArray();
+                if (node.getArrayIndex() >= newArray.size()) {
                     // error data
-                    return new JsonSourceData(root, childRoot);
+                    return new JsonSourceData(root, null);
                 }
-                if (!node.isArray()) {
-                    current = newElement;
-                } else {
-                    if (!newElement.isJsonArray()) {
-                        // error data
-                        return new JsonSourceData(root, childRoot);
-                    }
-                    JsonArray newArray = newElement.getAsJsonArray();
-                    if (node.getArrayIndex() >= newArray.size()) {
-                        // error data
-                        return new JsonSourceData(root, childRoot);
-                    }
-                    current = newArray.get(node.getArrayIndex());
-                }
-            }
-            if (!current.isJsonArray()) {
-                // error data
-                return new JsonSourceData(root, childRoot);
+                current = newArray.get(node.getArrayIndex());
             }
-            childRoot = current.getAsJsonArray();
         }
+        if (!current.isJsonArray()) {
+            // error data
+            return new JsonSourceData(root, null);
+        }
+        childRoot = current.getAsJsonArray();
         return new JsonSourceData(root, childRoot);
     }
 }