Merge pull request #48 from dilanSachi/isolate-caller

Make caller and streaming client isolated in generated files
ballerina-platform · Jun 27, 2024 · cccc0d1 · cccc0d1
2 parents 23d009c + 40411fa
commit cccc0d1
Show file tree

Hide file tree

Showing 106 changed files with 546 additions and 546 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 org.gradle.caching=true
 group=io.ballerina
-version=0.2.1-SNAPSHOT
+version=0.3.0-SNAPSHOT
 #dependency versions
-ballerinaLangVersion=2201.8.0
+ballerinaLangVersion=2201.9.1
 checkstylePluginVersion=10.12.1
 commonsLang3Version=3.8.1
 slf4jVersion=1.7.30
@@ -16,30 +16,30 @@ researchgateReleaseVersion=2.8.0
 testngVersion=7.6.1
 jacocoVersion=0.8.10
 
-stdlibGrpcVersion=1.10.0
+stdlibGrpcVersion=1.11.1
 stdlibIoVersion=1.6.0
 stdlibTimeVersion=2.4.0
 stdlibUrlVersion=2.4.0
 
 stdlibConstraintVersion=1.4.0
-stdlibCryptoVersion=2.5.0
+stdlibCryptoVersion=2.7.0
 stdlibLogVersion=2.9.0
 stdlibOsVersion=1.8.0
 stdlibProtobufVersion=1.6.0
 stdlibRandomVersion=1.5.0
 stdlibTaskVersion=2.5.0
 
-stdlibCacheVersion=3.7.0
+stdlibCacheVersion=3.8.0
 stdlibFileVersion=1.9.0
 stdlibMimeVersion=2.9.0
-stdlibUuidVersion=1.7.0
+stdlibUuidVersion=1.8.0
 
-stdlibAuthVersion=2.10.0
-stdlibJwtVersion=2.10.0
-stdlibOAuth2Version=2.10.0
+stdlibAuthVersion=2.11.0
+stdlibJwtVersion=2.11.0
+stdlibOAuth2Version=2.11.0
 
-stdlibHttpVersion=2.10.0
+stdlibHttpVersion=2.11.0
 
 # Ballerinax Observer
-observeVersion=1.2.0-20230911-133500-b3d8db3
-observeInternalVersion=1.2.0-20230911-141700-4c0454a
+observeVersion=1.2.3
+observeInternalVersion=1.2.2
diff --git a/protoc-cli/src/main/java/io/ballerina/protoc/builder/syntaxtree/utils/CallerUtils.java b/protoc-cli/src/main/java/io/ballerina/protoc/builder/syntaxtree/utils/CallerUtils.java
@@ -51,12 +51,12 @@ private CallerUtils() {
 
     public static Class getCallerClass(String key, String value, String filename) {
         Class caller = new Class(key, true);
-        caller.addQualifiers(new String[]{"client"});
+        caller.addQualifiers(new String[]{"isolated", "client"});
 
         caller.addMember(
                 getObjectFieldNode(
                         "private",
-                        new String[]{},
+                        new String[]{"final"},
                         getQualifiedNameReferenceNode("grpc", "Caller"),
                         "caller"
                 )

diff --git a/protoc-cli/src/main/java/io/ballerina/protoc/builder/syntaxtree/utils/ClientUtils.java b/protoc-cli/src/main/java/io/ballerina/protoc/builder/syntaxtree/utils/ClientUtils.java
@@ -109,12 +109,12 @@ public static Class getStreamingClientClass(Method method, String filename) {
         String name = method.getMethodName().substring(0, 1).toUpperCase() + method.getMethodName().substring(1) +
                 STREAMING_CLIENT;
         Class streamingClient = new Class(name, true);
-        streamingClient.addQualifiers(new String[]{"client"});
+        streamingClient.addQualifiers(new String[]{"isolated", "client"});
 
         streamingClient.addMember(
                 getObjectFieldNode(
                         "private",
-                        new String[]{},
+                        new String[]{"final"},
                         getQualifiedNameReferenceNode("grpc", STREAMING_CLIENT),
                         "sClient"));
 

diff --git a/...st/resources/test-src/generated-sources/tool_test_bidirectional_1/helloWorldString_pb.bal b/...st/resources/test-src/generated-sources/tool_test_bidirectional_1/helloWorldString_pb.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;
@@ -63,8 +63,8 @@ public client class HelloStreamingClient {
     }
 }
 
-public client class HelloWorldStringCaller {
-    private grpc:Caller caller;
+public isolated client class HelloWorldStringCaller {
+    private final grpc:Caller caller;
 
     public isolated function init(grpc:Caller caller) {
         self.caller = caller;

diff --git a/...urces/test-src/generated-sources/tool_test_bidirectional_1/helloWorldString_pb_client.bal b/...urces/test-src/generated-sources/tool_test_bidirectional_1/helloWorldString_pb_client.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;

diff --git a/.../test/resources/test-src/generated-sources/tool_test_bidirectional_2/helloWorldInt_pb.bal b/.../test/resources/test-src/generated-sources/tool_test_bidirectional_2/helloWorldInt_pb.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;
@@ -63,8 +63,8 @@ public client class HelloStreamingClient {
     }
 }
 
-public client class HelloWorldIntCaller {
-    private grpc:Caller caller;
+public isolated client class HelloWorldIntCaller {
+    private final grpc:Caller caller;
 
     public isolated function init(grpc:Caller caller) {
         self.caller = caller;

diff --git a/...esources/test-src/generated-sources/tool_test_bidirectional_2/helloWorldInt_pb_client.bal b/...esources/test-src/generated-sources/tool_test_bidirectional_2/helloWorldInt_pb_client.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;

diff --git a/...est/resources/test-src/generated-sources/tool_test_bidirectional_3/helloWorldFloat_pb.bal b/...est/resources/test-src/generated-sources/tool_test_bidirectional_3/helloWorldFloat_pb.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;
@@ -63,8 +63,8 @@ public client class HelloStreamingClient {
     }
 }
 
-public client class HelloWorldFloatCaller {
-    private grpc:Caller caller;
+public isolated client class HelloWorldFloatCaller {
+    private final grpc:Caller caller;
 
     public isolated function init(grpc:Caller caller) {
         self.caller = caller;

diff --git a/...ources/test-src/generated-sources/tool_test_bidirectional_3/helloWorldFloat_pb_client.bal b/...ources/test-src/generated-sources/tool_test_bidirectional_3/helloWorldFloat_pb_client.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;

diff --git a/...t/resources/test-src/generated-sources/tool_test_bidirectional_4/helloWorldBoolean_pb.bal b/...t/resources/test-src/generated-sources/tool_test_bidirectional_4/helloWorldBoolean_pb.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;
@@ -63,8 +63,8 @@ public client class HelloStreamingClient {
     }
 }
 
-public client class HelloWorldBooleanCaller {
-    private grpc:Caller caller;
+public isolated client class HelloWorldBooleanCaller {
+    private final grpc:Caller caller;
 
     public isolated function init(grpc:Caller caller) {
         self.caller = caller;

diff --git a/...rces/test-src/generated-sources/tool_test_bidirectional_4/helloWorldBoolean_pb_client.bal b/...rces/test-src/generated-sources/tool_test_bidirectional_4/helloWorldBoolean_pb_client.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;

diff --git a/...est/resources/test-src/generated-sources/tool_test_bidirectional_5/helloWorldBytes_pb.bal b/...est/resources/test-src/generated-sources/tool_test_bidirectional_5/helloWorldBytes_pb.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;
@@ -63,8 +63,8 @@ public client class HelloStreamingClient {
     }
 }
 
-public client class HelloWorldByteCaller {
-    private grpc:Caller caller;
+public isolated client class HelloWorldByteCaller {
+    private final grpc:Caller caller;
 
     public isolated function init(grpc:Caller caller) {
         self.caller = caller;

diff --git a/...ources/test-src/generated-sources/tool_test_bidirectional_5/helloWorldBytes_pb_client.bal b/...ources/test-src/generated-sources/tool_test_bidirectional_5/helloWorldBytes_pb_client.bal
@@ -19,8 +19,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;

diff --git a/...t/resources/test-src/generated-sources/tool_test_bidirectional_6/helloWorldMessage_pb.bal b/...t/resources/test-src/generated-sources/tool_test_bidirectional_6/helloWorldMessage_pb.bal
@@ -24,8 +24,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;
@@ -68,8 +68,8 @@ public client class HelloStreamingClient {
     }
 }
 
-public client class ByeStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class ByeStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;
@@ -112,8 +112,8 @@ public client class ByeStreamingClient {
     }
 }
 
-public client class HelloWorldByeResponseCaller {
-    private grpc:Caller caller;
+public isolated client class HelloWorldByeResponseCaller {
+    private final grpc:Caller caller;
 
     public isolated function init(grpc:Caller caller) {
         self.caller = caller;
@@ -144,8 +144,8 @@ public client class HelloWorldByeResponseCaller {
     }
 }
 
-public client class HelloWorldHelloResponseCaller {
-    private grpc:Caller caller;
+public isolated client class HelloWorldHelloResponseCaller {
+    private final grpc:Caller caller;
 
     public isolated function init(grpc:Caller caller) {
         self.caller = caller;

diff --git a/...rces/test-src/generated-sources/tool_test_bidirectional_6/helloWorldMessage_pb_client.bal b/...rces/test-src/generated-sources/tool_test_bidirectional_6/helloWorldMessage_pb_client.bal
@@ -24,8 +24,8 @@ public isolated client class helloWorldClient {
     }
 }
 
-public client class HelloStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class HelloStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;
@@ -68,8 +68,8 @@ public client class HelloStreamingClient {
     }
 }
 
-public client class ByeStreamingClient {
-    private grpc:StreamingClient sClient;
+public isolated client class ByeStreamingClient {
+    private final grpc:StreamingClient sClient;
 
     isolated function init(grpc:StreamingClient sClient) {
         self.sClient = sClient;