Merge pull request #1 from ayeshLK/conflict_resolution

Refactor the code base and add the missing licensing headers

ballerina/Ballerina.toml

@@ -26,3 +26,21 @@ groupId = "com.ibm.mq"
 artifactId = "com.ibm.mq.allclient"
 version = "9.3.4.0"
 path = "./lib/com.ibm.mq.allclient-9.3.4.0.jar"
+
+[[platform.java17.dependency]]
+groupId = "com.fasterxml.jackson.core"
+artifactId = "jackson-annotations"
+version = "2.15.3"
+path = "./lib/jackson-annotations-2.15.3.jar"
+
+[[platform.java17.dependency]]
+groupId = "com.fasterxml.jackson.core"
+artifactId = "jackson-core"
+version = "2.15.3"
+path = "./lib/jackson-core-2.15.3.jar"
+
+[[platform.java17.dependency]]
+groupId = "com.fasterxml.jackson.core"
+artifactId = "jackson-databind"
+version = "2.15.3"
+path = "./lib/jackson-databind-2.15.3.jar"

ballerina/build.gradle

@@ -75,16 +75,28 @@ dependencies {
     externalJars(group: 'com.ibm.mq', name: 'com.ibm.mq.allclient', version: "${ibmMQVersion}") {
         transitive = false
     }
+    /* Jackson dependencies */
+    externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "${jacksonVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonVersion}") {
+        transitive = false
+    }
+    externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonVersion}") {
+        transitive = false
+    }
 }
 
 task updateTomlFiles {
     doLast {
         def stdlibDependentIbmMQVersion = project.ibmMQVersion
         def stdlibDependentJsonVersion = project.jsonVersion
+        def stdlibDependentJacksonVersion = project.jacksonVersion;
         def newConfig = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version)
         newConfig = newConfig.replace("@toml.version@", tomlVersion)
         newConfig = newConfig.replace("@ibmmq.version@", stdlibDependentIbmMQVersion)
         newConfig = newConfig.replace("@json.version@", stdlibDependentJsonVersion)
+        newConfig = newConfig.replace("@jackson.version@", stdlibDependentJacksonVersion)
         ballerinaTomlFile.text = newConfig
     }
 }

ballerina/tests/topic_publisher_subscriber_tests.bal

@@ -13,6 +13,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+
 import ballerina/test;
 
 @test:Config {

ballerina/utils.bal

@@ -15,7 +15,7 @@
 // under the License.
 
 // This class is used by the native implementation to add the MQRFH2 fields to a table.
-class NativeUtils {
+isolated class NativeUtils {
 
     // This method is invoked by the native runtime to add the MQRFH2 fields to a table.
     function addMQRFH2FieldsToTable(MQRFH2Field[] fields) returns table<MQRFH2Field> key(folder, 'field) {

build-config/resources/Ballerina.toml

@@ -26,3 +26,21 @@ groupId = "com.ibm.mq"
 artifactId = "com.ibm.mq.allclient"
 version = "@ibmmq.version@"
 path = "./lib/[email protected]@.jar"
+
+[[platform.java17.dependency]]
+groupId = "com.fasterxml.jackson.core"
+artifactId = "jackson-annotations"
+version = "@jackson.version@"
+path = "./lib/[email protected]@.jar"
+
+[[platform.java17.dependency]]
+groupId = "com.fasterxml.jackson.core"
+artifactId = "jackson-core"
+version = "@jackson.version@"
+path = "./lib/[email protected]@.jar"
+
+[[platform.java17.dependency]]
+groupId = "com.fasterxml.jackson.core"
+artifactId = "jackson-databind"
+version = "@jackson.version@"
+path = "./lib/[email protected]@.jar"

gradle.properties

@@ -13,6 +13,7 @@ ballerinaGradlePluginVersion=2.0.1
 # IBM MQ dependencies
 ibmMQVersion=9.3.4.0
 jsonVersion=20231013
+jacksonVersion=2.15.3
 
 #stdlib dependencies
 

native/src/main/java/io/ballerina/lib/ibm.ibmmq/headers/HeaderUtils.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package io.ballerina.lib.ibm.ibmmq.headers;
 
 import com.ibm.mq.MQMessage;

native/src/main/java/io/ballerina/lib/ibm.ibmmq/headers/MQCHIHHeader.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package io.ballerina.lib.ibm.ibmmq.headers;
 
 import com.ibm.mq.MQMessage;

native/src/main/java/io/ballerina/lib/ibm.ibmmq/headers/MQRFH2Header.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package io.ballerina.lib.ibm.ibmmq.headers;
 
 import com.ibm.mq.MQMessage;

native/src/main/java/io/ballerina/lib/ibm.ibmmq/headers/MQRFHHeader.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package io.ballerina.lib.ibm.ibmmq.headers;
 
 import com.ibm.mq.MQMessage;