Merge pull request #1048 from HindujaB/java21

Migrate runtime APIs for Java 21
ballerina-platform · Nov 16, 2024 · 2bb76a4 · 2bb76a4
2 parents be5cfbe + 075c7ed
commit 2bb76a4
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 33 deletions.
diff --git a/build.gradle b/build.gradle
@@ -88,6 +88,7 @@ subprojects {
         ballerinaStdLibs "io.ballerina.stdlib:http-ballerina:${stdlibHttpVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:observe-ballerina:${observeVersion}"
         ballerinaStdLibs "io.ballerina:observe-ballerina:${observeInternalVersion}"
+        ballerinaStdLibs "io.ballerina.lib:data.jsondata-ballerina:${stdlibDataJsonDataVersion}"
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,8 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
-version=1.12.1-SNAPSHOT
-ballerinaLangVersion=2201.10.0-20241019-091600-89e54c08
+version=1.13.0-SNAPSHOT
+ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87
+
 puppycrawlCheckstyleVersion=10.12.0
 testngVersion=7.6.1
 ballerinaGradlePluginVersion=2.0.1
@@ -13,34 +14,35 @@ downloadPluginVersion=5.4.0
 releasePluginVersion=2.8.0
 
 # Direct Dependencies
-stdlibIoVersion=1.6.2-20240928-084100-656404f
-stdlibRandomVersion=1.5.1-20240930-193000-e5c6c0e
-stdlibTimeVersion=2.5.1-20240930-120200-e59222b
-stdlibUrlVersion=2.4.1-20240930-120200-b7fb9e1
-stdlibCryptoVersion=2.7.3-20240930-132000-5ecc9ab
-stdlibLogVersion=2.10.1-20240930-154200-5ab2aa4
-stdlibMimeVersion=2.10.1-20241009-141200-8b6c9f0
-stdlibUuidVersion=1.8.1-20241009-134600-a05012b
-stdlibHttpVersion=2.13.0-20241022-163700-67b6515
+stdlibIoVersion=1.6.2-20241112-233100-995cf5f
+stdlibRandomVersion=1.5.1-20241113-122300-1bc770e
+stdlibTimeVersion=2.6.0-20241113-073800-201b904
+stdlibUrlVersion=2.4.1-20241113-073900-335ff51
+stdlibCryptoVersion=2.7.3-20241113-081400-d015a39
+stdlibLogVersion=2.10.1-20241113-120000-4577868
+stdlibMimeVersion=2.10.2-20241113-154200-d953747
+stdlibUuidVersion=1.8.1-20241113-154400-443c67b
+stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a
 
 # Transitive Dependencies
 
 # Level 01
-stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396
+stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5
 
 # Level 02
-stdlibOsVersion=1.8.1-20241001-120600-dd1626e
-stdlibTaskVersion=2.5.1-20241002-145700-5bdb843
+stdlibOsVersion=1.8.1-20241113-122000-cca973b
+stdlibTaskVersion=2.5.1-20241113-123500-f905281
 
 # Level 03
-stdlibCacheVersion=3.8.1-20241007-154900-63f4403
-stdlibFileVersion=1.10.1-20241007-160900-03f7b64
+stdlibCacheVersion=3.8.1-20241113-125700-b75a1bf
+stdlibFileVersion=1.10.1-20241113-151700-e1a2e38
 
 # Level 04
-stdlibAuthVersion=2.12.1-20241010-130800-733dbef
-stdlibJwtVersion=2.13.1-20241010-123600-5ea6a94
-stdlibOAuth2Version=2.12.1-20241010-123600-0e0cfcc
+stdlibAuthVersion=2.12.1-20241113-162300-ded40eb
+stdlibDataJsonDataVersion=0.3.0-20241114-143900-285d739
+stdlibJwtVersion=2.13.1-20241113-162400-b59ccfa
+stdlibOAuth2Version=2.12.1-20241113-162400-4c6ddfe
 
 # Ballerinax Observe
-observeVersion=1.3.1-20241007-161000-645452d
-observeInternalVersion=1.3.1-20241015-172900-cdc3cb3
+observeVersion=1.4.0-20241113-092000-b83ae74
+observeInternalVersion=1.3.1-20241113-101700-265054d
diff --git a/load-tests/in_memory_hub/results/summary.csv b/load-tests/in_memory_hub/results/summary.csv
@@ -338,3 +338,20 @@ In Memory Hub,76925,0.06412642708716601,0,0,0,0,0,0,6.499837504062398E-5,15.5941
 In Memory Hub,79247,0.06196256975011851,0,0,0,0,0,0,0.0,16.138775458035088,0,0,1729368383,0,1
 In Memory Hub,67265,0.0719498915449488,0,0,0,0,0,0,1.4866572511707426E-5,13.898561603463662,0,0,1729541418,0,1
 In Memory Hub,84068,0.054722195197799244,0,0,0,0,0,0,0.0,18.2741206997525,0,0,1729628049,0,1
+In Memory Hub,59214,0.08384187247737945,0,0,0,0,0,0,1.6887898132198468E-5,11.927214534358118,0,0,1729713954,0,1
+In Memory Hub,80213,0.05820275133974716,0,0,0,0,0,0,4.9867228504107816E-5,17.18131835663053,0,0,1730232196,0,1
+In Memory Hub,80998,0.062196418567107364,0,0,0,0,0,0,0.0,16.07809618364185,0,0,1730318856,0,1
+In Memory Hub,71617,0.07469849986733881,0,0,0,0,0,0,4.18894955108424E-5,13.387149698801919,0,0,1730405166,0,1
+In Memory Hub,86478,0.05539380723128613,0,0,0,0,0,0,0.0,18.052559482410974,0,0,1730491587,0,1
+In Memory Hub,78645,0.06053409564685257,0,0,0,0,0,0,5.086146608175981E-5,16.51961575231684,0,0,1730577712,0,1
+In Memory Hub,74483,0.06619744852595406,0,0,0,0,0,0,9.398117691285259E-5,15.106322407697172,0,0,1730664344,0,1
+In Memory Hub,77406,0.0628824593935229,0,0,0,0,0,0,6.459447588042271E-5,15.902685894359331,0,0,1730750784,0,1
+In Memory Hub,74776,0.06536801693099013,0,0,0,0,0,0,5.349309939017867E-5,15.298001177788718,0,0,1730837248,0,1
+In Memory Hub,61800,0.09763549863956465,0,0,0,0,0,0,1.6181229773462782E-5,10.242176400323844,0,0,1731010479,0,1
+In Memory Hub,62588,0.0828754995244996,0,0,0,0,0,0,0.0,12.066292278629112,0,0,1731096521,0,1
+In Memory Hub,56402,0.10170228828253078,0,0,0,0,0,0,0.0,9.832620454143393,0,0,1731182898,0,1
+In Memory Hub,59206,0.09968648669553613,0,0,0,0,0,0,1.6890180049319325E-5,10.031449930161688,0,0,1731269202,0,1
+In Memory Hub,59096,0.10001833193966224,0,0,0,0,0,0,0.0,9.998167142032193,0,0,1731355812,0,1
+In Memory Hub,59926,0.09689208330906685,0,0,0,0,0,0,0.0,10.320760642643993,0,0,1731442655,0,1
+In Memory Hub,57692,0.09155279873930662,0,0,0,0,0,0,0.0,10.922658987711177,0,0,1731529067,0,1
+In Memory Hub,56358,0.10657366478381132,0,0,0,0,0,0,7.097483941942582E-5,9.383181126674563,0,0,1731614919,0,1
diff --git a/native/src/main/java/io/ballerina/stdlib/websubhub/NativeHttpToWebsubhubAdaptor.java b/native/src/main/java/io/ballerina/stdlib/websubhub/NativeHttpToWebsubhubAdaptor.java
@@ -20,14 +20,13 @@
 
 import io.ballerina.runtime.api.Environment;
 import io.ballerina.runtime.api.Module;
-import io.ballerina.runtime.api.TypeTags;
-import io.ballerina.runtime.api.async.StrandMetadata;
 import io.ballerina.runtime.api.creators.ValueCreator;
 import io.ballerina.runtime.api.types.IntersectionType;
 import io.ballerina.runtime.api.types.MethodType;
 import io.ballerina.runtime.api.types.ObjectType;
 import io.ballerina.runtime.api.types.Parameter;
 import io.ballerina.runtime.api.types.Type;
+import io.ballerina.runtime.api.types.TypeTags;
 import io.ballerina.runtime.api.utils.StringUtils;
 import io.ballerina.runtime.api.utils.TypeUtils;
 import io.ballerina.runtime.api.values.BArray;
@@ -203,18 +202,9 @@ private static Object invokeRemoteFunction(Environment env, BObject bHubService,
         return env.yieldAndRun(() -> {
             CompletableFuture<Object> balFuture = new CompletableFuture<>();
             Module module = ModuleUtils.getModule();
-            StrandMetadata metadata = new StrandMetadata(module.getOrg(), module.getName(), module.getVersion(),
-                    parentFunctionName);
             ObjectType serviceType = (ObjectType) TypeUtils.getReferredType(TypeUtils.getType(bHubService));
-            Object result;
             try {
-                if (serviceType.isIsolated() && serviceType.isIsolated(remoteFunctionName)) {
-                    result = env.getRuntime().startIsolatedWorker(bHubService, remoteFunctionName, null, metadata,
-                            null, args).get();
-                } else {
-                    result = env.getRuntime().startNonIsolatedWorker(bHubService, remoteFunctionName, null,
-                            metadata, null, args).get();
-                }
+                Object result = env.getRuntime().callMethod(bHubService, remoteFunctionName, null, args);
                 ModuleUtils.notifySuccess(balFuture, result);
                 return ModuleUtils.getResult(balFuture);
             } catch (BError bError) {