Merge pull request #797 from aashikam/deprecate

Remove deprecated nats:Message usages
ballerina-platform · Apr 10, 2024 · c043090 · c043090
2 parents 98c2dde + 92de78f
commit c043090
Show file tree

Hide file tree

Showing 57 changed files with 267 additions and 267 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ nats:Error? result =
 2. Publish as a request that expects a reply:
 ```ballerina
 string message = "hello world";
-nats:Message|nats:Error reqReply = 
+nats:AnydataMessage|nats:Error reqReply = 
     natsClient->requestMessage({ content: message.toBytes(), subject: "demo.nats.basic"}, 5);
 ```
 
@@ -76,7 +76,7 @@ nats:Error? result = natsClient->publish({ content: message.toBytes(), subject:
 }
 service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 }
 ```
@@ -90,7 +90,7 @@ service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 
     // The returned message will be published to the replyTo subject of the consumed message
-    remote function onRequest(nats:Message message) returns string? {
+    remote function onRequest(nats:AnydataMessage message) returns string? {
         return "Reply Message";
     }
 }

diff --git a/ballerina-tests/Ballerina.toml b/ballerina-tests/Ballerina.toml
@@ -1,4 +1,4 @@
 [package]
 org = "ballerinax"
 name = "nats_tests"
-version = "2.11.0"
+version = "3.0.0"
diff --git a/ballerina-tests/Dependencies.toml b/ballerina-tests/Dependencies.toml
@@ -144,7 +144,7 @@ dependencies = [
 [[package]]
 org = "ballerinax"
 name = "nats"
-version = "2.11.0"
+version = "3.0.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
@@ -158,7 +158,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "nats_tests"
-version = "2.11.0"
+version = "3.0.0"
 dependencies = [
 	{org = "ballerina", name = "lang.runtime"},
 	{org = "ballerina", name = "lang.string"},

diff --git a/ballerina-tests/tests/data_binding_publish_tests.bal b/ballerina-tests/tests/data_binding_publish_tests.bal
@@ -619,7 +619,7 @@ service nats:Service on new nats:Listener(DATA_BINDING_URL) {
     remote function onMessage(XmlMessage msg) {
     }
 
-    remote function onError(nats:Message message, nats:Error err) {
+    remote function onError(nats:AnydataMessage message, nats:Error err) {
         log:printInfo("Error Received: " + err.message());
         setOnErrorReceived(true);
         setOnErrorMessage(err.message());

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerinax"
 name = "nats"
-version = "2.11.0"
+version = "3.0.0"
 authors = ["Ballerina"]
 keywords = ["service", "client", "messaging", "network", "pubsub"]
 repository = "https://github.com/ballerina-platform/module-ballerinax-nats"
@@ -18,8 +18,8 @@ path = "./lib/jnats-2.16.0.jar"
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "nats-native"
-version = "2.11.0"
-path = "../native/build/libs/nats-native-2.11.0-SNAPSHOT.jar"
+version = "3.0.0"
+path = "../native/build/libs/nats-native-3.0.0-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"

diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "nats-compiler-plugin"
 class = "io.ballerina.stdlib.nats.plugin.NatsCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/nats-compiler-plugin-2.11.0-SNAPSHOT.jar"
+path = "../compiler-plugin/build/libs/nats-compiler-plugin-3.0.0-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -160,7 +160,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "nats"
-version = "2.11.0"
+version = "3.0.0"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "crypto"},

diff --git a/ballerina/Module.md b/ballerina/Module.md
@@ -46,7 +46,7 @@ nats:Error? result =
 2. Publish as a request that expects a reply:
 ```ballerina
 string message = "hello world";
-nats:Message|nats:Error reqReply = 
+nats:AnydataMessage|nats:Error reqReply = 
     natsClient->requestMessage({ content: message.toBytes(), subject: "demo.nats.basic"}, 5);
 ```
 
@@ -69,7 +69,7 @@ nats:Error? result = natsClient->publish({ content: message.toBytes(), subject:
 }
 service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 }
 ```
@@ -83,7 +83,7 @@ service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 
     // The returned message will be published to the replyTo subject of the consumed message
-    remote function onRequest(nats:Message message) returns string? {
+    remote function onRequest(nats:AnydataMessage message) returns string? {
         return "Reply Message";
     }
 }

diff --git a/ballerina/Package.md b/ballerina/Package.md
@@ -46,7 +46,7 @@ nats:Error? result =
 2. Publish as a request that expects a reply:
 ```ballerina
 string message = "hello world";
-nats:Message|nats:Error reqReply = 
+nats:AnydataMessage|nats:Error reqReply = 
     natsClient->requestMessage({ content: message.toBytes(), subject: "demo.nats.basic"}, 5);
 ```
 
@@ -69,7 +69,7 @@ nats:Error? result = natsClient->publish({ content: message.toBytes(), subject:
 }
 service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 }
 ```
@@ -83,7 +83,7 @@ service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 
     // The returned message will be published to the replyTo subject of the consumed message
-    remote function onRequest(nats:Message message) returns string? {
+    remote function onRequest(nats:AnydataMessage message) returns string? {
         return "Reply Message";
     }
 }

diff --git a/ballerina/records.bal b/ballerina/records.bal
@@ -109,20 +109,6 @@ public type RetryConfig record {|
     decimal connectionTimeout = 2;
 |};
 
-# Represents the message, which a NATS server sends to its subscribed services.
-#
-# + content - The message content
-# + replyTo - The `replyTo` subject of the message
-# + subject - The subject to which the message was sent to
-# # Deprecated
-# This record is deprecated. Use `AnydataMessage` record instead.
-@deprecated
-public type Message record {|
-    byte[] content;
-    string subject;
-    string replyTo?;
-|};
-
 # Represents the anydata message, which a NATS server sends to its subscribed services.
 #
 # + content - The message content, which can of type anydata

diff --git a/changelog.md b/changelog.md
@@ -5,6 +5,12 @@ This file contains all the notable changes done to the Ballerina NATS package th
 
 ### Changed
 
+- [[#6282] Remove the definition and the usages of the deprecated `nats:Message` record](https://github.com/ballerina-platform/ballerina-library/issues/6282)
+
+## [2.10.0] - 2023-09-18
+
+### Changed
+
 - [[#4733] Changed disallowing service level annotations in the compiler plugin](https://github.com/ballerina-platform/ballerina-standard-library/issues/4733)
 
 ## [2.7.0] - 2023-04-10

diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_10/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_10/service.bal
@@ -23,7 +23,7 @@ listener nats:Listener subscription = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription {
 
-    remote function onRequest(nats:Message msg) returns nats:Client|error {
+    remote function onRequest(nats:AnydataMessage msg) returns nats:Client|error {
         return new nats:Client(nats:DEFAULT_URL);
     }
 }
@@ -33,7 +33,7 @@ service nats:Service on subscription {
 }
 service nats:Service on subscription {
 
-    remote function onRequest(nats:Message msg) returns nats:Listener {
+    remote function onRequest(nats:AnydataMessage msg) returns nats:Listener {
         return subscription;
     }
 }
diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_11/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_11/service.bal
@@ -23,7 +23,7 @@ listener nats:Listener subscription = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 
     remote function onError(string message, nats:Error err) {
@@ -35,7 +35,7 @@ service nats:Service on subscription {
 }
 service nats:Service on subscription {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 
     remote function onError(nats:Client message, nats:Error err) {

diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_12/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_12/service.bal
@@ -23,9 +23,9 @@ listener nats:Listener subscription = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 
-    remote function onError(nats:Message message) {
+    remote function onError(nats:AnydataMessage message) {
     }
 }
diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_13/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_13/service.bal
@@ -23,10 +23,10 @@ listener nats:Listener subscription = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 
-    remote function onError(nats:Message message, nats:Error err, string something) {
+    remote function onError(nats:AnydataMessage message, nats:Error err, string something) {
     }
 }
 
diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_14/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_14/service.bal
@@ -23,10 +23,10 @@ listener nats:Listener subscription = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 
-    remote function onError(nats:Message message, string err) {
+    remote function onError(nats:AnydataMessage message, string err) {
     }
 }
 
@@ -35,9 +35,9 @@ service nats:Service on subscription {
 }
 service nats:Service on subscription {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 
-    remote function onError(nats:Message message, nats:Client err) {
+    remote function onError(nats:AnydataMessage message, nats:Client err) {
     }
 }
diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_15/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_15/service.bal
@@ -24,7 +24,7 @@ listener nats:Listener subscription2 = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription1, subscription2 {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 }
 

diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_16/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_16/service.bal
@@ -23,7 +23,7 @@ listener nats:Listener subscription1 = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription1 {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 
     resource function get greeting() returns string {

diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_18/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_18/service.bal
@@ -24,7 +24,7 @@ listener nats:Listener subscription = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription {
 
-    remote function onMessage(readonly & nats:Message message, string data) {
+    remote function onMessage(readonly & nats:AnydataMessage message, string data) {
     }
 
     remote function onError() {
@@ -36,10 +36,10 @@ service nats:Service on subscription {
 }
 service nats:Service on subscription {
 
-    remote function onMessage(nats:Message message, xml data) {
+    remote function onMessage(nats:AnydataMessage message, xml data) {
     }
 
-    remote function onError(nats:Message message) {
+    remote function onError(nats:AnydataMessage message) {
     }
 }
 
@@ -48,7 +48,7 @@ service nats:Service on subscription {
 }
 service nats:Service on subscription {
 
-    remote function onMessage(readonly & nats:Message message, decimal[] data) {
+    remote function onMessage(readonly & nats:AnydataMessage message, decimal[] data) {
     }
 
     remote function onError(error err) {

diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_19/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_19/service.bal
@@ -24,10 +24,10 @@ listener nats:Listener subscription = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription {
 
-    remote function onMessage(string data, nats:Message message) {
+    remote function onMessage(string data, nats:AnydataMessage message) {
     }
 
-    remote function onError(nats:Message message, nats:Error err) {
+    remote function onError(nats:AnydataMessage message, nats:Error err) {
     }
 
 }

diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_2/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_2/service.bal
@@ -21,10 +21,10 @@ import ballerinax/nats;
 }
 service nats:Service on new nats:Listener(nats:DEFAULT_URL) {
 
-    remote function onMessage(nats:Message message) {
+    remote function onMessage(nats:AnydataMessage message) {
     }
 
-    remote function onRequest(nats:Message message) returns string {
+    remote function onRequest(nats:AnydataMessage message) returns string {
         return "Hello";
     }
 }
diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_20/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_20/service.bal
@@ -24,7 +24,7 @@ listener nats:Listener subscription = new(nats:DEFAULT_URL);
 }
 service nats:Service on subscription {
 
-    remote function onRequest(nats:Message message, string data) returns string? {
+    remote function onRequest(nats:AnydataMessage message, string data) returns string? {
         return "Hello from the other side";
     }
 
@@ -40,7 +40,7 @@ service nats:Service on subscription {
     remote function onRequest(xml data) returns error? {
     }
 
-    remote function onError(nats:Message message) {
+    remote function onError(nats:AnydataMessage message) {
     }
 }
 
@@ -49,7 +49,7 @@ service nats:Service on subscription {
 }
 service nats:Service on subscription {
 
-    remote function onRequest(readonly & nats:Message message, decimal[] data) returns anydata {
+    remote function onRequest(readonly & nats:AnydataMessage message, decimal[] data) returns anydata {
         return "Received decimal value";
     }
 

diff --git a/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_21/service.bal b/compiler-plugin-tests/src/test/resources/ballerina_sources/invalid_service_21/service.bal
@@ -27,7 +27,7 @@ service nats:Service on subscription {
     remote function onRequest(string data, xml message) returns error? {
     }
 
-    remote function onError(nats:Message message, nats:Error err) returns error? {
+    remote function onError(nats:AnydataMessage message, nats:Error err) returns error? {
     }
 }
 
@@ -39,7 +39,7 @@ service nats:Service on subscription {
     remote function onRequest(json[] data, int message) returns error? {
     }
 
-    remote function onError(nats:Message message, nats:Error err) returns error? {
+    remote function onError(nats:AnydataMessage message, nats:Error err) returns error? {
     }
 }
 
@@ -51,6 +51,6 @@ service nats:Service on subscription {
     remote function onRequest(readonly & byte[] data, int message) returns error? {
     }
 
-    remote function onError(nats:Message message, nats:Error err) returns error? {
+    remote function onError(nats:AnydataMessage message, nats:Error err) returns error? {
     }
 }