Merge pull request #57 from HindujaB/java21

Migrate to Java 21

README.md

@@ -229,7 +229,7 @@ This repository only contains the source code for the package.
 
 ### 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/)
     * [OpenJDK](https://adoptium.net/)
 

ballerina/Ballerina.toml

@@ -9,35 +9,35 @@ license = ["Apache-2.0"]
 distribution = "2201.10.0"
 export = ["data.jsondata"]
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.lib"
 artifactId = "jsondata-native"
 version = "0.3.0"
 path = "../native/build/libs/data.jsondata-native-0.3.0-SNAPSHOT.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/json-path-2.9.0.jar"
 groupId = "com.jayway.jsonpath"
 artifactId = "json-path"
 version = "2.9.0"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/json-smart-2.4.11.jar"
 groupId = "net.minidev.json"
 artifactId = "json-smart"
 version = "2.4.11"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/accessors-smart-2.4.7.jar"
 groupId = "net.minidev.json"
 artifactId = "accessors-smart"
 version = "2.4.7"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "constraint-native"
-version = "1.5.0"
-path = "./lib/constraint-native-1.5.0.jar"
+version = "1.5.1"
+path = "./lib/constraint-native-1.5.1-20240930-123400-5ecd396.jar"

build-config/resources/Ballerina.toml

@@ -9,34 +9,34 @@ license = ["Apache-2.0"]
 distribution = "2201.10.0"
 export = ["data.jsondata"]
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.lib"
 artifactId = "jsondata-native"
 version = "@toml.version@"
 path = "../native/build/libs/[email protected]@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/[email protected]@.jar"
 groupId = "com.jayway.jsonpath"
 artifactId = "json-path"
 version = "@jsonpath.version@"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/[email protected]@.jar"
 groupId = "net.minidev.json"
 artifactId = "json-smart"
 version = "@jsonsmart.version@"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "./lib/[email protected]@.jar"
 groupId = "net.minidev.json"
 artifactId = "accessors-smart"
 version = "@accessors.version@"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "constraint-native"
 version = "@constraint.version@"

compiler-plugin-test/build.gradle

@@ -49,8 +49,11 @@ checkstyle {
 checkstyleTest.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsTest {
-    effort "max"
-    reportLevel "low"
+    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")
+    effort = SpotBugsEffort.MAX
+    reportLevel = SpotBugsConfidence.LOW
     reportsDir = file("$project.buildDir/reports/spotbugs")
     reports {
         html.enabled true

compiler-plugin/build.gradle

@@ -47,8 +47,11 @@ checkstyle {
 checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsMain {
-    effort "max"
-    reportLevel "low"
+    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")
+    effort = SpotBugsEffort.MAX
+    reportLevel = SpotBugsConfidence.LOW
     reportsDir = file("$project.buildDir/reports/spotbugs")
     reports {
         html.enabled true

gradle.properties

@@ -1,13 +1,13 @@
 org.gradle.caching=true
 group=io.ballerina.lib
 version=0.3.0-SNAPSHOT
-ballerinaLangVersion=2201.10.0
+ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87
 
 checkstyleToolVersion=10.12.0
 puppycrawlCheckstyleVersion=10.12.0
 testngVersion=7.6.1
 slf4jVersion=2.0.7
-spotbugsVersion=5.0.14
+spotbugsVersion=6.0.18
 shadowJarPluginVersion=8.1.1
 downloadPluginVersion=4.0.4
 releasePluginVersion=2.8.0
@@ -16,8 +16,8 @@ javaJsonPathVersion=2.9.0
 javaJsonSmartVersion=2.4.11
 javaAccessorsSmartVersion=2.4.7
 
-stdlibFileVersion=1.10.0
-stdlibIoVersion=1.6.1
-stdlibOsVersion=1.8.0
-stdlibTimeVersion=2.4.0
-stdlibConstraintVersion=1.5.0
+stdlibFileVersion=1.10.1-20241113-151700-e1a2e38
+stdlibIoVersion=1.6.2-20241112-233100-995cf5f
+stdlibOsVersion=1.8.1-20241113-122000-cca973b
+stdlibTimeVersion=2.6.0-20241113-073800-201b904
+stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5

native/build.gradle

@@ -53,8 +53,11 @@ tasks.withType(Checkstyle) {
 
 spotbugsMain {
     enabled=false
-    effort "max"
-    reportLevel "low"
+    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")
+    effort = SpotBugsEffort.MAX
+    reportLevel = SpotBugsConfidence.LOW
     reportsDir = file("$project.buildDir/reports/spotbugs")
     reports {
         html.enabled true

native/src/main/java/io/ballerina/lib/data/jsondata/FromString.java

@@ -20,14 +20,14 @@
 
 import io.ballerina.lib.data.jsondata.utils.DiagnosticErrorCode;
 import io.ballerina.lib.data.jsondata.utils.DiagnosticLog;
-import io.ballerina.runtime.api.PredefinedTypes;
-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.FiniteType;
 import io.ballerina.runtime.api.types.IntersectionType;
+import io.ballerina.runtime.api.types.PredefinedTypes;
 import io.ballerina.runtime.api.types.ReferenceType;
 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/lib/data/jsondata/io/BallerinaByteBlockInputStream.java

@@ -18,12 +18,11 @@
 
 package io.ballerina.lib.data.jsondata.io;
 
+import io.ballerina.lib.data.jsondata.utils.DiagnosticErrorCode;
 import io.ballerina.lib.data.jsondata.utils.DiagnosticLog;
 import io.ballerina.runtime.api.Environment;
-import io.ballerina.runtime.api.async.Callback;
-import io.ballerina.runtime.api.async.StrandMetadata;
+import io.ballerina.runtime.api.concurrent.StrandMetadata;
 import io.ballerina.runtime.api.types.MethodType;
-import io.ballerina.runtime.api.types.Type;
 import io.ballerina.runtime.api.values.BArray;
 import io.ballerina.runtime.api.values.BError;
 import io.ballerina.runtime.api.values.BMap;
@@ -33,10 +32,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
 
 /**
  * Java Input Stream based on Ballerina byte block stream. <code>stream<byte[], error?></code>
@@ -48,33 +43,24 @@ public class BallerinaByteBlockInputStream extends InputStream {
     private final BObject iterator;
     private final Environment env;
     private final String nextMethodName;
-    private final Type returnType;
-    private final String strandName;
-    private final StrandMetadata metadata;
-    private final Map<String, Object> properties;
-    private final AtomicBoolean done = new AtomicBoolean(false);
+    private boolean done = false;
     private final MethodType closeMethod;
-    private final Consumer<Object> futureResultConsumer;
 
     private byte[] currentChunk = new byte[0];
     private int nextChunkIndex = 0;
+    private BError error;
 
     public BallerinaByteBlockInputStream(Environment env, BObject iterator, MethodType nextMethod,
-                                         MethodType closeMethod, Consumer<Object> futureResultConsumer) {
+                                         MethodType closeMethod) {
         this.env = env;
         this.iterator = iterator;
         this.nextMethodName = nextMethod.getName();
-        this.returnType = nextMethod.getReturnType();
         this.closeMethod = closeMethod;
-        this.strandName = env.getStrandName().orElse("");
-        this.metadata = env.getStrandMetadata();
-        this.properties = Map.of();
-        this.futureResultConsumer = futureResultConsumer;
     }
 
     @Override
     public int read() {
-        if (done.get()) {
+        if (done) {
             return -1;
         }
         if (hasBytesInCurrentChunk()) {
@@ -87,8 +73,7 @@ public int read() {
                 return read();
             }
         } catch (InterruptedException e) {
-            BError error = DiagnosticLog.createJsonError("Cannot read the stream, interrupted error");
-            futureResultConsumer.accept(error);
+            this.error = DiagnosticLog.error(DiagnosticErrorCode.CAN_NOT_READ_STREAM);
             return -1;
         }
         return -1;
@@ -97,25 +82,8 @@ public int read() {
     @Override
     public void close() throws IOException {
         super.close();
-        Semaphore semaphore = new Semaphore(0);
         if (closeMethod != null) {
-            env.getRuntime().invokeMethodAsyncSequentially(iterator, closeMethod.getName(), strandName, metadata,
-                                                           new Callback() {
-                                                               @Override
-                                                               public void notifyFailure(BError bError) {
-                                                                   semaphore.release();
-                                                               }
-
-                                                               @Override
-                                                               public void notifySuccess(Object result) {
-                                                                   semaphore.release();
-                                                               }
-                                                           }, properties, returnType);
-        }
-        try {
-            semaphore.acquire();
-        } catch (InterruptedException e) {
-            throw new IOException("Error while closing the stream", e);
+            env.getRuntime().callMethod(iterator, closeMethod.getName(), new StrandMetadata(false, null));
         }
     }
 
@@ -124,44 +92,28 @@ private boolean hasBytesInCurrentChunk() {
     }
 
     private boolean readNextChunk() throws InterruptedException {
-        Semaphore semaphore = new Semaphore(0);
-        Callback callback = new Callback() {
-
-            @Override
-            public void notifyFailure(BError bError) {
-                // Panic with an error
-                done.set(true);
-                futureResultConsumer.accept(bError);
-                currentChunk = new byte[0];
-                semaphore.release();
-                // TODO : Should we panic here?
+        try {
+            Object result = env.getRuntime().callMethod(iterator, nextMethodName, new StrandMetadata(false, null));
+            if (result == null) {
+                done = true;
+                return true;
             }
-
-            @Override
-            public void notifySuccess(Object result) {
-                if (result == null) {
-                    done.set(true);
-                    currentChunk = new byte[0];
-                    semaphore.release();
-                    return;
-                }
-                if (result instanceof BMap<?, ?>) {
-                    BMap<BString, Object> valueRecord = (BMap<BString, Object>) result;
-                    final BString value = Arrays.stream(valueRecord.getKeys()).findFirst().get();
-                    final BArray arrayValue = valueRecord.getArrayValue(value);
-                    currentChunk = arrayValue.getByteArray();
-                    semaphore.release();
-                } else {
-                    // Case where Completes with an error
-                    done.set(true);
-                    semaphore.release();
-                }
+            if (result instanceof BMap<?, ?>) {
+                BMap<BString, Object> valueRecord = (BMap<BString, Object>) result;
+                final BString value = Arrays.stream(valueRecord.getKeys()).findFirst().get();
+                final BArray arrayValue = valueRecord.getArrayValue(value);
+                currentChunk = arrayValue.getByteArray();
+            } else {
+                done = true;
             }
+        } catch (BError bError) {
+            done = true;
+            currentChunk = new byte[0];
+        }
+        return !done;
+    }
 
-        };
-        env.getRuntime().invokeMethodAsyncSequentially(iterator, nextMethodName, strandName, metadata, callback,
-                                                       properties, returnType);
-        semaphore.acquire();
-        return !done.get();
+    public BError getError() {
+        return this.error;
     }
 }