Skip to content

Migrate to java 21 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isuruh15 merged 1 commit into from
May 26, 2025
Merged

Migrate to java 21 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 5 additions & 1 deletion components/fhir-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
4 changes: 2 additions & 2 deletions ...main/java/org/wso2/healthcare/codegen/tool/framework/fhir/core/model/FHIRDataTypeDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions components/hl7-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ...c/main/java/org/wso2/healthcare/codegen/tool/framework/hl7/core/config/HL7ToolConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
23 changes: 15 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>

Expand Down