EPA-282 +CETP interfaces are extracted into "de.servicehealth:common"…

… library, imports are chaged
ere-health · Oct 16, 2024 · 0ab3384 · 0ab3384
1 parent 87bf6bd
commit 0ab3384
Show file tree

Hide file tree

Showing 34 changed files with 204 additions and 69 deletions.
diff --git a/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/_remote.repositories b/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/_remote.repositories
@@ -0,0 +1,5 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Wed Oct 16 22:40:17 AMT 2024
+common-1.0.0-SNAPSHOT-sources.jar>=
+common-1.0.0-SNAPSHOT.jar>=
+common-1.0.0-SNAPSHOT.pom>=
diff --git a/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/common-1.0.0-SNAPSHOT-sources.jar b/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/common-1.0.0-SNAPSHOT-sources.jar
diff --git a/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/common-1.0.0-SNAPSHOT.jar b/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/common-1.0.0-SNAPSHOT.jar
diff --git a/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/common-1.0.0-SNAPSHOT.pom b/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/common-1.0.0-SNAPSHOT.pom
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>de.servicehealth</groupId>
+    <artifactId>common</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <properties>
+        <java.version>17</java.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>jakarta.platform</groupId>
+                <artifactId>jakarta.jakartaee-bom</artifactId>
+                <version>10.0.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.microprofile.config</groupId>
+            <artifactId>microprofile-config-api</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>4.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-cbor</artifactId>
+            <version>2.17.2</version>
+        </dependency>
+        <dependency>
+            <groupId>de.servicehealth.epa4all.libvau</groupId>
+            <artifactId>lib-vau</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.34</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <parameters>true</parameters>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/maven-metadata-local.xml b/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/maven-metadata-local.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>de.servicehealth</groupId>
+  <artifactId>common</artifactId>
+  <versioning>
+    <lastUpdated>20241016184014</lastUpdated>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <snapshotVersions>
+      <snapshotVersion>
+        <extension>pom</extension>
+        <value>1.0.0-SNAPSHOT</value>
+        <updated>20241016184014</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>jar</extension>
+        <value>1.0.0-SNAPSHOT</value>
+        <updated>20241016184014</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <classifier>sources</classifier>
+        <extension>jar</extension>
+        <value>1.0.0-SNAPSHOT</value>
+        <updated>20241016184014</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+  <version>1.0.0-SNAPSHOT</version>
+</metadata>
diff --git a/project-repo/de/servicehealth/common/maven-metadata-local.xml b/project-repo/de/servicehealth/common/maven-metadata-local.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>de.servicehealth</groupId>
+  <artifactId>common</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20241016184014</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/_remote.repositories b/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/_remote.repositories
@@ -1,5 +1,5 @@
 #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
-#Wed Oct 16 07:38:38 AMT 2024
-lib-cetp-1.0.0-SNAPSHOT.pom>=
-lib-cetp-1.0.0-SNAPSHOT.jar>=
+#Wed Oct 16 22:40:04 AMT 2024
 lib-cetp-1.0.0-SNAPSHOT-sources.jar>=
+lib-cetp-1.0.0-SNAPSHOT.jar>=
+lib-cetp-1.0.0-SNAPSHOT.pom>=
diff --git a/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT-sources.jar b/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT-sources.jar
diff --git a/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT.jar b/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT.jar
diff --git a/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT.pom b/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT.pom
@@ -21,12 +21,6 @@
             <version>4.1.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>6.0.0</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
@@ -46,6 +40,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>de.servicehealth</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

diff --git a/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/maven-metadata-local.xml b/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/maven-metadata-local.xml
@@ -3,26 +3,26 @@
   <groupId>de.servicehealth</groupId>
   <artifactId>lib-cetp</artifactId>
   <versioning>
-    <lastUpdated>20241016033832</lastUpdated>
+    <lastUpdated>20241016183958</lastUpdated>
     <snapshot>
       <localCopy>true</localCopy>
     </snapshot>
     <snapshotVersions>
       <snapshotVersion>
         <extension>pom</extension>
         <value>1.0.0-SNAPSHOT</value>
-        <updated>20241016033832</updated>
+        <updated>20241016183958</updated>
       </snapshotVersion>
       <snapshotVersion>
         <extension>jar</extension>
         <value>1.0.0-SNAPSHOT</value>
-        <updated>20241016033832</updated>
+        <updated>20241016183958</updated>
       </snapshotVersion>
       <snapshotVersion>
         <classifier>sources</classifier>
         <extension>jar</extension>
         <value>1.0.0-SNAPSHOT</value>
-        <updated>20241016033832</updated>
+        <updated>20241016183958</updated>
       </snapshotVersion>
     </snapshotVersions>
   </versioning>

diff --git a/project-repo/de/servicehealth/lib-cetp/maven-metadata-local.xml b/project-repo/de/servicehealth/lib-cetp/maven-metadata-local.xml
@@ -6,6 +6,6 @@
     <versions>
       <version>1.0.0-SNAPSHOT</version>
     </versions>
-    <lastUpdated>20241016033832</lastUpdated>
+    <lastUpdated>20241016183958</lastUpdated>
   </versioning>
 </metadata>
diff --git a/src/main/java/health/ere/ps/config/AppConfig.java b/src/main/java/health/ere/ps/config/AppConfig.java
@@ -1,7 +1,7 @@
 package health.ere.ps.config;
 
 import de.health.service.cetp.CETPServer;
-import de.health.service.cetp.config.SubscriptionConfig;
+import de.servicehealth.config.api.ISubscriptionConfig;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
@@ -16,7 +16,7 @@
 
 @SuppressWarnings({"LombokGetterMayBeUsed", "LombokSetterMayBeUsed"})
 @ApplicationScoped
-public class AppConfig implements SubscriptionConfig {
+public class AppConfig implements ISubscriptionConfig {
 
     private static final Logger log = Logger.getLogger(AppConfig.class.getName());
 
@@ -144,7 +144,7 @@ public int getCetpSubscriptionsRenewalSafePeriodMs() {
         return cetpSubscriptionsRenewalSafePeriodSeconds.orElse(600) * 1000;
     }
 
-    public int getSubscriptionsMaintenanceRetryIntervalMs() {
+    public int getCetpSubscriptionsMaintenanceRetryIntervalMs() {
         return subscriptionsMaintenanceRetryIntervalMs.orElse(5000);
     }
 
@@ -196,7 +196,7 @@ public String getKonnectorHost() {
         return konnectorHost;
     }
 
-    public int getCetpPort() {
+    public int getCetpServerDefaultPort() {
         return cetpPort.orElse(CETPServer.DEFAULT_PORT);
     }
 

diff --git a/src/main/java/health/ere/ps/config/RuntimeConfig.java b/src/main/java/health/ere/ps/config/RuntimeConfig.java
@@ -1,20 +1,15 @@
 package health.ere.ps.config;
 
-import de.health.service.cetp.config.IRuntimeConfig;
-import de.health.service.cetp.config.IUserConfigurations;
-import de.health.service.cetp.konnektorconfig.KCUserConfigurations;
+import de.servicehealth.config.api.IRuntimeConfig;
+import de.servicehealth.config.api.IUserConfigurations;
 import health.ere.ps.model.config.UserConfigurations;
 import jakarta.enterprise.inject.Alternative;
 import jakarta.enterprise.inject.spi.CDI;
 import jakarta.json.JsonObject;
 import jakarta.servlet.http.HttpServletRequest;
 
-import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.logging.Level;

diff --git a/src/main/java/health/ere/ps/config/SimpleUserConfig.java b/src/main/java/health/ere/ps/config/SimpleUserConfig.java
@@ -1,8 +1,9 @@
 package health.ere.ps.config;
 
-import de.health.service.cetp.config.IRuntimeConfig;
-import de.health.service.cetp.config.IUserConfigurations;
-import de.health.service.cetp.config.UserRuntimeConfig;
+
+import de.servicehealth.config.api.IRuntimeConfig;
+import de.servicehealth.config.api.IUserConfigurations;
+import de.servicehealth.config.api.UserRuntimeConfig;
 
 import java.util.Objects;
 

diff --git a/src/main/java/health/ere/ps/config/UserConfig.java b/src/main/java/health/ere/ps/config/UserConfig.java
@@ -1,10 +1,10 @@
 package health.ere.ps.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.health.service.cetp.config.IRuntimeConfig;
-import de.health.service.cetp.config.IUserConfigurations;
-import de.health.service.cetp.config.UserRuntimeConfig;
 import de.health.service.cetp.konnektorconfig.KCUserConfigurations;
+import de.servicehealth.config.api.IRuntimeConfig;
+import de.servicehealth.config.api.IUserConfigurations;
+import de.servicehealth.config.api.UserRuntimeConfig;
 import health.ere.ps.event.config.UserConfigurationsUpdateEvent;
 import health.ere.ps.model.config.UserConfigurations;
 import health.ere.ps.service.config.UserConfigurationService;

diff --git a/src/main/java/health/ere/ps/model/config/UserConfigurations.java b/src/main/java/health/ere/ps/model/config/UserConfigurations.java
@@ -1,6 +1,6 @@
 package health.ere.ps.model.config;
 
-import de.health.service.cetp.config.IUserConfigurations;
+import de.servicehealth.config.api.IUserConfigurations;
 import jakarta.json.JsonObject;
 import jakarta.json.bind.annotation.JsonbNillable;
 import jakarta.json.bind.annotation.JsonbProperty;
@@ -10,11 +10,7 @@
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.function.Function;

diff --git a/src/main/java/health/ere/ps/service/cardlink/EreJwtConfigurator.java b/src/main/java/health/ere/ps/service/cardlink/EreJwtConfigurator.java
@@ -2,9 +2,9 @@
 
 import de.health.service.cetp.IKonnektorClient;
 import de.health.service.cetp.cardlink.JwtConfigurator;
-import de.health.service.cetp.config.UserRuntimeConfig;
 import de.health.service.cetp.domain.eventservice.card.Card;
 import de.health.service.cetp.domain.eventservice.card.CardType;
+import de.servicehealth.config.api.UserRuntimeConfig;
 import health.ere.ps.config.RuntimeConfig;
 import health.ere.ps.service.idp.BearerTokenService;
 import jakarta.validation.constraints.NotNull;

diff --git a/src/main/java/health/ere/ps/service/cetp/CETPServerHandler.java b/src/main/java/health/ere/ps/service/cetp/CETPServerHandler.java
@@ -4,7 +4,7 @@
 import ca.uhn.fhir.parser.IParser;
 import de.gematik.ws.conn.eventservice.v7.Event;
 import de.health.service.cetp.cardlink.CardlinkWebsocketClient;
-import de.health.service.cetp.config.IUserConfigurations;
+import de.servicehealth.config.api.IUserConfigurations;
 import health.ere.ps.config.RuntimeConfig;
 import health.ere.ps.service.cetp.tracker.TrackerService;
 import health.ere.ps.service.gematik.PharmacyService;

diff --git a/src/main/java/health/ere/ps/service/cetp/CETPServerHandlerFactory.java b/src/main/java/health/ere/ps/service/cetp/CETPServerHandlerFactory.java
@@ -3,7 +3,7 @@
 import de.health.service.cetp.CETPEventHandlerFactory;
 import de.health.service.cetp.IKonnektorClient;
 import de.health.service.cetp.cardlink.CardlinkWebsocketClient;
-import de.health.service.cetp.konnektorconfig.KonnektorConfig;
+import de.servicehealth.config.KonnektorConfig;
 import health.ere.ps.config.RuntimeConfig;
 import health.ere.ps.service.cardlink.EreJwtConfigurator;
 import health.ere.ps.service.cetp.tracker.TrackerService;

diff --git a/src/main/java/health/ere/ps/service/cetp/KonnektorClient.java b/src/main/java/health/ere/ps/service/cetp/KonnektorClient.java
@@ -11,14 +11,14 @@
 import de.gematik.ws.conn.eventservice.wsdl.v7.EventServicePortType;
 import de.gematik.ws.conn.eventservice.wsdl.v7.FaultMessage;
 import de.health.service.cetp.IKonnektorClient;
-import de.health.service.cetp.config.UserRuntimeConfig;
 import de.health.service.cetp.domain.CetpStatus;
 import de.health.service.cetp.domain.SubscriptionResult;
 import de.health.service.cetp.domain.eventservice.Subscription;
 import de.health.service.cetp.domain.eventservice.card.Card;
 import de.health.service.cetp.domain.eventservice.card.CardType;
 import de.health.service.cetp.domain.eventservice.card.CardsResponse;
 import de.health.service.cetp.domain.fault.CetpFault;
+import de.servicehealth.config.api.UserRuntimeConfig;
 import health.ere.ps.service.cetp.mapper.card.CardTypeMapper;
 import health.ere.ps.service.cetp.mapper.card.CardsResponseMapper;
 import health.ere.ps.service.cetp.mapper.status.StatusMapper;

diff --git a/src/main/java/health/ere/ps/service/cetp/RegisterSMCBJob.java b/src/main/java/health/ere/ps/service/cetp/RegisterSMCBJob.java
@@ -2,7 +2,7 @@
 
 import de.health.service.cetp.SubscriptionManager;
 import de.health.service.cetp.cardlink.CardlinkWebsocketClient;
-import de.health.service.cetp.konnektorconfig.KonnektorConfig;
+import de.servicehealth.config.KonnektorConfig;
 import health.ere.ps.config.RuntimeConfig;
 import health.ere.ps.jmx.SubscriptionsMXBean;
 import health.ere.ps.jmx.SubscriptionsMXBeanImpl;