From 892ad6813754e0c6e913e19bcb24de2b4c550659 Mon Sep 17 00:00:00 2001 From: CrowleyRajapakse Date: Wed, 2 Oct 2024 17:31:13 +0530 Subject: [PATCH] update ballerina version in services --- .../ballerina/Ballerina.toml | 2 +- .../ballerina/Ballerina.toml.template | 2 +- .../ballerina/Dependencies.toml | 37 ++++++++++--------- .../ballerina/Dependencies.toml.template | 37 ++++++++++--------- .../ballerina/Ballerina.toml | 25 ++++++++++++- .../ballerina/Ballerina.toml.template | 25 ++++++++++++- .../ballerina/Dependencies.toml | 7 ++-- .../ballerina/Dependencies.toml.template | 7 ++-- .../ballerina/DeployerClient.bal | 4 -- .../ballerina/modules/java.lang/Object.bal | 1 + .../org.wso2.apk.config.api/APIDefinition.bal | 37 ++++++------------- .../org.wso2.apk.config/APKConfValidator.bal | 4 +- .../RuntimeAPICommonUtil.bal | 11 +++--- 13 files changed, 120 insertions(+), 79 deletions(-) diff --git a/idp/idp-domain-service/ballerina/Ballerina.toml b/idp/idp-domain-service/ballerina/Ballerina.toml index c3d00b6a8b..c946b1d120 100644 --- a/idp/idp-domain-service/ballerina/Ballerina.toml +++ b/idp/idp-domain-service/ballerina/Ballerina.toml @@ -2,7 +2,7 @@ org = "wso2" name = "idp_domain_service" version = "1.2.0-SNAPSHOT" -distribution = "2201.8.0" +distribution = "2201.10.1" [[platform.java11.dependency]] groupId = "org.postgresql" diff --git a/idp/idp-domain-service/ballerina/Ballerina.toml.template b/idp/idp-domain-service/ballerina/Ballerina.toml.template index cd8488dbf9..908922a1f4 100644 --- a/idp/idp-domain-service/ballerina/Ballerina.toml.template +++ b/idp/idp-domain-service/ballerina/Ballerina.toml.template @@ -2,7 +2,7 @@ org = "wso2" name = "idp_domain_service" version = "PROJECT_VERSION" -distribution = "2201.8.0" +distribution = "2201.10.1" [[platform.java11.dependency]] groupId = "org.postgresql" diff --git a/idp/idp-domain-service/ballerina/Dependencies.toml b/idp/idp-domain-service/ballerina/Dependencies.toml index d8b337703d..32ca62c541 100644 --- a/idp/idp-domain-service/ballerina/Dependencies.toml +++ b/idp/idp-domain-service/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.1" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -41,7 +41,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.6.2" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -50,7 +50,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -61,7 +61,7 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.10.7" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -93,7 +93,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -110,10 +110,11 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -213,7 +214,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -227,17 +228,18 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -250,7 +252,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.2" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -279,7 +281,7 @@ modules = [ [[package]] org = "ballerina" name = "sql" -version = "1.12.0" +version = "1.14.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -306,6 +308,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ @@ -315,7 +318,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -337,7 +340,7 @@ modules = [ [[package]] org = "ballerina" name = "uuid" -version = "1.7.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -363,7 +366,7 @@ modules = [ [[package]] org = "ballerinax" name = "postgresql" -version = "1.11.0" +version = "1.13.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, diff --git a/idp/idp-domain-service/ballerina/Dependencies.toml.template b/idp/idp-domain-service/ballerina/Dependencies.toml.template index 13fa689897..8e9b5fde9d 100644 --- a/idp/idp-domain-service/ballerina/Dependencies.toml.template +++ b/idp/idp-domain-service/ballerina/Dependencies.toml.template @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.1" [[package]] org = "ballerina" name = "auth" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.7.1" +version = "3.8.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -41,7 +41,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.6.2" +version = "2.7.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -50,7 +50,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.9.0" +version = "1.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -61,7 +61,7 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.10.7" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -93,7 +93,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.0" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -110,10 +110,11 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.10.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, @@ -213,7 +214,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -227,17 +228,18 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.9.0" +version = "2.10.0" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"} + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "log"} ] [[package]] org = "ballerina" name = "oauth2" -version = "2.10.0" +version = "2.12.0" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -250,7 +252,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.2" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -279,7 +281,7 @@ modules = [ [[package]] org = "ballerina" name = "sql" -version = "1.12.0" +version = "1.14.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -306,6 +308,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ @@ -315,7 +318,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.5.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -337,7 +340,7 @@ modules = [ [[package]] org = "ballerina" name = "uuid" -version = "1.7.0" +version = "1.8.0" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -363,7 +366,7 @@ modules = [ [[package]] org = "ballerinax" name = "postgresql" -version = "1.11.0" +version = "1.13.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, diff --git a/runtime/config-deployer-service/ballerina/Ballerina.toml b/runtime/config-deployer-service/ballerina/Ballerina.toml index 5cb6518b0a..9df306e9fe 100644 --- a/runtime/config-deployer-service/ballerina/Ballerina.toml +++ b/runtime/config-deployer-service/ballerina/Ballerina.toml @@ -2,7 +2,7 @@ org = "wso2" name = "config_deployer_service" version = "1.2.0-SNAPSHOT" -distribution = "2201.8.5" +distribution = "2201.10.1" [build-options] observabilityIncluded = true @@ -384,3 +384,26 @@ version = "20231013" groupId = "commons-lang" artifactId = "commons-lang" version = "2.4" + +[[platform.java11.dependency]] +groupId = "org.wso2.apk" +artifactId = "org.wso2.apk.config" +version = "1.2.0-SNAPSHOT" + +# transitive dependency of org.wso2.apk:org.wso2.apk.config:1.2.0-SNAPSHOT +[[platform.java11.dependency]] +groupId = "com.graphql-java" +artifactId = "graphql-java" +version = "22.3" + +# transitive dependency of com.graphql-java:graphql-java:22.3 +[[platform.java11.dependency]] +groupId = "com.graphql-java" +artifactId = "java-dataloader" +version = "3.3.0" + +# transitive dependency of org.wso2.apk:org.wso2.apk.config:1.2.0-SNAPSHOT +[[platform.java11.dependency]] +groupId = "com.google.protobuf" +artifactId = "protobuf-java" +version = "3.25.5" diff --git a/runtime/config-deployer-service/ballerina/Ballerina.toml.template b/runtime/config-deployer-service/ballerina/Ballerina.toml.template index 89a2b9214a..e7e2dae5bb 100644 --- a/runtime/config-deployer-service/ballerina/Ballerina.toml.template +++ b/runtime/config-deployer-service/ballerina/Ballerina.toml.template @@ -2,7 +2,7 @@ org = "wso2" name = "config_deployer_service" version = "PROJECT_VERSION" -distribution = "2201.8.5" +distribution = "2201.10.1" [build-options] observabilityIncluded = true @@ -384,3 +384,26 @@ version = "20231013" groupId = "commons-lang" artifactId = "commons-lang" version = "2.4" + +[[platform.java11.dependency]] +groupId = "org.wso2.apk" +artifactId = "org.wso2.apk.config" +version = "1.2.0-SNAPSHOT" + +# transitive dependency of org.wso2.apk:org.wso2.apk.config:1.2.0-SNAPSHOT +[[platform.java11.dependency]] +groupId = "com.graphql-java" +artifactId = "graphql-java" +version = "22.3" + +# transitive dependency of com.graphql-java:graphql-java:22.3 +[[platform.java11.dependency]] +groupId = "com.graphql-java" +artifactId = "java-dataloader" +version = "3.3.0" + +# transitive dependency of org.wso2.apk:org.wso2.apk.config:1.2.0-SNAPSHOT +[[platform.java11.dependency]] +groupId = "com.google.protobuf" +artifactId = "protobuf-java" +version = "3.25.5" diff --git a/runtime/config-deployer-service/ballerina/Dependencies.toml b/runtime/config-deployer-service/ballerina/Dependencies.toml index aba806472e..eaae6f097d 100644 --- a/runtime/config-deployer-service/ballerina/Dependencies.toml +++ b/runtime/config-deployer-service/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.1" [[package]] org = "ballerina" @@ -70,7 +70,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.10.15" +version = "2.10.16" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -273,7 +273,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.3" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -326,6 +326,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ diff --git a/runtime/config-deployer-service/ballerina/Dependencies.toml.template b/runtime/config-deployer-service/ballerina/Dependencies.toml.template index 8a678ae494..540dbbcb83 100644 --- a/runtime/config-deployer-service/ballerina/Dependencies.toml.template +++ b/runtime/config-deployer-service/ballerina/Dependencies.toml.template @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.5" +distribution-version = "2201.10.1" [[package]] org = "ballerina" @@ -70,7 +70,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.10.15" +version = "2.10.16" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -273,7 +273,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.2.3" +version = "1.3.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -326,6 +326,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ diff --git a/runtime/config-deployer-service/ballerina/DeployerClient.bal b/runtime/config-deployer-service/ballerina/DeployerClient.bal index 27fb38cd23..3fa36b4a6e 100644 --- a/runtime/config-deployer-service/ballerina/DeployerClient.bal +++ b/runtime/config-deployer-service/ballerina/DeployerClient.bal @@ -145,11 +145,7 @@ public class DeployerClient { return e909028(); } } on fail var e { - if e is commons:APKError { return e; - } - log:printError("Internal Error occured while deploying API", e); - return e909028(); } } diff --git a/runtime/config-deployer-service/ballerina/modules/java.lang/Object.bal b/runtime/config-deployer-service/ballerina/modules/java.lang/Object.bal index fecc99e43f..c3040ebc0b 100644 --- a/runtime/config-deployer-service/ballerina/modules/java.lang/Object.bal +++ b/runtime/config-deployer-service/ballerina/modules/java.lang/Object.bal @@ -22,6 +22,7 @@ public distinct class Object { public function toString() returns string { return java:toString(self.jObj) ?: ""; } + # The function that maps to the `equals` method of `java.lang.Object`. # # + arg0 - The `Object` value required to map with the Java method parameter. diff --git a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config.api/APIDefinition.bal b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config.api/APIDefinition.bal index d83c9224c6..95d88233ad 100644 --- a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config.api/APIDefinition.bal +++ b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config.api/APIDefinition.bal @@ -1,9 +1,10 @@ -import ballerina/jballerina.java; -import ballerina/jballerina.java.arrays as jarrays; import config_deployer_service.java.lang as javalang; import config_deployer_service.java.util as javautil; import config_deployer_service.org.wso2.apk.config.model as orgwso2apkconfigmodel; +import ballerina/jballerina.java; +import ballerina/jballerina.java.arrays as jarrays; + # Ballerina class mapping for the Java `org.wso2.apk.config.api.APIDefinition` class. @java:Binding {'class: "org.wso2.apk.config.api.APIDefinition"} public distinct class APIDefinition { @@ -27,6 +28,7 @@ public distinct class APIDefinition { public function toString() returns string { return java:toString(self.jObj) ?: ""; } + # The function that maps to the `canHandleDefinition` method of `org.wso2.apk.config.api.APIDefinition`. # # + arg0 - The `string` value required to map with the Java method parameter. @@ -47,13 +49,13 @@ public distinct class APIDefinition { # # + arg0 - The `orgwso2apkconfigmodel:API` value required to map with the Java method parameter. # + return - The `string` or the `APIManagementException` value returning from the Java mapping. - public function generateAPIDefinition(orgwso2apkconfigmodel:API arg0) returns APIManagementException|string? { + public function generateAPIDefinition(orgwso2apkconfigmodel:API arg0) returns string|APIManagementException { handle|error externalObj = org_wso2_apk_config_api_APIDefinition_generateAPIDefinition(self.jObj, arg0.jObj); if (externalObj is error) { APIManagementException e = error APIManagementException(APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); return e; } else { - return java:toString(externalObj); + return java:toString(externalObj) ?: ""; } } @@ -62,13 +64,13 @@ public distinct class APIDefinition { # + arg0 - The `orgwso2apkconfigmodel:API` value required to map with the Java method parameter. # + arg1 - The `string` value required to map with the Java method parameter. # + return - The `string` or the `APIManagementException` value returning from the Java mapping. - public function generateAPIDefinition2(orgwso2apkconfigmodel:API arg0, string arg1) returns APIManagementException|string? { + public function generateAPIDefinition2(orgwso2apkconfigmodel:API arg0, string arg1) returns string|APIManagementException { handle|error externalObj = org_wso2_apk_config_api_APIDefinition_generateAPIDefinition2(self.jObj, arg0.jObj, java:fromString(arg1)); if (externalObj is error) { APIManagementException e = error APIManagementException(APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); return e; } else { - return java:toString(externalObj); + return java:toString(externalObj) ?: ""; } } @@ -76,7 +78,7 @@ public distinct class APIDefinition { # # + arg0 - The `string` value required to map with the Java method parameter. # + return - The `orgwso2apkconfigmodel:API` or the `APIManagementException` value returning from the Java mapping. - public isolated function getAPIFromDefinition(string arg0) returns orgwso2apkconfigmodel:API|APIManagementException { + public function getAPIFromDefinition(string arg0) returns orgwso2apkconfigmodel:API|APIManagementException { handle|error externalObj = org_wso2_apk_config_api_APIDefinition_getAPIFromDefinition(self.jObj, java:fromString(arg0)); if (externalObj is error) { APIManagementException e = error APIManagementException(APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); @@ -176,13 +178,13 @@ public distinct class APIDefinition { # # + arg0 - The `string` value required to map with the Java method parameter. # + return - The `string` or the `APIManagementException` value returning from the Java mapping. - public function processOtherSchemeScopes(string arg0) returns APIManagementException|string? { + public function processOtherSchemeScopes(string arg0) returns string|APIManagementException { handle|error externalObj = org_wso2_apk_config_api_APIDefinition_processOtherSchemeScopes(self.jObj, java:fromString(arg0)); if (externalObj is error) { APIManagementException e = error APIManagementException(APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); return e; } else { - return java:toString(externalObj); + return java:toString(externalObj) ?: ""; } } @@ -240,15 +242,6 @@ public distinct class APIDefinition { } -# The constructor function to generate an object of `org.wso2.apk.config.api.APIDefinition`. -# -# + return - The new `APIDefinition` class generated. -public function newAPIDefinition1() returns APIDefinition { - handle externalObj = org_wso2_apk_config_api_APIDefinition_newAPIDefinition1(); - APIDefinition newObj = new (externalObj); - return newObj; -} - function org_wso2_apk_config_api_APIDefinition_canHandleDefinition(handle receiver, handle arg0) returns boolean = @java:Method { name: "canHandleDefinition", 'class: "org.wso2.apk.config.api.APIDefinition", @@ -273,7 +266,7 @@ function org_wso2_apk_config_api_APIDefinition_generateAPIDefinition2(handle rec paramTypes: ["org.wso2.apk.config.model.API", "java.lang.String"] } external; -isolated function org_wso2_apk_config_api_APIDefinition_getAPIFromDefinition(handle receiver, handle arg0) returns handle|error = @java:Method { +function org_wso2_apk_config_api_APIDefinition_getAPIFromDefinition(handle receiver, handle arg0) returns handle|error = @java:Method { name: "getAPIFromDefinition", 'class: "org.wso2.apk.config.api.APIDefinition", paramTypes: ["java.lang.String"] @@ -362,9 +355,3 @@ function org_wso2_apk_config_api_APIDefinition_wait3(handle receiver, int arg0, 'class: "org.wso2.apk.config.api.APIDefinition", paramTypes: ["long", "int"] } external; - -function org_wso2_apk_config_api_APIDefinition_newAPIDefinition1() returns handle = @java:Constructor { - 'class: "org.wso2.apk.config.api.APIDefinition", - paramTypes: [] -} external; - diff --git a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/APKConfValidator.bal b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/APKConfValidator.bal index c9ee075c73..b64953786a 100644 --- a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/APKConfValidator.bal +++ b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/APKConfValidator.bal @@ -1,7 +1,8 @@ -import ballerina/jballerina.java; import config_deployer_service.java.lang as javalang; import config_deployer_service.org.wso2.apk.config.api as orgwso2apkconfigapi; +import ballerina/jballerina.java; + # Ballerina class mapping for the Java `org.wso2.apk.config.APKConfValidator` class. @java:Binding {'class: "org.wso2.apk.config.APKConfValidator"} public isolated distinct class APKConfValidator { @@ -25,6 +26,7 @@ public isolated distinct class APKConfValidator { public function toString() returns string { return java:toString(self.jObj) ?: ""; } + # The function that maps to the `equals` method of `org.wso2.apk.config.APKConfValidator`. # # + arg0 - The `javalang:Object` value required to map with the Java method parameter. diff --git a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/RuntimeAPICommonUtil.bal b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/RuntimeAPICommonUtil.bal index 5de894a46e..9500495cbe 100644 --- a/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/RuntimeAPICommonUtil.bal +++ b/runtime/config-deployer-service/ballerina/modules/org.wso2.apk.config/RuntimeAPICommonUtil.bal @@ -29,6 +29,7 @@ public distinct class RuntimeAPICommonUtil { public function toString() returns string { return java:toString(self.jObj) ?: ""; } + # The function that maps to the `equals` method of `org.wso2.apk.config.RuntimeAPICommonUtil`. # # + arg0 - The `javalang:Object` value required to map with the Java method parameter. @@ -105,13 +106,13 @@ public distinct class RuntimeAPICommonUtil { # # + arg0 - The `orgwso2apkconfigmodel:API` value required to map with the Java method parameter. # + return - The `string` or the `orgwso2apkconfigapi:APIManagementException` value returning from the Java mapping. -public isolated function RuntimeAPICommonUtil_generateDefinition(orgwso2apkconfigmodel:API arg0) returns orgwso2apkconfigapi:APIManagementException|string? { +public isolated function RuntimeAPICommonUtil_generateDefinition(orgwso2apkconfigmodel:API arg0) returns string|orgwso2apkconfigapi:APIManagementException { handle|error externalObj = org_wso2_apk_config_RuntimeAPICommonUtil_generateDefinition(arg0.jObj); if (externalObj is error) { orgwso2apkconfigapi:APIManagementException e = error orgwso2apkconfigapi:APIManagementException(orgwso2apkconfigapi:APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); return e; } else { - return java:toString(externalObj); + return java:toString(externalObj) ?: ""; } } @@ -120,13 +121,13 @@ public isolated function RuntimeAPICommonUtil_generateDefinition(orgwso2apkconfi # + arg0 - The `orgwso2apkconfigmodel:API` value required to map with the Java method parameter. # + arg1 - The `string` value required to map with the Java method parameter. # + return - The `string` or the `orgwso2apkconfigapi:APIManagementException` value returning from the Java mapping. -public isolated function RuntimeAPICommonUtil_generateDefinition2(orgwso2apkconfigmodel:API arg0, string arg1) returns orgwso2apkconfigapi:APIManagementException|string? { +public isolated function RuntimeAPICommonUtil_generateDefinition2(orgwso2apkconfigmodel:API arg0, string arg1) returns string|orgwso2apkconfigapi:APIManagementException { handle|error externalObj = org_wso2_apk_config_RuntimeAPICommonUtil_generateDefinition2(arg0.jObj, java:fromString(arg1)); if (externalObj is error) { orgwso2apkconfigapi:APIManagementException e = error orgwso2apkconfigapi:APIManagementException(orgwso2apkconfigapi:APIMANAGEMENTEXCEPTION, externalObj, message = externalObj.message()); return e; } else { - return java:toString(externalObj); + return java:toString(externalObj) ?: ""; } } @@ -166,7 +167,7 @@ public isolated function RuntimeAPICommonUtil_getAPIFromDefinition(string arg0, # # + arg0 - The `byte[]` value required to map with the Java method parameter. # + arg1 - The `string` value required to map with the Java method parameter. -# + return - The `orgwso2apkconfigmodel:API` value returning from the Java mapping. +# + return - The `orgwso2apkconfigmodel:API` or the `orgwso2apkconfigapi:APIManagementException` value returning from the Java mapping. public isolated function RuntimeAPICommonUtil_getGRPCAPIFromProtoDefinition(byte[] arg0, string arg1) returns orgwso2apkconfigmodel:API|orgwso2apkconfigapi:APIManagementException|error { handle|error externalObj = org_wso2_apk_config_RuntimeAPICommonUtil_getGRPCAPIFromProtoDefinition(check jarrays:toHandle(arg0, "byte"), java:fromString(arg1)); if (externalObj is error) {