Version migration to java21 compatibility

.github/workflows/cd.yml

@@ -26,19 +26,19 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: wso2/open-healthcare-codegen-tool-framework
-          ref: v1.2.2
+          ref: v1.2.3
           path: './open-healthcare-codegen-tool-framework'
 
       - name: Setup Java and Maven
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Setup Ballerina
         uses: ballerina-platform/setup-ballerina@v1.1.0
         with:
-          version: 2201.10.2
+          version: 2201.12.3
 
       - name: Create settings.xml
         run: echo '<settings>

.github/workflows/ci.yml

@@ -19,19 +19,19 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: wso2/open-healthcare-codegen-tool-framework
-          ref: v1.2.2
+          ref: v1.2.3
           path: './open-healthcare-codegen-tool-framework'
 
       - name: Setup Maven
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Setup Ballerina
         uses: ballerina-platform/setup-ballerina@v1.1.0
         with:
-          version: 2201.10.2
+          version: 2201.12.3
 
       - name: Create settings.xml
         run: echo '<settings>

ballerina/pom.xml

@@ -33,7 +33,7 @@
 
     <properties>
         <version.health.cli>${project.version}</version.health.cli>
-        <version.ballerina>2201.8.1</version.ballerina>
+        <version.ballerina>2201.12.3</version.ballerina>
     </properties>
 
     <build>
@@ -73,7 +73,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <property name="repo_root" value="../"/>
 
                                 <!--Copy collected dependencies-->
@@ -102,7 +102,7 @@
                                     </fileset>
 
                                 </copy>
-                            </tasks>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>

native/cds-bal-template/pom.xml

@@ -56,8 +56,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
         </plugins>

native/cds-bal-template/src/main/java/org/wso2/healthcare/cds/codegen/ballerina/tool/generator/BallerinaCDSProjectGenerator.java

@@ -132,6 +132,6 @@ private String hookIdToCamelCase(String text) {
         StringBuilder textCopy = new StringBuilder(text);
         textCopy.setCharAt(ZERO, Character.toUpperCase(firstCharOfText));
         text = textCopy.toString();
-        return text.replaceAll(UNDERSCORE, StringUtils.EMPTY);
+        return text.replaceAll(UNDERSCORE, "");
     }
 }

native/fhir-to-bal-lib/pom.xml

@@ -57,8 +57,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
         </plugins>

native/fhir-to-bal-lib/src/main/java/org/wso2/healthcare/fhir/ballerina/packagegen/tool/modelgen/DatatypeContextGenerator.java

@@ -105,7 +105,7 @@ private void populateDatatypeContext() {
                     }
                     if (elementName.endsWith("[x]") && datatypeDefn.getDefinition().getType().equals(
                             ToolConstants.DATA_TYPE_EXTENSION)) {
-                        context.setBaseDataType(StringUtils.capitalize(typeCode + ToolConstants.DATA_TYPE_EXTENSION));
+                        context.setBaseDataType(StringUtils.capitalise(typeCode + ToolConstants.DATA_TYPE_EXTENSION));
                     } else if ("code".equals(typeCode)) {
                         GeneratorUtils.populateCodeValuesForCodeElements(elementDefinition, element);
                     }

native/fhir-to-bal-lib/src/main/java/org/wso2/healthcare/fhir/ballerina/packagegen/tool/utils/GeneratorUtils.java

@@ -404,9 +404,9 @@ public String getUniqueIdentifierFromId(String id) {
         StringBuilder uniqueIdentifier = new StringBuilder();
         String[] idTokens = id.split("-");
         for (String token : idTokens) {
-            uniqueIdentifier.append(StringUtils.capitalize(token));
+            uniqueIdentifier.append(StringUtils.capitalise(token));
         }
-        return StringUtils.capitalize(resolveSpecialCharacters(uniqueIdentifier.toString())).replaceAll("\\d", "");
+        return StringUtils.capitalise(resolveSpecialCharacters(uniqueIdentifier.toString())).replaceAll("\\d", "");
     }
 
     /**
@@ -427,7 +427,7 @@ public String resolveKeywordConflict(String keyword) {
     public String resolveMultiDataTypeFieldNames(String fieldName, String typeName) {
         if (fieldName.endsWith("[x]")) {
             return resolveKeywordConflict(fieldName.substring(0, fieldName.length() - 3) +
-                    StringUtils.capitalize(typeName));
+                    StringUtils.capitalise(typeName));
         }
         return resolveKeywordConflict(fieldName);
     }

native/fhir-to-bal-lib/src/main/resources/templates/fhir_resource.vm

@@ -100,7 +100,7 @@ public type $util.resolveSpecialCharacters($resourceName) record {|
 #end
     }
 #end
-    #foreach($profileEntry in $element.getProfiles().entrySet())#if(!$dataTypes.contains($profileEntry.value.getProfileType()))#if(!$profileEntry.value.getPrefix())${importIdentifier}#else$profileEntry.value.getPrefix():#end#end$util.resolveSpecialCharacters($profileEntry.value.getProfileType())#if($element.isArray())[]#end#if($velocityCount != $element.getProfiles().size())|#end#end $util.resolveKeywordConflict($util.resolveSpecialCharacters($element.getName()))#if(!$element.isRequired())?#end;
+    #foreach($profileEntry in $element.getProfiles().entrySet())#if(!$dataTypes.contains($profileEntry.value.getProfileType()))#if(!$profileEntry.value.getPrefix())${importIdentifier}#else$profileEntry.value.getPrefix():#end#end$util.resolveSpecialCharacters($profileEntry.value.getProfileType())#if($element.isArray())   []#end#if($velocityCount != $element.getProfiles().size())#end#end $util.resolveKeywordConflict($util.resolveSpecialCharacters($element.getName()))#if(!$element.isRequired())?#end;
 #end
     ${importIdentifier}Element ...;
 |};
@@ -176,9 +176,9 @@ public type $util.resolveSpecialCharacters($extendedElement.getTypeName()) recor
     }
 #end
 #if($childElement.hasFixedValue())
-    #if(!$dataTypes.contains($childElement.getDataType()))${importIdentifier}#end$util.resolveSpecialCharacters($childElement.getDataType())#if($childElement.isArray())[]#end $util.resolveSpecialCharacters($util.resolveKeywordConflict($childElement.getName()))#if(!$childElement.isRequired())?#end = #if($childElement.isArray())[#end#foreach($value in $childElement.getFixedValue())$util.getTypedValue($value, $childElement.getDataType())#if($foreach.count != $childElement.getFixedValue().size()),#end#end#if($childElement.isArray())]#end;
+    #if(!$dataTypes.contains($childElement.getDataType()))${importIdentifier}#end$util.resolveSpecialCharacters($childElement.getDataType())#if($childElement.isArray())   []#end $util.resolveSpecialCharacters($util.resolveKeywordConflict($childElement.getName()))#if(!$childElement.isRequired())?#end = #if($childElement.isArray())   [#end#foreach($value in $childElement.getFixedValue())$util.getTypedValue($value, $childElement.getDataType())#if($foreach.count != $childElement.getFixedValue().size()),#end#end#if($childElement.isArray())]#end;
 #else
-    #if(!$dataTypes.contains($childElement.getDataType()))${importIdentifier}#end$util.resolveSpecialCharacters($childElement.getDataType())#if($childElement.isArray())[]#end $util.resolveSpecialCharacters($util.resolveKeywordConflict($childElement.getName()))#if(!$childElement.isRequired())?#end;
+    #if(!$dataTypes.contains($childElement.getDataType()))${importIdentifier}#end$util.resolveSpecialCharacters($childElement.getDataType())#if($childElement.isArray())   []#end $util.resolveSpecialCharacters($util.resolveKeywordConflict($childElement.getName()))#if(!$childElement.isRequired())?#end;
 #end
 #end
 |};

native/fhir-to-bal-template/pom.xml

@@ -51,8 +51,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
         </plugins>

native/health-cli/pom.xml

@@ -87,8 +87,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -104,6 +104,7 @@
                         </goals>
                         <configuration>
                             <outputDirectory>target/tool-lib</outputDirectory>
+                            <excludeArtifactIds>slf4j-api</excludeArtifactIds>
                         </configuration>
                     </execution>
                 </executions>

native/health-cli/src/main/java/io/ballerina/health/cmd/core/config/HealthCmdConfig.java

@@ -33,7 +33,7 @@ public class HealthCmdConfig {
 
     public static JsonObject getParsedConfigFromPath(Path toolConfigPath) throws BallerinaHealthException {
         Gson gson = new Gson();
-        if (toolConfigPath != null && StringUtils.isNotBlank(toolConfigPath.toString())) {
+        if (toolConfigPath != null && StringUtils.isNotEmpty(toolConfigPath.toString())) {
             try {
                 JsonObject toolConfigObj = gson.fromJson(new FileReader(toolConfigPath.toFile()), JsonObject.class);
                 if (toolConfigObj != null) {

native/health-cli/src/main/resources/cds-tool-config.json

@@ -9,7 +9,7 @@
             "org": "ballerinax",
             "namePrefix": "health.fhir.templates.crd",
             "version": "1.0.0",
-            "distribution": "2201.8.6",
+            "distribution": "2201.12.3",
             "authors": [
               "Ballerina"
             ],

native/health-cli/src/main/resources/tool-config.json

@@ -9,7 +9,7 @@
             "org": "healthcare",
             "name": "healthcare.fhir",
             "version": "1.0.0",
-            "ballerinaDistribution": "2201.10.2",
+            "ballerinaDistribution": "2201.12.3",
             "authors": [
               "Ballerina"
             ],
@@ -30,7 +30,7 @@
             "org": "healthcare",
             "namePrefix": "health.fhir.r4.international401",
             "version": "1.0.0",
-            "distribution": "2201.10.2",
+            "distribution": "2201.12.3",
             "authors": [
               "Ballerina"
             ],

pom.xml

@@ -36,22 +36,22 @@
     </modules>
 
     <properties>
-        <hapi.version>4.2.0</hapi.version>
-        <velocity.version>1.7</velocity.version>
+        <hapi.version>6.8.1</hapi.version>
+        <velocity.version>2.3</velocity.version>
         <picocli.version>4.0.1</picocli.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.healthcare.tool.framework>1.2.2</version.healthcare.tool.framework>
-        <version.ballerina.cli>2201.8.1</version.ballerina.cli>
-        <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
+        <version.healthcare.tool.framework>1.2.3</version.healthcare.tool.framework>
+        <version.ballerina.cli>2201.12.3</version.ballerina.cli>
+        <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-        <maven-exec-plugin.version>1.6.0</maven-exec-plugin.version>
-        <version.swagger.core>2.1.5</version.swagger.core>
-        <version.swagger.parser>2.0.26</version.swagger.parser>
+        <maven-exec-plugin.version>3.1.0</maven-exec-plugin.version>
+        <version.swagger.core>2.2.15</version.swagger.core>
+        <version.swagger.parser>2.1.16</version.swagger.parser>
         <version.jackson.annotations>2.12.1</version.jackson.annotations>
         <version.gson>2.11.0</version.gson>
         <version.cava-toml>0.5.0</version.cava-toml>
@@ -99,7 +99,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
+            <artifactId>velocity-engine-core</artifactId>
             <version>${velocity.version}</version>
         </dependency>
         <dependency>