From 646159c51d1de8e137adaf43765cc8beced66160 Mon Sep 17 00:00:00 2001 From: Christian Ohr Date: Wed, 6 Mar 2024 15:48:24 +0100 Subject: [PATCH] #414: switch build distro, fix compile error --- .../{build-java11.yml => build-java21.yml} | 10 ++++---- .github/workflows/build.yml | 4 ++-- .../definitions/pam/v25/segment/ZBE.java | 23 +++++++++++-------- .../test/hl7v2/def/v25/segment/ZBE.java | 13 +++++++---- .../hl7v2/def/v24/segment/ZBE.groovy | 13 +++++++---- .../hl7v2/def/v25/segment/ZBE.groovy | 13 +++++++---- pom.xml | 1 + 7 files changed, 49 insertions(+), 28 deletions(-) rename .github/workflows/{build-java11.yml => build-java21.yml} (78%) diff --git a/.github/workflows/build-java11.yml b/.github/workflows/build-java21.yml similarity index 78% rename from .github/workflows/build-java11.yml rename to .github/workflows/build-java21.yml index ed5c3ef14d..ac4516ea6c 100644 --- a/.github/workflows/build-java11.yml +++ b/.github/workflows/build-java21.yml @@ -1,4 +1,4 @@ -name: Build IPF with Maven Java 11 +name: Build IPF with Maven Java 21 on: [push, pull_request, workflow_dispatch] @@ -13,15 +13,15 @@ env: jobs: build: runs-on: ubuntu-latest - name: Java 11 build + name: Java 21 build timeout-minutes: 30 steps: - uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: '11' + distribution: 'temurin' + java-version: '21' cache: 'maven' - name: Build with Maven run: mvn -B clean test --file pom.xml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d0dd9cbc8..0676468a02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,9 +18,9 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: 'temurin' java-version: '17' cache: 'maven' - name: Build with Maven diff --git a/commons/ihe/hl7v2/src/main/java/org/openehealth/ipf/commons/ihe/hl7v2/definitions/pam/v25/segment/ZBE.java b/commons/ihe/hl7v2/src/main/java/org/openehealth/ipf/commons/ihe/hl7v2/definitions/pam/v25/segment/ZBE.java index 6d0f2808a3..839826be05 100644 --- a/commons/ihe/hl7v2/src/main/java/org/openehealth/ipf/commons/ihe/hl7v2/definitions/pam/v25/segment/ZBE.java +++ b/commons/ihe/hl7v2/src/main/java/org/openehealth/ipf/commons/ihe/hl7v2/definitions/pam/v25/segment/ZBE.java @@ -15,6 +15,7 @@ */ package org.openehealth.ipf.commons.ihe.hl7v2.definitions.pam.v25.segment; +import ca.uhn.hl7v2.HL7Exception; import ca.uhn.hl7v2.model.AbstractSegment; import ca.uhn.hl7v2.model.Group; import ca.uhn.hl7v2.model.v25.datatype.*; @@ -42,15 +43,19 @@ public class ZBE extends AbstractSegment { public ZBE(Group parent, ModelClassFactory factory) { super(parent, factory); var message = getMessage(); - add(EI.class, true, 0, 427, new Object[] { message }, "Movement ID"); - add(TS.class, true, 1, 26, new Object[] { message }, "Start Movement Date/Time"); - add(TS.class, false, 1, 26, new Object[] { message }, "End Movement Date/Time"); - add(ST.class, true, 1, 6, new Object[] { message }, "Movement Action"); - add(ID.class, true, 1, 1, new Object[] { message }, "Historical Movement Indicator"); - add(ID.class, false, 1, 3, new Object[] { message }, "Original trigger event code"); - add(XON.class, false, 1, 567, new Object[] { message }, "Responsible Ward"); - add(XON.class, false, 1, 567, new Object[] { message }, "Responsible Nursing Ward"); - add(CWE.class, false, 1, 3, new Object[] { message }, "Movement Scope"); + try { + add(EI.class, true, 0, 427, new Object[]{message}, "Movement ID"); + add(TS.class, true, 1, 26, new Object[]{message}, "Start Movement Date/Time"); + add(TS.class, false, 1, 26, new Object[]{message}, "End Movement Date/Time"); + add(ST.class, true, 1, 6, new Object[]{message}, "Movement Action"); + add(ID.class, true, 1, 1, new Object[]{message}, "Historical Movement Indicator"); + add(ID.class, false, 1, 3, new Object[]{message}, "Original trigger event code"); + add(XON.class, false, 1, 567, new Object[]{message}, "Responsible Ward"); + add(XON.class, false, 1, 567, new Object[]{message}, "Responsible Nursing Ward"); + add(CWE.class, false, 1, 3, new Object[]{message}, "Movement Scope"); + } catch (HL7Exception e) { + throw new RuntimeException(e); + } } /** diff --git a/modules/hl7/src/test/java/org/openehealth/ipf/modules/hl7/parser/test/hl7v2/def/v25/segment/ZBE.java b/modules/hl7/src/test/java/org/openehealth/ipf/modules/hl7/parser/test/hl7v2/def/v25/segment/ZBE.java index d3adc4e41e..b32ed1c7f4 100644 --- a/modules/hl7/src/test/java/org/openehealth/ipf/modules/hl7/parser/test/hl7v2/def/v25/segment/ZBE.java +++ b/modules/hl7/src/test/java/org/openehealth/ipf/modules/hl7/parser/test/hl7v2/def/v25/segment/ZBE.java @@ -15,6 +15,7 @@ */ package org.openehealth.ipf.modules.hl7.parser.test.hl7v2.def.v25.segment; +import ca.uhn.hl7v2.HL7Exception; import ca.uhn.hl7v2.model.AbstractSegment; import ca.uhn.hl7v2.model.Group; import ca.uhn.hl7v2.model.v25.datatype.EI; @@ -44,10 +45,14 @@ public class ZBE extends AbstractSegment { public ZBE(Group parent, ModelClassFactory factory) { super(parent, factory); var message = getMessage(); - add(EI.class, true, 0, 999, new Object[]{message}, null); - add(TS.class, true, 1, 26, new Object[]{message}, null); - add(TS.class, false, 1, 26, new Object[]{message}, null); - add(ST.class, true, 1, 10, new Object[]{message}, null); + try { + add(EI.class, true, 0, 999, new Object[]{message}, null); + add(TS.class, true, 1, 26, new Object[]{message}, null); + add(TS.class, false, 1, 26, new Object[]{message}, null); + add(ST.class, true, 1, 10, new Object[]{message}, null); + } catch (HL7Exception e) { + throw new RuntimeException(e); + } } /** diff --git a/modules/hl7/src/test/resources/org/openehealth/ipf/modules/hl7/parser/groovytest/hl7v2/def/v24/segment/ZBE.groovy b/modules/hl7/src/test/resources/org/openehealth/ipf/modules/hl7/parser/groovytest/hl7v2/def/v24/segment/ZBE.groovy index 081ca76bb2..142ae3ac50 100644 --- a/modules/hl7/src/test/resources/org/openehealth/ipf/modules/hl7/parser/groovytest/hl7v2/def/v24/segment/ZBE.groovy +++ b/modules/hl7/src/test/resources/org/openehealth/ipf/modules/hl7/parser/groovytest/hl7v2/def/v24/segment/ZBE.groovy @@ -15,6 +15,7 @@ */ package org.openehealth.ipf.modules.hl7.parser.groovytest.hl7v2.def.v24.segment +import ca.uhn.hl7v2.HL7Exception import ca.uhn.hl7v2.model.AbstractSegment import ca.uhn.hl7v2.model.Group import ca.uhn.hl7v2.model.Message @@ -51,10 +52,14 @@ class ZBE extends AbstractSegment { ZBE(Group parent, ModelClassFactory factory) { super(parent, factory) Message message = getMessage() - add(EI, true, 0, 999, [message] as Object[], null) - add(TS, true, 1, 26, [message] as Object[], null) - add(TS, false, 1, 26, [message] as Object[], null) - add(ST, true, 1, 10, [message] as Object[], null) + try { + add(EI, true, 0, 999, [message] as Object[], null) + add(TS, true, 1, 26, [message] as Object[], null) + add(TS, false, 1, 26, [message] as Object[], null) + add(ST, true, 1, 10, [message] as Object[], null) + } catch (HL7Exception e) { + throw new RuntimeException(e); + } } /** diff --git a/modules/hl7/src/test/resources/org/openehealth/ipf/modules/hl7/parser/groovytest/hl7v2/def/v25/segment/ZBE.groovy b/modules/hl7/src/test/resources/org/openehealth/ipf/modules/hl7/parser/groovytest/hl7v2/def/v25/segment/ZBE.groovy index 98b76dd695..d0c5bcf3fb 100644 --- a/modules/hl7/src/test/resources/org/openehealth/ipf/modules/hl7/parser/groovytest/hl7v2/def/v25/segment/ZBE.groovy +++ b/modules/hl7/src/test/resources/org/openehealth/ipf/modules/hl7/parser/groovytest/hl7v2/def/v25/segment/ZBE.groovy @@ -15,6 +15,7 @@ */ package org.openehealth.ipf.modules.hl7.parser.groovytest.hl7v2.def.v25.segment +import ca.uhn.hl7v2.HL7Exception import ca.uhn.hl7v2.model.AbstractSegment import ca.uhn.hl7v2.model.Group import ca.uhn.hl7v2.model.Message @@ -51,10 +52,14 @@ class ZBE extends AbstractSegment { ZBE(Group parent, ModelClassFactory factory) { super(parent, factory) Message message = getMessage() - add(EI, true, 0, 999, [message] as Object[], null) - add(TS, true, 1, 26, [message] as Object[], null) - add(TS, false, 1, 26, [message] as Object[], null) - add(ST, true, 1, 10, [message] as Object[], null) + try { + add(EI, true, 0, 999, [message] as Object[], null) + add(TS, true, 1, 26, [message] as Object[], null) + add(TS, false, 1, 26, [message] as Object[], null) + add(ST, true, 1, 10, [message] as Object[], null) + } catch (HL7Exception e) { + throw new RuntimeException(e); + } } /** diff --git a/pom.xml b/pom.xml index b838fe76c7..69f41d0d01 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,7 @@ org.projectlombok lombok-maven-plugin + ${lombok-plugin-version} generate-sources