#414: update libraries and rebase from master

oehf · Feb 19, 2024 · 44071f6 · 44071f6
1 parent 8b88563
commit 44071f6
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 94 deletions.
diff --git a/...it/src/main/java/org/openehealth/ipf/commons/audit/protocol/AuditTransmissionChannel.java b/...it/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,7 +41,6 @@ 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"),

diff --git a/...va/org/openehealth/ipf/commons/audit/protocol/providers/VertxTLSSyslogSenderProvider.java b/...va/org/openehealth/ipf/commons/audit/protocol/providers/VertxTLSSyslogSenderProvider.java
diff --git a/...va/org/openehealth/ipf/commons/audit/protocol/providers/VertxUDPSyslogSenderProvider.java b/...va/org/openehealth/ipf/commons/audit/protocol/providers/VertxUDPSyslogSenderProvider.java
diff --git a/...INF/services/org.openehealth.ipf.commons.audit.protocol.AuditTransmissionProtocolProvider b/...INF/services/org.openehealth.ipf.commons.audit.protocol.AuditTransmissionProtocolProvider
@@ -2,6 +2,4 @@ org.openehealth.ipf.commons.audit.protocol.providers.TLSSyslogSenderProvider
 org.openehealth.ipf.commons.audit.protocol.providers.UDPSyslogSenderProvider
 org.openehealth.ipf.commons.audit.protocol.providers.NettyTLSSyslogSenderProvider
 org.openehealth.ipf.commons.audit.protocol.providers.ReactorNettyTLSSyslogSenderProvider
-org.openehealth.ipf.commons.audit.protocol.providers.RecordingAuditMessageTransmissionProvider
-org.openehealth.ipf.commons.audit.protocol.providers.VertxTLSSyslogSenderProvider
-org.openehealth.ipf.commons.audit.protocol.providers.VertxUDPSyslogSenderProvider
+org.openehealth.ipf.commons.audit.protocol.providers.RecordingAuditMessageTransmissionProvider
diff --git a/...core/src/test/java/org/openehealth/ipf/commons/ihe/fhir/audit/server/FhirAuditServer.java b/...core/src/test/java/org/openehealth/ipf/commons/ihe/fhir/audit/server/FhirAuditServer.java
@@ -16,30 +16,18 @@
 package org.openehealth.ipf.commons.ihe.fhir.audit.server;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.rest.annotation.Create;
-import ca.uhn.fhir.rest.annotation.Delete;
-import ca.uhn.fhir.rest.annotation.IdParam;
-import ca.uhn.fhir.rest.annotation.OptionalParam;
-import ca.uhn.fhir.rest.annotation.Read;
-import ca.uhn.fhir.rest.annotation.ResourceParam;
-import ca.uhn.fhir.rest.annotation.Search;
+import ca.uhn.fhir.rest.annotation.*;
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.param.TokenParam;
 import ca.uhn.fhir.rest.server.IResourceProvider;
 import ca.uhn.fhir.rest.server.RestfulServer;
 import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
-import org.hl7.fhir.dstu3.model.Organization;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.AuditEvent;
 import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.ResourceType;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

diff --git a/...re/src/test/java/org/openehealth/ipf/commons/ihe/fhir/audit/server/TLSBalpRepository.java b/...re/src/test/java/org/openehealth/ipf/commons/ihe/fhir/audit/server/TLSBalpRepository.java
@@ -24,19 +24,16 @@
 import io.undertow.servlet.api.DeploymentManager;
 import io.undertow.servlet.api.InstanceFactory;
 import io.undertow.servlet.api.InstanceHandle;
+import jakarta.servlet.ServletException;
 import org.openehealth.ipf.commons.audit.TlsParameters;
 import org.openehealth.ipf.commons.ihe.fhir.extension.FhirAuditRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletException;
-
 import java.io.Closeable;
 import java.io.IOException;
 
-import static io.undertow.servlet.Servlets.defaultContainer;
-import static io.undertow.servlet.Servlets.deployment;
-import static io.undertow.servlet.Servlets.servlet;
+import static io.undertow.servlet.Servlets.*;
 
 public class TLSBalpRepository implements Closeable {
 

diff --git a/.../org/openehealth/ipf/commons/ihe/fhir/iti105/Iti105DocumentReferenceResourceProvider.java b/.../org/openehealth/ipf/commons/ihe/fhir/iti105/Iti105DocumentReferenceResourceProvider.java
@@ -20,13 +20,12 @@
 import ca.uhn.fhir.rest.annotation.ResourceParam;
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.DocumentReference;
 import org.openehealth.ipf.commons.ihe.fhir.AbstractResourceProvider;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * Resource Provider for MHD (ITI-105) based on creating a DocumentReference resource
  *

diff --git a/...d/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti66/Iti66ListResourceProvider.java b/...d/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti66/Iti66ListResourceProvider.java
@@ -23,12 +23,12 @@
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.param.*;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.r4.model.*;
 import org.openehealth.ipf.commons.ihe.fhir.AbstractPlainProvider;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Set;
 
 /**

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -40,7 +40,6 @@
         <simple-syslog-version>0.0.16</simple-syslog-version>
         <spring-boot-version>3.2.2</spring-boot-version>
         <velocity-version>2.3</velocity-version>
-        <vertx-version>4.5.1</vertx-version>
         <vibur-version>25.0</vibur-version>
         <woodstox-version>6.5.1</woodstox-version>
         <xmlsec-version>4.0.1</xmlsec-version>

diff --git a/...est/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/test/FhirTestContainer.java b/...est/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/test/FhirTestContainer.java
@@ -20,13 +20,13 @@
 import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
+import jakarta.servlet.Servlet;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.CapabilityStatement;
 import org.hl7.fhir.r4.model.OperationOutcome;
 import org.openehealth.ipf.commons.audit.codes.EventOutcomeIndicator;
 import org.openehealth.ipf.platform.camel.ihe.ws.StandardTestContainer;
 
-import javax.servlet.Servlet;
 import java.util.function.Consumer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;

diff --git a/...ws/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/ws/StandardTestContainer.groovy b/...ws/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/ws/StandardTestContainer.groovy
@@ -15,6 +15,7 @@
  */
 package org.openehealth.ipf.platform.camel.ihe.ws
 
+import jakarta.servlet.Servlet
 import org.apache.camel.CamelContext
 import org.apache.camel.Exchange
 import org.apache.camel.ProducerTemplate
@@ -31,8 +32,6 @@ import org.slf4j.LoggerFactory
 import org.springframework.context.ApplicationContext
 import org.springframework.web.context.support.WebApplicationContextUtils
 
-import javax.servlet.Servlet
-
 /**
  * Base class for tests that are run within an embedded web container.
  * This class requires that an application context named "context.xml" is

diff --git a/pom.xml b/pom.xml
@@ -63,7 +63,8 @@
         <pooled-jms-version>3.1.5</pooled-jms-version>
         <quickcheck-version>0.6</quickcheck-version>
         <tomcat-version>10.1.18</tomcat-version>
-        <xbean-spring-version>4.23</xbean-spring-version>
+        <undertow-version>2.3.11.Final</undertow-version>
+        <xbean-spring-version>4.24</xbean-spring-version>
     </properties>
 
     <scm>

diff --git a/tutorials/iheclient/pom.xml b/tutorials/iheclient/pom.xml
@@ -74,6 +74,12 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>