Merge pull request #27 from Nuvindu/union-fix

Fix handling union type values in the Avro payload
ballerina-platform · Oct 18, 2024 · 5d1cd6e · 5d1cd6e
2 parents afc32a7 + c4b6014
commit 5d1cd6e
Show file tree

Hide file tree

Showing 8 changed files with 463 additions and 133 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "avro"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Ballerina"]
 export=["avro"]
 keywords = ["avro", "serialization", "deserialization", "serdes"]
@@ -18,8 +18,8 @@ graalvmCompatible = true
 [[platform.java17.dependency]]
 groupId = "io.ballerina.lib"
 artifactId = "avro-native"
-version = "1.0.1"
-path = "../native/build/libs/avro-native-1.0.1.jar"
+version = "1.0.2"
+path = "../native/build/libs/avro-native-1.0.2-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
 groupId = "org.apache.avro"

diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -10,7 +10,7 @@ distribution-version = "2201.9.0"
 [[package]]
 org = "ballerina"
 name = "avro"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -23,7 +23,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.6.0"
+version = "1.6.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},

diff --git a/ballerina/tests/primitive_tests.bal b/ballerina/tests/primitive_tests.bal
@@ -134,3 +134,67 @@ public isolated function testNullValuesWithNonNullData() returns error? {
     byte[]|error serializedValue = avro.toAvro("string");
     test:assertTrue(serializedValue is error);
 }
+
+@test:Config {
+   groups: ["primitive"]
+}
+public isolated function testUnsignedShortValue() returns error? {
+    string schema = string `
+        {
+            "type": "int",
+            "name" : "shortValue", 
+            "namespace": "data"
+        }`;
+
+    int:Unsigned8 value = 255;
+    return verifyOperation(int:Unsigned8, value, schema);
+}
+
+@test:Config {
+   groups: ["primitive", "check"]
+}
+public isolated function testSignedShortValue() returns error? {
+    string schema = string `
+        {
+            "type": "int",
+            "name" : "shortValue", 
+            "namespace": "data"
+        }`;
+
+    int:Signed32 value = 555950000;
+    return verifyOperation(int:Signed32, value, schema);
+}
+
+@test:Config {
+   groups: ["primitive", "check"]
+}
+public isolated function testSignedMinusShortValue() returns error? {
+    string schema = string `
+        {
+            "type": "double",
+            "name" : "shortValue", 
+            "namespace": "data"
+        }`;
+
+    int:Signed32 value = -2147483;
+    Schema avro = check new (schema);
+    byte[] serializedValue = check avro.toAvro(value);
+    float deserializedValue = check avro.fromAvro(serializedValue);
+    test:assertEquals(deserializedValue, -2147483.0);
+}
+
+@test:Config {
+   groups: ["primitive", "check"]
+}
+public isolated function testByteValue() returns error? {
+    string schema = string `
+        {
+            "type": "bytes",
+            "name" : "byteValue", 
+            "namespace": "data"
+        }`;
+    byte[] data = [];
+    byte value = 2;
+    data.push(value);
+    return verifyOperation(ByteArray, data, schema);
+}
diff --git a/ballerina/tests/record_tests.bal b/ballerina/tests/record_tests.bal
@@ -370,3 +370,99 @@ public isolated function testOptionalMultipleFieldsInRecords() returns error? {
     };
     return verifyOperation(Lecturer6, lecturer6, schema);
 }
+
+@test:Config {
+    groups: ["record", "union"]
+}
+public isolated function testTypeCastingInRecords() returns error? {
+    string jsonFileName = string `tests/resources/schema_complex.json`;
+    string schema = (check io:fileReadJson(jsonFileName)).toString();
+    Record recordValue = {
+        hrdCasinoGgrLt: 4999.01,
+        hrdAccountCreationTimestamp: "2024-02-25T20:50:37.891782",
+        hrdSportsBetCountLifetime: 77,
+        hrdSportsFreeBetAmountLifetime: 0,
+        hriUnityId: "807612199",
+        hrdLastRealMoneySportsbookBetTs: "2024-04-24T20:15:51.932",
+        hrdLoyaltyTier: "MEMBER_TIER",
+        rowInsertTimestampEst: "2024-09-23T03:29:43.431",
+        ltvSports365Total: 0,
+        hrdFirstDepositTimestamp: "2024-02-25T20:56:24.109021",
+        hrdVipStatus: true,
+        hrdLastRealMoneyCasinoWagerTs: null,
+        hrdSportsCashBetAmountLifetime: 731,
+        hrdAccountStatus: "ACTIVE",
+        hrdAccountId: "1362347172559585332",
+        ltvAllVerticals365Total: 0,
+        hrdOptInSms: false,
+        ltvCasino365Total: null,
+        hrdAccountSubStatus: null,
+        hrdCasinoTotalWagerLifetime: null,
+        hrdSportsGgrLt: 4999.01,
+        currentGeoSegment: "HRD_FLORIDA",
+        kycStatus: "VERIFIED",
+        signupGeoSegment: "HRD_FLORIDA",
+        hrdSportsBetAmountLifetime: 731,
+        hrdOptInEmail: false,
+        hrdOptInPush: false
+    };
+    Schema avro = check new (schema);
+    byte[] serializedValue = check avro.toAvro(recordValue);
+    Record deserializedValue = check avro.fromAvro(serializedValue);
+
+    json expected = {
+        "hrdCasinoGgrLt":4999.01,
+        "hrdAccountCreationTimestamp":"2024-02-25T20:50:37.891782",
+        "hrdSportsFreeBetAmountLifetime":0.0,
+        "hriUnityId":"807612199",
+        "hrdLastRealMoneySportsbookBetTs":"2024-04-24T20:15:51.932",
+        "hrdLoyaltyTier":"MEMBER_TIER",
+        "rowInsertTimestampEst":"2024-09-23T03:29:43.431",
+        "ltvSports365Total":0.0,
+        "hrdVipStatus":true,
+        "hrdSportsBetCountLifetime":77.0,
+        "hrdLastRealMoneyCasinoWagerTs":null,
+        "hrdSportsCashBetAmountLifetime":731.0,
+        "hrdAccountStatus":"ACTIVE",
+        "hrdAccountId":"1362347172559585332",
+        "ltvAllVerticals365Total":0.0,
+        "ltvCasino365Total":null,
+        "hrdAccountSubStatus":null,
+        "hrdCasinoTotalWagerLifetime":null,
+        "hrdSportsGgrLt":4999.01,
+        "currentGeoSegment":"HRD_FLORIDA",
+        "kycStatus":"VERIFIED",
+        "hrdOptInSms":false,
+        "hrdFirstDepositTimestamp":"2024-02-25T20:56:24.109021",
+        "signupGeoSegment":"HRD_FLORIDA",
+        "hrdSportsBetAmountLifetime":731.0,
+        "hrdOptInEmail":false,
+        "hrdOptInPush":false
+    };
+    test:assertEquals(deserializedValue.toJson(), expected.toJson());
+}
+
+@test:Config {
+    groups: ["record", "union"]
+}
+public isolated function testUnionsWithRecords() returns error? {
+    string schema = string `{
+        "type": "record",
+        "name": "DataRecord",
+        "namespace": "data",
+        "fields": [
+            {
+            "name": "shortValue",
+            "type": ["null", "int", "double"]
+            }
+        ]
+    }`;
+    int:Signed16 short = 5555;
+    json value = {
+        "shortValue": short
+    };
+    Schema avro = check new (schema);
+    byte[] serializedValue = check avro.toAvro(value);
+    DataRecord deserializedValue = check avro.fromAvro(serializedValue);
+    test:assertEquals(deserializedValue, value);
+}