Merge pull request #116 from warunalakshitha/java21

Migrate to Java 21

.github/workflows/build-timestamped-master.yml

@@ -13,11 +13,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 17.0.7
+          java-version: 21
       - name: Change to Timestamped Version
         run: |
           startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00')

.github/workflows/publish-release.yml

@@ -11,11 +11,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

.github/workflows/pull-request.yml

@@ -9,11 +9,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}
@@ -29,11 +29,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}
@@ -49,11 +49,11 @@ jobs:
       steps:
           - name: Checkout Repository
             uses: actions/checkout@v3
-          - name: Set up JDK 17
+          - name: Set up JDK 21
             uses: actions/setup-java@v3
             with:
                 distribution: 'adopt'
-                java-version: 17.0.7
+                java-version: 21
           - name: Build with Gradle
             env:
                 packageUser: ${{ github.actor }}

.github/workflows/trivy-scan.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 17.0.7
+          java-version: 21
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

README.md

@@ -12,7 +12,7 @@ This module contains internal configurations and initializations for Ballerina o
 
 ### 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

@@ -4,8 +4,8 @@ name = "observe"
 version = "1.3.0"
 distribution = "2201.10.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "../native/build/libs/observe-internal-native-1.3.0.jar"

build-config/resources/Ballerina.toml

@@ -4,8 +4,8 @@ name = "observe"
 version = "@toml.version@"
 distribution = "2201.10.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "../native/build/libs/[email protected]@.jar"

build-config/resources/testobserve/Ballerina.toml

@@ -3,5 +3,5 @@ org = "ballerina"
 name = "testobserve"
 version = "0.0.0"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "../native/build/libs/[email protected]@-all.jar"

build.gradle

@@ -16,10 +16,10 @@
  */
 
 plugins {
-    id "com.github.spotbugs" version "5.0.14"
-    id "com.github.johnrengelman.shadow" version "8.1.1"
-    id "de.undercouch.download" version "5.4.0"
-    id "net.researchgate.release" version "2.8.0"
+    id "com.github.spotbugs" version "${githubSpotbugsVersion}"
+    id "com.github.johnrengelman.shadow" version "${githubJohnrengelmanShadowVersion}"
+    id "de.undercouch.download" version "${underCouchDownloadVersion}"
+    id "net.researchgate.release" version "${researchgateReleaseVersion}"
 }
 
 allprojects {

gradle.properties

@@ -16,15 +16,19 @@ org.gradle.caching=true
 group=io.ballerina
 version=1.3.1-SNAPSHOT
 
-ballerinaLangVersion=2201.10.0
+ballerinaLangVersion=2201.10.0-20241007-143200-6b69ca80
+githubSpotbugsVersion=6.0.18
+githubJohnrengelmanShadowVersion=8.1.1
+underCouchDownloadVersion=5.4.0
+researchgateReleaseVersion=2.8.0
 ballerinaTomlParserVersion=1.2.2
 ballerinaGradlePluginVersion=2.0.1
 puppycrawlCheckstyleVersion=10.12.0
 openTelemetryVersion=1.7.0
 nettyCodecVersion=4.1.100.Final
 gsonVersion=2.10.1
 
-observeVersion=1.3.0
+observeVersion=1.3.1-20241007-161000-645452d
 
 # Test Dependency Versions
 testngVersion=7.6.1

native/build.gradle

@@ -48,8 +48,11 @@ tasks.withType(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

testobserve/ballerina/Ballerina.toml

@@ -3,5 +3,5 @@ org = "ballerina"
 name = "testobserve"
 version = "0.0.0"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 path = "../native/build/libs/testobserve-native-1.3.0-SNAPSHOT-all.jar"

testobserve/native/build.gradle

@@ -55,8 +55,11 @@ tasks.withType(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

testobserve/native/spotbugs-exclude.xml

@@ -16,14 +16,28 @@
   ~ under the License.
   -->
 <FindBugsFilter>
+    <Match>
+        <Class name="org.ballerina.testobserve.listenerendpoint.Resource"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
     <Match>
         <Class name="org.ballerina.testobserve.listenerendpoint.Resource"/>
         <Field name="serviceObject"/>
-        <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
+        <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2, CT_CONSTRUCTOR_THROW"/>
+    </Match>
+    <Match>
+        <Class name="org.ballerina.testobserve.listenerendpoint.WebServer"/>
+        <Field name="env"/>
+        <Bug pattern="EI_EXPOSE_REP2"/>
     </Match>
     <Match>
         <Class name="org.ballerina.testobserve.listenerendpoint.WebServer$WebServerInboundHandler"/>
         <Field name="resourceMap"/>
         <Bug pattern="EI_EXPOSE_REP2"/>
     </Match>
+    <Match>
+        <Class name="org.ballerina.testobserve.listenerendpoint.WebServer$WebServerInboundHandler"/>
+        <Field name="env"/>
+        <Bug pattern="EI_EXPOSE_REP2"/>
+    </Match>
 </FindBugsFilter>

testobserve/native/src/main/java/org/ballerina/testobserve/NativeUtils.java

@@ -19,11 +19,11 @@
 package org.ballerina.testobserve;
 
 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 java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Native functions for the utilities in testobserve module.
@@ -34,7 +34,12 @@ public class NativeUtils {
     private static final ScheduledExecutorService executor = Executors.newScheduledThreadPool(CORE_THREAD_POOL_SIZE);
 
     public static void sleep(Environment env, long delayMillis) {
-        Future balFuture = env.markAsync();
-        executor.schedule(() -> balFuture.complete(null), delayMillis, TimeUnit.MILLISECONDS);
+        env.yieldAndRun(() -> {
+            try {
+                Thread.sleep(delayMillis);
+            } catch (InterruptedException e) {
+                throw ErrorCreator.createError(StringUtils.fromString("error occurred during sleep"), e);
+            }
+        });
     }
 }

testobserve/native/src/main/java/org/ballerina/testobserve/listenerendpoint/Endpoint.java

@@ -34,7 +34,7 @@
 public class Endpoint {
 
     public static void initEndpoint(Environment env, BObject listenerEndpoint, int port) {
-        WebServer webServer = new WebServer(port, env.getRuntime());
+        WebServer webServer = new WebServer(port, env);
         listenerEndpoint.addNativeData(WEB_SERVER_NATIVE_DATA_KEY, webServer);
         Utils.logInfo("Initialized Web Server with port " + port);
     }