ERE-725 updated dependencies

ere-health · Sep 16, 2024 · 35be7a7 · 35be7a7
1 parent 8aa734d
commit 35be7a7
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.version>3.9.4</quarkus.platform.version>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-        <hapi.version>7.0.2</hapi.version>
+        <hapi.version>7.4.0</hapi.version>
         <version.referencevalidator>2.1.1</version.referencevalidator>
     </properties>
     <!-- 2021-12-20 Add a random line to update maven cache in gitHub actions -->
@@ -82,6 +82,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.r4</artifactId>
+            <version>6.3.25</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.utilities</artifactId>
+            <version>6.3.25</version>
+        </dependency>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-structures-r4</artifactId>
@@ -105,8 +115,33 @@
         </dependency>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-validation-resources-r4</artifactId>
-            <version>5.7.9</version>
+            <artifactId>org.hl7.fhir.validation</artifactId>
+            <version>6.3.25</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.ogce</groupId>
+                    <artifactId>xpp3</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ca.uhn.hapi.fhir</groupId>
+                    <artifactId>org.hl7.fhir.dstu2016may</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.dstu2</artifactId>
+            <version>6.3.25</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.dstu3</artifactId>
+            <version>6.3.25</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.r5</artifactId>
+            <version>6.3.25</version>
         </dependency>
         <dependency>
             <groupId>com.hp.jipp</groupId>

diff --git a/src/main/java/health/ere/ps/service/connector/endpoint/EndpointDiscoveryService.java b/src/main/java/health/ere/ps/service/connector/endpoint/EndpointDiscoveryService.java
@@ -7,12 +7,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.Invocation;
-import jakarta.ws.rs.client.Invocation.Builder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -25,6 +19,12 @@
 import health.ere.ps.config.AppConfig;
 import health.ere.ps.config.UserConfig;
 import health.ere.ps.service.common.security.SecretsManagerService;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.Invocation.Builder;
 
 /**
  * This service automatically discovers the endpoints that are available at the connector.
@@ -200,8 +200,8 @@ private void extractAndSetConnectorVersion(Document document) {
             } else if (productName.contains("PTV")) {
                 versionContainingText = productName;
             } else {
-                log.warning("Could not find the version of the connector to use from connector.sds, " +
-                        "using the one from the configuration:" + userConfig.getConnectorVersion());
+                //log.warning("Could not find the version of the connector to use from connector.sds, " +
+                //        "using the one from the configuration:" + userConfig.getConnectorVersion());
             }
 
             if (versionContainingText.contains("PTV4+") || versionContainingText.contains("PTV4Plus")) {
@@ -211,12 +211,12 @@ private void extractAndSetConnectorVersion(Document document) {
                 log.info("Connector version PTV4 found in connector.sds");
                 userConfig.getConfigurations().setVersion("PTV4");
             } else {
-                log.warning("Could not determine the version of the connector to use from connector.sds, " +
-                        "using the one from the configuration:" + userConfig.getConnectorVersion());
+                //log.warning("Could not determine the version of the connector to use from connector.sds, " +
+                //        "using the one from the configuration:" + userConfig.getConnectorVersion());
             }
         } catch (Exception e) {
-            log.warning("Could not determine the version of the connector to use from connector.sds, " +
-                    "using the one from the configuration:" + userConfig.getConnectorVersion());
+            // log.warning("Could not determine the version of the connector to use from connector.sds, " +
+            //        "using the one from the configuration:" + userConfig.getConnectorVersion());
         }
     }
 

diff --git a/src/main/java/health/ere/ps/service/gematik/ERezeptWorkflowService.java b/src/main/java/health/ere/ps/service/gematik/ERezeptWorkflowService.java
@@ -798,7 +798,12 @@ public void onAbortTasksEvent(@ObservesAsync AbortTasksEvent abortTasksEvent) {
      */
     public void onActivateComfortSignatureEvent(@ObservesAsync ActivateComfortSignatureEvent activateComfortSignatureEvent) {
         String userId = activateComfortSignature(activateComfortSignatureEvent.getRuntimeConfig(), activateComfortSignatureEvent.getReplyTo(), activateComfortSignatureEvent.getId());
-        onGetSignatureModeEvent(new GetSignatureModeEvent(activateComfortSignatureEvent.getReplyTo(), activateComfortSignatureEvent.getId()), userId, true);
+        try {
+            onGetSignatureModeEvent(new GetSignatureModeEvent(activateComfortSignatureEvent.getReplyTo(), activateComfortSignatureEvent.getId()), userId, true);
+        } catch(Exception e) {
+            log.log(Level.WARNING, "Could not get signature mode", e);
+            exceptionEvent.fireAsync(new ExceptionWithReplyToException(e, activateComfortSignatureEvent.getReplyTo(), activateComfortSignatureEvent.getReplyToMessageId()));
+        }
     }
 
 
@@ -842,7 +847,12 @@ private String getSignatureServiceCardHandle(RuntimeConfig runtimeConfig) throws
     }
 
     public void onGetSignatureModeEvent(@ObservesAsync GetSignatureModeEvent getSignatureModeEvent) {
-        onGetSignatureModeEvent(getSignatureModeEvent, null);
+        try {
+            onGetSignatureModeEvent(getSignatureModeEvent, null);
+        } catch(Exception e) {
+            log.log(Level.WARNING, "Could not get signature mode", e);
+            exceptionEvent.fireAsync(new ExceptionWithReplyToException(e, getSignatureModeEvent.getReplyTo(), getSignatureModeEvent.getReplyToMessageId()));
+        }
     }
 
     public void onGetSignatureModeEvent(GetSignatureModeEvent getSignatureModeEvent, String userId) {

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -43,14 +43,14 @@ ere.websocket.xml-bundle.direct-process=true
 
 ## Logging ##
 quarkus.log.level=INFO
+# quarkus.log.handlers=console,file
 
 ### Console Logging ###
 quarkus.log.console.enable=true
-quarkus.log.console.json=false
 
 ### File Logging ###
 quarkus.log.file.enable=true
-quarkus.log.file.json=true
+# quarkus.log.file.json=true
 quarkus.log.file.path=logs/quarkus.log
 quarkus.log.file.rotation.rotate-on-boot=false
 quarkus.log.file.rotation.max-file-size=10M
@@ -62,10 +62,10 @@ quarkus.log.file.rotation.file-suffix=yyyy-MM-dd
 # to more verbose levels like TRACE at buildtime! So if we want to be able to enable trace logging of
 # soap request/response at runtime, we must prepare being able to do this at buildtime here.
 # See: https://quarkus.io/guides/logging#configure-the-log-level-category-and-format
-quarkus.log.category."com.sun.xml.ws.transport.http.client.HttpTransportPipe".level=TRACE
-quarkus.log.category."com.sun.xml.internal.ws.transport.http.client.HttpTransportPipe".level=TRACE
-quarkus.log.category."com.sun.xml.ws.transport.http.HttpAdapter".level=TRACE
-quarkus.log.category."com.sun.xml.internal.ws.transport.http.HttpAdapter".level=TRACE
+#quarkus.log.category."com.sun.xml.ws.transport.http.client.HttpTransportPipe".level=DEBUG
+#quarkus.log.category."com.sun.xml.internal.ws.transport.http.client.HttpTransportPipe".level=DEBUG
+#quarkus.log.category."com.sun.xml.ws.transport.http.HttpAdapter".level=DEBUG
+#quarkus.log.category."com.sun.xml.internal.ws.transport.http.HttpAdapter".level=DEBUG
 
 ### customized log levels
 #quarkus.log.category."org.apache.http".level=DEBUG