From b0d73fd71bf6e7ef5fb748bc91bb45b8add9bc5a Mon Sep 17 00:00:00 2001 From: anuruddhal Date: Mon, 3 Feb 2025 15:23:16 +0530 Subject: [PATCH 1/2] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 2 +- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index c347cabe..f25e8ed3 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "cloud" -version = "2.11.3" +version = "2.11.4" repository = "https://github.com/ballerina-platform/module-ballerina-c2c" license = ["Apache-2.0"] keywords = ["cloud", "kubernetes", "docker", "k8s", "c2c"] diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index ef4b9e83..d78a9a02 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "code2cloud" class = "io.ballerina.c2c.C2CCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/cloud-compiler-plugin-2.11.3.jar" +path = "../compiler-plugin/build/libs/cloud-compiler-plugin-2.11.4-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index a33ff8a8..61cf020a 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -10,7 +10,7 @@ distribution-version = "2201.8.0" [[package]] org = "ballerina" name = "cloud" -version = "2.11.3" +version = "2.11.4" modules = [ {org = "ballerina", packageName = "cloud", moduleName = "cloud"} ] From ffa908a5f83af4139da13e1311685ad2048aedf9 Mon Sep 17 00:00:00 2001 From: anuruddhal Date: Mon, 3 Feb 2025 16:31:43 +0530 Subject: [PATCH 2/2] Validate expression node kind before casting --- build.gradle | 2 +- cloud-util/src/main/java/io/ballerina/c2c/util/C2CVisitor.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2d5b9365..2e1ad450 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ ext.slf4jVersion = "1.7.26" ext.testngVersion = "7.6.1" ext.lombokVersion = "1.18.28" ext.commonIoVersion = "2.13.0" -ext.jacksonYamlVersion = " 2.15.2" +ext.jacksonYamlVersion = "2.15.2" ext.commonsCodecVersion = "1.16.0" allprojects { diff --git a/cloud-util/src/main/java/io/ballerina/c2c/util/C2CVisitor.java b/cloud-util/src/main/java/io/ballerina/c2c/util/C2CVisitor.java index 948b72be..c3c658df 100644 --- a/cloud-util/src/main/java/io/ballerina/c2c/util/C2CVisitor.java +++ b/cloud-util/src/main/java/io/ballerina/c2c/util/C2CVisitor.java @@ -484,6 +484,9 @@ private Optional getMutualSSLConfig(ExpressionNode expressionNo .createDiagnostic(C2CDiagnosticCodes.FAILED_VARIABLE_RETRIEVAL, expressionNode.location(), name)); return Optional.empty(); } + if (expressionNode.kind() != SyntaxKind.MAPPING_CONSTRUCTOR) { + return Optional.empty(); + } MappingConstructorExpressionNode expressionNode1 = (MappingConstructorExpressionNode) expressionNode; SeparatedNodeList fields = expressionNode1.fields(); for (MappingFieldNode field : fields) {