Fix toJson not using the Name annotation with tables

ballerina-platform · Nov 12, 2024 · 4bf064c · 4bf064c
1 parent 4156d57
commit 4bf064c
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/native/src/main/java/io/ballerina/lib/data/jsondata/json/Native.java b/native/src/main/java/io/ballerina/lib/data/jsondata/json/Native.java
@@ -37,6 +37,7 @@
 import io.ballerina.runtime.api.values.BObject;
 import io.ballerina.runtime.api.values.BStream;
 import io.ballerina.runtime.api.values.BString;
+import io.ballerina.runtime.api.values.BTable;
 import io.ballerina.runtime.api.values.BTypedesc;
 
 import java.io.ByteArrayInputStream;
@@ -121,6 +122,17 @@ public static Object toJson(Object value, Set<Object> visitedValues) {
             return jsonObject;
         }
 
+        if (value instanceof BTable tableValue) {
+            int length = tableValue.size();
+            Object[] convertedValues = new Object[length];
+
+            int index = 0;
+            for (Object tableMember : tableValue.values()) {
+                convertedValues[index++] = toJson(tableMember, visitedValues);
+            }
+            return ValueCreator.createArrayValue(convertedValues, PredefinedTypes.TYPE_JSON_ARRAY);
+        }
+
         return JsonUtils.convertToJson(value);
     }