Merge pull request #1780 from ravinperera00/java21

Migrate to Java 21 and new Runtime APIs

.github/workflows/build-ballerina-to-openapi.yml

@@ -8,11 +8,11 @@ jobs:
     if: github.repository_owner == 'ballerina-platform'
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: 17.0.7
+          distribution: 'temurin'
+          java-version: 21.0.3
       - name: Change to Timestamped Version
         run: |
           startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00')

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

@@ -11,11 +11,11 @@ jobs:
     if: github.repository_owner == 'ballerina-platform'
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: 17.0.7
+          distribution: 'temurin'
+          java-version: 21.0.3
       - name: Change to Timestamped Version
         run: |
           startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00')

.github/workflows/central-publish.yml

@@ -17,11 +17,11 @@ jobs:
     if: github.repository_owner == 'ballerina-platform'
     steps:
       -   uses: actions/checkout@v2
-      -   name: Set up JDK 17
+      -   name: Set up JDK 21
           uses: actions/setup-java@v2
           with:
-            distribution: 'adopt'
-            java-version: 17.0.7
+            distribution: 'temurin'
+            java-version: 21.0.3
       -   name: Grant execute permission for gradlew
           run: chmod +x gradlew
 

.github/workflows/publish-ballerina-to-openapi.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: 17.0.7
+          distribution: 'temurin'
+          java-version: 21.0.3
       - name: Set version env variable
         run: echo "VERSION=$((grep -w "ballerinaToOpenAPIVersion" | cut -d= -f2) < gradle.properties | rev | cut --complement -d- -f1 | rev)" >> $GITHUB_ENV
       - name: Pre release dependency version update

.github/workflows/publish-release.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: 17.0.7
+          distribution: 'temurin'
+          java-version: 21.0.3
       - name: Check for Ballerina to OpenAPI release
         run: |
           BAL_TO_OPENAPI_VERSION=$(grep -w "ballerinaToOpenAPIVersion" gradle.properties | cut -d= -f2)

.github/workflows/pull-request.yml

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

README.md

@@ -22,7 +22,7 @@ For more information on the supported operations, go to [Using the OpenAPI Tools
 
 ### Setting Up the Prerequisites
 
-1. OpenJDK 11 ([Adopt OpenJDK](https://adoptopenjdk.net/) or any other OpenJDK distribution)
+1. OpenJDK 21 ([Adopt OpenJDK](https://adoptopenjdk.net/) or any other OpenJDK distribution)
 
     >**Info:** You can also use [Oracle JDK](https://www.oracle.com/java/technologies/javase-downloads.html). Set the JAVA_HOME environment variable to the pathname of the directory into which you installed JDK.
    

ballerina-to-openapi/src/main/java/io/ballerina/openapi/service/mapper/parameter/AbstractParameterMapper.java

@@ -18,6 +18,7 @@
 package io.ballerina.openapi.service.mapper.parameter;
 
 import io.ballerina.compiler.api.SemanticModel;
+import io.ballerina.compiler.api.symbols.Symbol;
 import io.ballerina.compiler.api.symbols.TypeSymbol;
 import io.ballerina.compiler.syntax.tree.DefaultableParameterNode;
 import io.ballerina.compiler.syntax.tree.Node;
@@ -27,6 +28,9 @@
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+
+import static io.ballerina.openapi.service.mapper.utils.MapperCommonUtils.getConstantValues;
 
 /**
  * This {@link AbstractParameterMapper} class represents the abstract parameter mapper.
@@ -55,8 +59,13 @@ public void setParameter() throws ParameterMapperException {
         parameterList.forEach(operationInventory::setParameter);
     }
 
-    static Object getDefaultValue(DefaultableParameterNode parameterNode) {
+    static Object getDefaultValue(DefaultableParameterNode parameterNode, SemanticModel semanticModel) {
         Node defaultValueExpression = parameterNode.expression();
+        Optional<Symbol> symbol = semanticModel.symbol(defaultValueExpression);
+        Optional<Object> constantValues = getConstantValues(symbol);
+        if (constantValues.isPresent()) {
+            return constantValues.get();
+        }
         if (MapperCommonUtils.isNotSimpleValueLiteralKind(defaultValueExpression.kind())) {
             return null;
         }

ballerina-to-openapi/src/main/java/io/ballerina/openapi/service/mapper/parameter/HeaderParameterMapper.java

@@ -80,7 +80,8 @@ public HeaderParameterMapper(ParameterNode parameterNode, Map<String, String> ap
             this.description = apiDocs.get(headerParameter.getName().get());
             this.treatNilableAsOptional = treatNilableAsOptional;
             if (parameterNode instanceof DefaultableParameterNode defaultableHeaderParam) {
-                this.defaultValue = AbstractParameterMapper.getDefaultValue(defaultableHeaderParam);
+                this.defaultValue = AbstractParameterMapper.getDefaultValue(defaultableHeaderParam,
+                        additionalData.semanticModel());
             }
             this.typeMapper = typeMapper;
         }

ballerina-to-openapi/src/main/java/io/ballerina/openapi/service/mapper/parameter/QueryParameterMapper.java

@@ -71,7 +71,8 @@ public QueryParameterMapper(ParameterNode parameterNode, Map<String, String> api
             this.semanticModel = additionalData.semanticModel();
             this.typeMapper = typeMapper;
             if (parameterNode instanceof DefaultableParameterNode defaultableQueryParam) {
-                this.defaultValue = AbstractParameterMapper.getDefaultValue(defaultableQueryParam);
+                this.defaultValue = AbstractParameterMapper.getDefaultValue(defaultableQueryParam,
+                        additionalData.semanticModel());
             }
         }
     }