Merge branch 'feature/414-jee10'

.github/workflows/build-java11.yml → .github/workflows/build-java21.yml

@@ -1,4 +1,4 @@
-name: Build IPF with Maven Java 11
+name: Build IPF with 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

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build IPF with Maven with Java 17
+name: Build IPF with Java 17
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -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

boot/ipf-atna-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+org.openehealth.ipf.boot.atna.IpfAtnaAutoConfiguration
+org.openehealth.ipf.boot.atna.IpfAtnaSpringSecurityAutoConfiguration

boot/ipf-fhir-r4-spring-boot-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirAutoConfiguration.java

@@ -44,7 +44,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.CorsFilter;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;

boot/ipf-fhir-r4-spring-boot-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirConfigurationProperties.java

@@ -17,16 +17,15 @@
 package org.openehealth.ipf.boot.fhir;
 
 import ca.uhn.fhir.context.FhirVersionEnum;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.core.io.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.cors.CorsConfiguration;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 import java.util.*;
 
 /**
@@ -155,6 +154,9 @@ public static class Servlet {
         private boolean strict = false;
     }
 
+    public static class CorsConfiguration extends org.springframework.web.cors.CorsConfiguration {
+    }
+
     private static CorsConfiguration defaultCorsConfiguration() {
         var cors = new CorsConfiguration();
         cors.addAllowedOrigin("*");

boot/ipf-fhir-r4-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+org.openehealth.ipf.boot.fhir.IpfFhirAutoConfiguration
+org.openehealth.ipf.boot.fhir.IpfFhirPixpdqAutoConfiguration

boot/ipf-fhir-r4-spring-boot-starter/src/test/java/org/openehealth/ipf/boot/fhir/FhirApplicationTest.java

@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.openehealth.ipf.boot.IpfAutoConfiguration;
 import org.openehealth.ipf.commons.core.config.ContextFacade;
 import org.openehealth.ipf.commons.map.MappingService;
 import org.openehealth.ipf.commons.spring.map.config.CustomMappings;

boot/ipf-fhir-stu3-spring-boot-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirAutoConfiguration.java

@@ -43,7 +43,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.CorsFilter;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;

boot/ipf-fhir-stu3-spring-boot-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirConfigurationProperties.java

@@ -25,8 +25,8 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.cors.CorsConfiguration;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import java.util.*;
 
 /**

boot/ipf-fhir-stu3-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+org.openehealth.ipf.boot.fhir.IpfFhirAutoConfiguration
+org.openehealth.ipf.boot.fhir.IpfFhirPixpdqAutoConfiguration

boot/ipf-hl7-spring-boot-starter/pom.xml

@@ -33,6 +33,10 @@
             <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-hl7-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi</groupId>
+            <artifactId>hapi-base</artifactId>
+        </dependency>
 
         <!-- IPF Support -->
         <dependency>

boot/ipf-hl7-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.openehealth.ipf.boot.hl7v2.IpfHl7v2AutoConfiguration

boot/ipf-hl7v3-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.openehealth.ipf.boot.hl7v3.IpfHl7v3AutoConfiguration

boot/ipf-hpd-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.openehealth.ipf.boot.hpd.IpfHpdAutoConfiguration

boot/ipf-spring-boot-starter/src/main/java/org/openehealth/ipf/boot/IpfAutoConfiguration.java

@@ -50,7 +50,7 @@ Registry springRegistry() {
 
     @Bean
     @ConditionalOnMissingBean(SpringConfigurationPostProcessor.class)
-    public SpringConfigurationPostProcessor postProcessor(CustomMappingsConfigurer customMappingsConfigurer) {
+    public SpringConfigurationPostProcessor postProcessor(CustomMappingsConfigurer<SpringRegistry> customMappingsConfigurer) {
         var processor = new SpringConfigurationPostProcessor();
         var list = new ArrayList<OrderedConfigurer>();
         if (customMappingsConfigurer != null) list.add(customMappingsConfigurer);
@@ -60,8 +60,8 @@ public SpringConfigurationPostProcessor postProcessor(CustomMappingsConfigurer c
 
     @Bean
     @ConditionalOnMissingBean(CustomMappingsConfigurer.class)
-    protected CustomMappingsConfigurer customMappingsConfigurer(SpringBidiMappingService mappingService) {
-        var configurer = new CustomMappingsConfigurer();
+    protected CustomMappingsConfigurer<SpringRegistry> customMappingsConfigurer(SpringBidiMappingService mappingService) {
+        var configurer = new CustomMappingsConfigurer<SpringRegistry>();
         configurer.setMappingService(mappingService);
         return configurer;
     }

boot/ipf-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.openehealth.ipf.boot.IpfAutoConfiguration

boot/ipf-xacml20-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.openehealth.ipf.boot.xacml20.IpfXacml20AutoConfiguration

boot/ipf-xds-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.openehealth.ipf.boot.xds.IpfXdsAutoConfiguration

commons/audit/pom.xml

@@ -16,11 +16,6 @@
             <groupId>org.jdom</groupId>
             <artifactId>jdom2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-core</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
@@ -55,24 +50,27 @@
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jms</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-broker</artifactId>
+            <version>${activemq-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-client</artifactId>
+            <version>${activemq-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-pool</artifactId>
+            <groupId>org.messaginghub</groupId>
+            <artifactId>pooled-jms</artifactId>
+            <version>${pooled-jms-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jms</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

commons/audit/src/main/java/org/openehealth/ipf/commons/audit/protocol/AuditTransmissionChannel.java

@@ -23,7 +23,6 @@
 import org.openehealth.ipf.commons.audit.protocol.providers.RecordingAuditMessageTransmissionProvider;
 import org.openehealth.ipf.commons.audit.protocol.providers.TLSSyslogSenderProvider;
 import org.openehealth.ipf.commons.audit.protocol.providers.UDPSyslogSenderProvider;
-import org.openehealth.ipf.commons.audit.protocol.providers.VertxTLSSyslogSenderProvider;
 
 import java.util.Arrays;
 import java.util.ServiceLoader;
@@ -42,10 +41,10 @@ public enum AuditTransmissionChannel {
     VERTX_UDP("VERTX-UDP", UDPSyslogSenderProvider.class.getName()),
     TLS("TLS", TLSSyslogSenderProvider.class.getName()),
     NIO_TLS("NIO-TLS", NettyTLSSyslogSenderProvider.class.getName()),
-    VERTX_TLS("VERTX-TLS", VertxTLSSyslogSenderProvider.class.getName()),
     NETTY_TLS("NETTY-TLS", NettyTLSSyslogSenderProvider.class.getName()),
     REACTOR_NETTY_TLS("REACTOR-NETTY-TLS", ReactorNettyTLSSyslogSenderProvider.class.getName()),
     FHIR_REST_TLS("FHIR-REST-TLS", "org.openehealth.ipf.commons.ihe.fhir.audit.protocol.FhirRestTLSAuditRecordApacheSenderProvider"),
+    FHIR_REST_APACHE5_TLS("FHIR-REST-APACHE5-TLS", "org.openehealth.ipf.commons.ihe.fhir.audit.protocol.FhirRestTLSAuditRecordApache5SenderProvider"),
     FHIR_REST_METHANOL_TLS("FHIR-REST-METHANOL-TLS", "org.openehealth.ipf.commons.ihe.fhir.audit.protocol.FhirRestTLSAuditRecordMethanolSenderProvider"),
     RECORDING("RECORDING", RecordingAuditMessageTransmissionProvider.class.getName());