Merge pull request #1307 from warunalakshitha/syncJava21

Migrate to Java21

README.md

@@ -74,7 +74,7 @@ This repository only contains the source code for the module.
 
 ### Set up the prerequisites
 
-1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).
+1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations).
 
    * [Oracle](https://www.oracle.com/java/technologies/downloads/)
 

ballerina/Ballerina.toml

@@ -9,10 +9,10 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.11.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "io-native"
 path = "../native/build/libs/io-native-1.7.0-SNAPSHOT.jar"

ballerina/Dependencies.toml

@@ -5,7 +5,7 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.11.0-20241111-172200-095db58f"
+distribution-version = "2201.11.0-20241117-133400-a3054b77"
 
 [[package]]
 org = "ballerina"

build-config/resources/Ballerina.toml

@@ -9,17 +9,17 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.11.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "io-native"
 path = "../native/build/libs/io-native-@project.version@.jar"
 version = "@toml.version@"
 
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "../test-utils/build/libs/io-test-utils-@project.version@.jar"
 scope = "testOnly"
 version = "@project.version@"

gradle.properties

@@ -1,12 +1,12 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
 version=1.7.0-SNAPSHOT
-ballerinaLangVersion=2201.11.0-20241111-172200-095db58f
+ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77
 puppycrawlCheckstyleVersion=10.12.0
 testngVersion=7.6.1
 slf4jVersion=1.7.30
 jacocoVersion=0.8.10
-githubSpotbugsVersion=5.0.14
+githubSpotbugsVersion=6.0.18
 githubJohnrengelmanShadowVersion=8.1.1
 underCouchDownloadVersion=5.4.0
 researchgateReleaseVersion=2.8.0

native/build.gradle

@@ -49,9 +49,12 @@ jacocoTestReport {
 }
 
 spotbugsMain {
+    def classLoader = plugins["com.github.spotbugs"].class.classLoader
+    def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
+    def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
     ignoreFailures = true
-    effort = "max"
-    reportLevel = "low"
+    effort = SpotBugsEffort.MAX
+    reportLevel = SpotBugsConfidence.LOW
     reportsDir = file("$project.buildDir/reports/spotbugs")
     def excludeFile = file("${rootDir}/build-config/spotbugs-exclude.xml")
     if (excludeFile.exists()) {

native/src/main/java/io/ballerina/stdlib/io/nativeimpl/CsvChannelUtils.java

@@ -18,12 +18,12 @@
 
 package io.ballerina.stdlib.io.nativeimpl;
 
-import io.ballerina.runtime.api.TypeTags;
 import io.ballerina.runtime.api.creators.TypeCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
 import io.ballerina.runtime.api.types.Field;
 import io.ballerina.runtime.api.types.StructureType;
 import io.ballerina.runtime.api.types.Type;
+import io.ballerina.runtime.api.types.TypeTags;
 import io.ballerina.runtime.api.types.UnionType;
 import io.ballerina.runtime.api.utils.StringUtils;
 import io.ballerina.runtime.api.utils.TypeUtils;

native/src/main/java/io/ballerina/stdlib/io/nativeimpl/ReadlnAny.java

@@ -18,14 +18,14 @@
 package io.ballerina.stdlib.io.nativeimpl;
 
 import io.ballerina.runtime.api.Environment;
-import io.ballerina.runtime.api.Future;
+import io.ballerina.runtime.api.creators.ErrorCreator;
 import io.ballerina.runtime.api.utils.StringUtils;
+import io.ballerina.runtime.api.values.BString;
 
 import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.util.Scanner;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * Extern function ballerina/io:readln.
@@ -36,15 +36,21 @@ public class ReadlnAny {
 
     private static final Scanner sc = new Scanner(System.in, Charset.defaultCharset().displayName());
     private static final PrintStream printStream = System.out;
-    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
 
     private ReadlnAny() {}
 
-    public static void readln(Environment env, Object result) {
+    public static BString readln(Environment env, Object result) {
         if (result != null) {
             printStream.print(result);
         }
-        Future balFuture = env.markAsync();
-        executor.execute(() -> balFuture.complete(StringUtils.fromString(sc.nextLine())));
+        return env.yieldAndRun(() -> {
+            CompletableFuture<BString> future = new CompletableFuture<>();
+            Thread.startVirtualThread(() -> future.complete(StringUtils.fromString(sc.nextLine())));
+            try {
+                return future.get();
+            } catch (Throwable e) {
+                throw ErrorCreator.createError(e);
+            }
+        });
     }
 }

native/src/main/java/io/ballerina/stdlib/io/nativeimpl/RecordChannelUtils.java

@@ -18,11 +18,11 @@
 
 package io.ballerina.stdlib.io.nativeimpl;
 
-import io.ballerina.runtime.api.TypeTags;
 import io.ballerina.runtime.api.creators.TypeCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
 import io.ballerina.runtime.api.types.StructureType;
 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;
@@ -44,7 +44,6 @@
 import java.util.ArrayList;
 import java.util.Map;
 
-
 import static io.ballerina.stdlib.io.utils.IOConstants.CSV_RETURN_TYPE;
 import static io.ballerina.stdlib.io.utils.IOConstants.HEADER_NAMES;
 import static io.ballerina.stdlib.io.utils.IOConstants.ITERATOR_NAME;

native/src/main/java/io/ballerina/stdlib/io/nativeimpl/ToTable.java

@@ -18,13 +18,13 @@
 
 package io.ballerina.stdlib.io.nativeimpl;
 
-import io.ballerina.runtime.api.TypeTags;
 import io.ballerina.runtime.api.creators.TypeCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
 import io.ballerina.runtime.api.types.Field;
 import io.ballerina.runtime.api.types.StructureType;
 import io.ballerina.runtime.api.types.TableType;
 import io.ballerina.runtime.api.types.Type;
+import io.ballerina.runtime.api.types.TypeTags;
 import io.ballerina.runtime.api.types.UnionType;
 import io.ballerina.runtime.api.utils.StringUtils;
 import io.ballerina.runtime.api.values.BArray;

native/src/main/java/io/ballerina/stdlib/io/utils/PropertyUtils.java

@@ -18,10 +18,10 @@
 
 package io.ballerina.stdlib.io.utils;
 
-import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.creators.TypeCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
 import io.ballerina.runtime.api.types.MapType;
+import io.ballerina.runtime.api.types.PredefinedTypes;
 import io.ballerina.runtime.api.utils.StringUtils;
 import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BMapInitialValueEntry;

native/src/main/java/io/ballerina/stdlib/io/utils/Utils.java

@@ -90,17 +90,17 @@ private static byte[] getByteArray(InputStream input) throws IOException {
     @SuppressWarnings("unchecked")
     public static Object encode(Object input, String charset, boolean isMimeSpecific) {
         switch (TypeUtils.getReferredType(TypeUtils.getType(input)).getTag()) {
-            case io.ballerina.runtime.api.TypeTags.ARRAY_TAG:
+            case io.ballerina.runtime.api.types.TypeTags.ARRAY_TAG:
                 return encodeBlob(((BArray) input).getBytes(), isMimeSpecific);
-            case io.ballerina.runtime.api.TypeTags.OBJECT_TYPE_TAG:
-            case io.ballerina.runtime.api.TypeTags.RECORD_TYPE_TAG:
+            case io.ballerina.runtime.api.types.TypeTags.OBJECT_TYPE_TAG:
+            case io.ballerina.runtime.api.types.TypeTags.RECORD_TYPE_TAG:
                 //TODO : recheck following casing
                 BObject byteChannel = (BObject) input;
                 if (STRUCT_TYPE.equals(TypeUtils.getType(byteChannel).getName())) {
                     return encodeByteChannel(byteChannel, isMimeSpecific);
                 }
                 return Utils.createBase64Error(ENCODING_ERROR, "incompatible object", isMimeSpecific);
-            case io.ballerina.runtime.api.TypeTags.STRING_TAG:
+            case io.ballerina.runtime.api.types.TypeTags.STRING_TAG:
                 return encodeString(input.toString(), charset, isMimeSpecific);
             default:
                 return Utils.createBase64Error(ENCODING_ERROR, "incompatible input", isMimeSpecific);
@@ -117,12 +117,12 @@ public static Object encode(Object input, String charset, boolean isMimeSpecific
      */
     public static Object decode(Object encodedInput, String charset, boolean isMimeSpecific) {
         switch (TypeUtils.getType(encodedInput).getTag()) {
-            case io.ballerina.runtime.api.TypeTags.ARRAY_TAG:
+            case io.ballerina.runtime.api.types.TypeTags.ARRAY_TAG:
                 return decodeBlob(((BArray) encodedInput).getBytes(), isMimeSpecific);
-            case io.ballerina.runtime.api.TypeTags.OBJECT_TYPE_TAG:
-            case io.ballerina.runtime.api.TypeTags.RECORD_TYPE_TAG:
+            case io.ballerina.runtime.api.types.TypeTags.OBJECT_TYPE_TAG:
+            case io.ballerina.runtime.api.types.TypeTags.RECORD_TYPE_TAG:
                 return decodeByteChannel((BObject) encodedInput, isMimeSpecific);
-            case io.ballerina.runtime.api.TypeTags.STRING_TAG:
+            case io.ballerina.runtime.api.types.TypeTags.STRING_TAG:
                 return decodeString(encodedInput, charset, isMimeSpecific);
             default:
                 return Utils.createBase64Error(DECODING_ERROR, "incompatible input", isMimeSpecific);

test-utils/build.gradle

@@ -31,9 +31,12 @@ dependencies {
 }
 
 spotbugsMain {
+    def classLoader = plugins["com.github.spotbugs"].class.classLoader
+    def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
+    def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
     ignoreFailures = true
-    effort = "max"
-    reportLevel = "low"
+    effort = SpotBugsEffort.MAX
+    reportLevel = SpotBugsConfidence.LOW
     reportsDir = file("$project.buildDir/reports/spotbugs")
     def excludeFile = file("${rootDir}/build-config/spotbugs-exclude.xml")
     if (excludeFile.exists()) {