From f2f19924f7658fe49eb9f8989091e70c533d8e48 Mon Sep 17 00:00:00 2001
From: isuruh15 <isurus@wso2.com>
Date: Thu, 3 Apr 2025 12:30:33 +0530
Subject: [PATCH] Migrate to java 21

---
 components/commons/pom.xml                    |  2 +-
 components/fhir-core/pom.xml                  |  6 ++++-
 .../fhir/core/model/FHIRDataTypeDef.java      |  4 ++--
 components/hl7-core/pom.xml                   |  5 ++++
 .../hl7/core/config/HL7ToolConfig.java        |  2 +-
 pom.xml                                       | 23 ++++++++++++-------
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/components/commons/pom.xml b/components/commons/pom.xml
index 2e3414d..39bffc0 100644
--- a/components/commons/pom.xml
+++ b/components/commons/pom.xml
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
+            <artifactId>velocity-engine-core</artifactId>
         </dependency>
         <dependency>
             <groupId>net.consensys.cava</groupId>
diff --git a/components/fhir-core/pom.xml b/components/fhir-core/pom.xml
index f6dfdbd..0240716 100644
--- a/components/fhir-core/pom.xml
+++ b/components/fhir-core/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
+            <artifactId>velocity-engine-core</artifactId>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
@@ -62,6 +62,10 @@
             <groupId>io.swagger.parser.v3</groupId>
             <artifactId>swagger-parser</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/components/fhir-core/src/main/java/org/wso2/healthcare/codegen/tool/framework/fhir/core/model/FHIRDataTypeDef.java b/components/fhir-core/src/main/java/org/wso2/healthcare/codegen/tool/framework/fhir/core/model/FHIRDataTypeDef.java
index 8043867..b2273a3 100644
--- a/components/fhir-core/src/main/java/org/wso2/healthcare/codegen/tool/framework/fhir/core/model/FHIRDataTypeDef.java
+++ b/components/fhir-core/src/main/java/org/wso2/healthcare/codegen/tool/framework/fhir/core/model/FHIRDataTypeDef.java
@@ -73,7 +73,7 @@ public String getMaxCardinality(String fhirPath) {
      */
     public CardinalityTypes getMaxCardinalityType(String fhirPath) {
         String maxCardinality = this.getMaxCardinality(fhirPath);
-        if (StringUtils.isNotBlank(maxCardinality)) {
+        if (StringUtils.isNotEmpty(maxCardinality)) {
             return CardinalityTypes.fromValue("max", maxCardinality);
         }
         return CardinalityTypes.INVALID;
@@ -103,7 +103,7 @@ public String getMinCardinality(String fhirPath) {
      */
     public CardinalityTypes getMinCardinalityType(String fhirPath) {
         String minCardinality = this.getMinCardinality(fhirPath);
-        if (StringUtils.isNotBlank(minCardinality)) {
+        if (StringUtils.isNotEmpty(minCardinality)) {
             return CardinalityTypes.fromValue("min", minCardinality);
         }
         return CardinalityTypes.INVALID;
diff --git a/components/hl7-core/pom.xml b/components/hl7-core/pom.xml
index fc7af2a..bae84b4 100644
--- a/components/hl7-core/pom.xml
+++ b/components/hl7-core/pom.xml
@@ -41,6 +41,11 @@
             <groupId>com.github.xmlet</groupId>
             <artifactId>xsdParser</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/components/hl7-core/src/main/java/org/wso2/healthcare/codegen/tool/framework/hl7/core/config/HL7ToolConfig.java b/components/hl7-core/src/main/java/org/wso2/healthcare/codegen/tool/framework/hl7/core/config/HL7ToolConfig.java
index 8d031e4..08e699b 100644
--- a/components/hl7-core/src/main/java/org/wso2/healthcare/codegen/tool/framework/hl7/core/config/HL7ToolConfig.java
+++ b/components/hl7-core/src/main/java/org/wso2/healthcare/codegen/tool/framework/hl7/core/config/HL7ToolConfig.java
@@ -49,7 +49,7 @@ public void configure(ConfigType<?> configObj) throws CodeGenException {
                     JsonObject hl7SpecSchema = hl7SpecSchemaConfig.get(i).getAsJsonObject();
                     String hl7SpecSchemaName = hl7SpecSchema.get("name").getAsString();
                     String hl7SpecSchemaVersion = hl7SpecSchema.get("version").getAsString();
-                    if (StringUtils.isNotBlank(hl7SpecSchemaName)) {
+                    if (StringUtils.isNotEmpty(hl7SpecSchemaName)) {
                         HL7SpecSchemaConfig hl7SpecSchemaConfigObj = new HL7SpecSchemaConfig(hl7SpecSchemaName,
                                 hl7SpecSchemaVersion);
                         hl7SpecSchemaConfigObj.setEnable(hl7SpecSchema.get("enable").getAsBoolean());
diff --git a/pom.xml b/pom.xml
index 3348b3c..82893f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,16 +27,17 @@
     <packaging>pom</packaging>
 
     <properties>
-        <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>
-        <velocity.version>1.7</velocity.version>
+        <velocity.version>2.3</velocity.version>
         <cava-toml.version>0.5.0</cava-toml.version>
-        <gson.version>2.8.9</gson.version>
-        <hapi.version>4.2.0</hapi.version>
+        <gson.version>2.10.1</gson.version>
+        <hapi.version>6.8.1</hapi.version>
         <xmlet.version>1.2.4</xmlet.version>
-        <version.swagger.core>2.1.5</version.swagger.core>
-        <version.swagger.parser>2.0.26</version.swagger.parser>
+        <version.swagger.core>2.2.15</version.swagger.core>
+        <version.swagger.parser>2.1.16</version.swagger.parser>
+        <version.commons.lang>2.6</version.commons.lang>
     </properties>
 
     <dependencyManagement>
@@ -48,7 +49,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity</artifactId>
+                <artifactId>velocity-engine-core</artifactId>
                 <version>${velocity.version}</version>
             </dependency>
             <dependency>
@@ -95,6 +96,12 @@
                 <artifactId>swagger-parser</artifactId>
                 <version>${version.swagger.parser}</version>
             </dependency>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>${version.commons.lang}</version>
+                <scope>compile</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>