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 new file mode 100644 index 00000000..a60def9f --- /dev/null +++ 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 new file mode 100644 index 00000000..6dda13ea Binary files /dev/null and b/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/common-1.0.0-SNAPSHOT-sources.jar differ 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 new file mode 100644 index 00000000..e3d7d2ee Binary files /dev/null and b/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/common-1.0.0-SNAPSHOT.jar differ 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 new file mode 100644 index 00000000..3614035e --- /dev/null +++ b/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/common-1.0.0-SNAPSHOT.pom @@ -0,0 +1,94 @@ + + + 4.0.0 + + de.servicehealth + common + 1.0.0-SNAPSHOT + + + 17 + + + + + + jakarta.platform + jakarta.jakartaee-bom + 10.0.0 + pom + import + + + + + + + org.eclipse.microprofile.config + microprofile-config-api + 3.1 + + + jakarta.enterprise + jakarta.enterprise.cdi-api + 4.1.0 + provided + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + provided + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + 2.17.2 + + + de.servicehealth.epa4all.libvau + lib-vau + 1.0.0-SNAPSHOT + + + com.google.code.gson + gson + 2.11.0 + + + org.projectlombok + lombok + 1.18.34 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + true + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar + + + + + + + + \ No newline at end of file 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 new file mode 100644 index 00000000..06c5182e --- /dev/null +++ b/project-repo/de/servicehealth/common/1.0.0-SNAPSHOT/maven-metadata-local.xml @@ -0,0 +1,30 @@ + + + de.servicehealth + common + + 20241016184014 + + true + + + + pom + 1.0.0-SNAPSHOT + 20241016184014 + + + jar + 1.0.0-SNAPSHOT + 20241016184014 + + + sources + jar + 1.0.0-SNAPSHOT + 20241016184014 + + + + 1.0.0-SNAPSHOT + diff --git a/project-repo/de/servicehealth/common/maven-metadata-local.xml b/project-repo/de/servicehealth/common/maven-metadata-local.xml new file mode 100644 index 00000000..57a962fb --- /dev/null +++ b/project-repo/de/servicehealth/common/maven-metadata-local.xml @@ -0,0 +1,11 @@ + + + de.servicehealth + common + + + 1.0.0-SNAPSHOT + + 20241016184014 + + 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 index 70adf9f2..723a6a97 100644 --- 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 index bcc6948a..d008e846 100644 Binary files a/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT-sources.jar and b/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT-sources.jar differ 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 index e0ea0b72..07975714 100644 Binary files a/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT.jar and b/project-repo/de/servicehealth/lib-cetp/1.0.0-SNAPSHOT/lib-cetp-1.0.0-SNAPSHOT.jar differ 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 index 234a413e..a8009846 100644 --- 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 @@ 4.1.0 provided - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - provided - jakarta.xml.ws jakarta.xml.ws-api @@ -46,6 +40,12 @@ provided + + de.servicehealth + common + 1.0.0-SNAPSHOT + + org.apache.commons commons-lang3 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 index 2eabb0e8..fae84606 100644 --- 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,7 +3,7 @@ de.servicehealth lib-cetp - 20241016033832 + 20241016183958 true @@ -11,18 +11,18 @@ pom 1.0.0-SNAPSHOT - 20241016033832 + 20241016183958 jar 1.0.0-SNAPSHOT - 20241016033832 + 20241016183958 sources jar 1.0.0-SNAPSHOT - 20241016033832 + 20241016183958 diff --git a/project-repo/de/servicehealth/lib-cetp/maven-metadata-local.xml b/project-repo/de/servicehealth/lib-cetp/maven-metadata-local.xml index 5b66bc7a..61eaba45 100644 --- 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 @@ 1.0.0-SNAPSHOT - 20241016033832 + 20241016183958 diff --git a/src/main/java/health/ere/ps/config/AppConfig.java b/src/main/java/health/ere/ps/config/AppConfig.java index 7bfad890..6eb31fe1 100644 --- 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 index 31d55735..ca90a647 100644 --- 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 index ecc3283e..2ac3bbc8 100644 --- 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 index 54d14bbc..4dd10c09 100644 --- 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 index 5f0dfde1..b2a424c7 100644 --- 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 index ea640d19..c96b4a14 100644 --- 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 index 1f261916..9a10ada5 100644 --- 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 index 37ebd9d3..46026270 100644 --- 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 index a35f20e4..0a65dbae 100644 --- a/src/main/java/health/ere/ps/service/cetp/KonnektorClient.java +++ b/src/main/java/health/ere/ps/service/cetp/KonnektorClient.java @@ -11,7 +11,6 @@ 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; @@ -19,6 +18,7 @@ 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 index f88ed7dd..89d805da 100644 --- 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; diff --git a/src/main/java/health/ere/ps/service/cetp/codec/CETPDecoder.java b/src/main/java/health/ere/ps/service/cetp/codec/CETPDecoder.java index f932759c..d0d296f6 100644 --- a/src/main/java/health/ere/ps/service/cetp/codec/CETPDecoder.java +++ b/src/main/java/health/ere/ps/service/cetp/codec/CETPDecoder.java @@ -1,21 +1,19 @@ package health.ere.ps.service.cetp.codec; -import java.io.StringReader; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import de.health.service.cetp.config.IUserConfigurations; -import org.apache.commons.lang3.tuple.Pair; - import de.gematik.ws.conn.eventservice.v7.Event; -import health.ere.ps.model.config.UserConfigurations; +import de.servicehealth.config.api.IUserConfigurations; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; +import org.apache.commons.lang3.tuple.Pair; + +import java.io.StringReader; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; public class CETPDecoder extends ByteToMessageDecoder { diff --git a/src/main/java/health/ere/ps/service/cetp/codec/CETPDecoderFactory.java b/src/main/java/health/ere/ps/service/cetp/codec/CETPDecoderFactory.java index 95adc51d..ba588af7 100644 --- a/src/main/java/health/ere/ps/service/cetp/codec/CETPDecoderFactory.java +++ b/src/main/java/health/ere/ps/service/cetp/codec/CETPDecoderFactory.java @@ -1,7 +1,7 @@ package health.ere.ps.service.cetp.codec; import de.health.service.cetp.codec.CETPEventDecoderFactory; -import de.health.service.cetp.config.IUserConfigurations; +import de.servicehealth.config.api.IUserConfigurations; import io.netty.channel.ChannelInboundHandler; import jakarta.enterprise.context.ApplicationScoped; diff --git a/src/main/java/health/ere/ps/service/common/security/SecretsManagerService.java b/src/main/java/health/ere/ps/service/common/security/SecretsManagerService.java index 1a997cfe..246710b7 100644 --- a/src/main/java/health/ere/ps/service/common/security/SecretsManagerService.java +++ b/src/main/java/health/ere/ps/service/common/security/SecretsManagerService.java @@ -1,7 +1,7 @@ package health.ere.ps.service.common.security; import de.health.service.cetp.FallbackSecretsManager; -import de.health.service.cetp.config.IUserConfigurations; +import de.servicehealth.config.api.IUserConfigurations; import health.ere.ps.config.AppConfig; import health.ere.ps.exception.common.security.SecretsManagerException; import health.ere.ps.model.config.UserConfigurations; 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 index 2381cb3d..e11f52da 100644 --- a/src/main/java/health/ere/ps/service/connector/endpoint/EndpointDiscoveryService.java +++ b/src/main/java/health/ere/ps/service/connector/endpoint/EndpointDiscoveryService.java @@ -1,7 +1,7 @@ package health.ere.ps.service.connector.endpoint; -import de.health.service.cetp.config.IUserConfigurations; -import de.health.service.cetp.config.UserRuntimeConfig; +import de.servicehealth.config.api.IUserConfigurations; +import de.servicehealth.config.api.UserRuntimeConfig; import health.ere.ps.config.AppConfig; import health.ere.ps.service.common.security.SecretsManagerService; import jakarta.enterprise.context.ApplicationScoped; diff --git a/src/main/java/health/ere/ps/service/connector/provider/AbstractConnectorServicesProvider.java b/src/main/java/health/ere/ps/service/connector/provider/AbstractConnectorServicesProvider.java index b92a2da4..5a617ffe 100644 --- a/src/main/java/health/ere/ps/service/connector/provider/AbstractConnectorServicesProvider.java +++ b/src/main/java/health/ere/ps/service/connector/provider/AbstractConnectorServicesProvider.java @@ -15,8 +15,8 @@ import de.gematik.ws.conn.signatureservice.wsdl.v7.SignatureServiceV755; import de.gematik.ws.conn.vsds.vsdservice.v5.VSDService; import de.gematik.ws.conn.vsds.vsdservice.v5.VSDServicePortType; -import de.health.service.cetp.config.IUserConfigurations; -import de.health.service.cetp.config.UserRuntimeConfig; +import de.servicehealth.config.api.IUserConfigurations; +import de.servicehealth.config.api.UserRuntimeConfig; import health.ere.ps.config.interceptor.ProvidedConfig; import health.ere.ps.service.common.security.SecretsManagerService; import health.ere.ps.service.connector.endpoint.EndpointDiscoveryService; diff --git a/src/main/java/health/ere/ps/service/connector/provider/DefaultConnectorServicesProvider.java b/src/main/java/health/ere/ps/service/connector/provider/DefaultConnectorServicesProvider.java index ffd822f0..9c937d2a 100644 --- a/src/main/java/health/ere/ps/service/connector/provider/DefaultConnectorServicesProvider.java +++ b/src/main/java/health/ere/ps/service/connector/provider/DefaultConnectorServicesProvider.java @@ -1,6 +1,6 @@ package health.ere.ps.service.connector.provider; -import de.health.service.cetp.config.UserRuntimeConfig; +import de.servicehealth.config.api.UserRuntimeConfig; import jakarta.annotation.PostConstruct; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/src/main/java/health/ere/ps/service/connector/provider/MultiConnectorServicesProvider.java b/src/main/java/health/ere/ps/service/connector/provider/MultiConnectorServicesProvider.java index cd782cf0..1dbe6d68 100644 --- a/src/main/java/health/ere/ps/service/connector/provider/MultiConnectorServicesProvider.java +++ b/src/main/java/health/ere/ps/service/connector/provider/MultiConnectorServicesProvider.java @@ -8,7 +8,7 @@ import de.gematik.ws.conn.signatureservice.wsdl.v7.SignatureServicePortTypeV740; import de.gematik.ws.conn.signatureservice.wsdl.v7.SignatureServicePortTypeV755; import de.gematik.ws.conn.vsds.vsdservice.v5.VSDServicePortType; -import de.health.service.cetp.config.UserRuntimeConfig; +import de.servicehealth.config.api.UserRuntimeConfig; import health.ere.ps.config.SimpleUserConfig; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Event; diff --git a/src/main/java/health/ere/ps/service/connector/provider/SingleConnectorServicesProvider.java b/src/main/java/health/ere/ps/service/connector/provider/SingleConnectorServicesProvider.java index 68dba7da..045e3819 100644 --- a/src/main/java/health/ere/ps/service/connector/provider/SingleConnectorServicesProvider.java +++ b/src/main/java/health/ere/ps/service/connector/provider/SingleConnectorServicesProvider.java @@ -1,7 +1,7 @@ package health.ere.ps.service.connector.provider; -import de.health.service.cetp.config.IUserConfigurations; -import de.health.service.cetp.config.UserRuntimeConfig; +import de.servicehealth.config.api.IUserConfigurations; +import de.servicehealth.config.api.UserRuntimeConfig; import health.ere.ps.config.AppConfig; import health.ere.ps.service.common.security.SecretsManagerService; import health.ere.ps.service.connector.endpoint.EndpointDiscoveryService; @@ -17,7 +17,13 @@ import java.net.Socket; import java.net.URI; import java.net.URISyntaxException; -import java.security.*; +import java.security.KeyManagementException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.Principal; +import java.security.PrivateKey; +import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.Base64; diff --git a/src/main/java/health/ere/ps/service/status/StatusService.java b/src/main/java/health/ere/ps/service/status/StatusService.java index c19b41ab..63628911 100644 --- a/src/main/java/health/ere/ps/service/status/StatusService.java +++ b/src/main/java/health/ere/ps/service/status/StatusService.java @@ -1,13 +1,12 @@ package health.ere.ps.service.status; import de.gematik.ws.conn.eventservice.v7.GetCards; -import de.health.service.cetp.config.IUserConfigurations; +import de.servicehealth.config.api.IUserConfigurations; import health.ere.ps.config.AppConfig; import health.ere.ps.config.RuntimeConfig; import health.ere.ps.config.UserConfig; import health.ere.ps.event.RequestStatusEvent; import health.ere.ps.event.StatusResponseEvent; -import health.ere.ps.model.config.UserConfigurations; import health.ere.ps.model.status.Status; import health.ere.ps.service.common.security.SecretsManagerService; import health.ere.ps.service.connector.cards.ConnectorCardsService; diff --git a/src/test/java/health/ere/ps/config/UserConfigTest.java b/src/test/java/health/ere/ps/config/UserConfigTest.java index 696d712b..c2e17178 100644 --- a/src/test/java/health/ere/ps/config/UserConfigTest.java +++ b/src/test/java/health/ere/ps/config/UserConfigTest.java @@ -1,6 +1,6 @@ package health.ere.ps.config; -import de.health.service.cetp.config.IUserConfigurations; +import de.servicehealth.config.api.IUserConfigurations; import health.ere.ps.model.config.UserConfigurations; import health.ere.ps.service.config.UserConfigurationService; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/health/ere/ps/service/cetp/SubscriptionRenewalTest.java b/src/test/java/health/ere/ps/service/cetp/SubscriptionRenewalTest.java index 58b5963f..016c024c 100644 --- a/src/test/java/health/ere/ps/service/cetp/SubscriptionRenewalTest.java +++ b/src/test/java/health/ere/ps/service/cetp/SubscriptionRenewalTest.java @@ -9,7 +9,7 @@ import de.gematik.ws.conn.eventservice.wsdl.v7.EventServicePortType; import de.gematik.ws.tel.error.v2.Error; import de.health.service.cetp.SubscriptionManager; -import de.health.service.cetp.konnektorconfig.KonnektorConfig; +import de.servicehealth.config.KonnektorConfig; import health.ere.ps.profile.RUDevTestProfile; import health.ere.ps.service.connector.provider.MultiConnectorServicesProvider; import io.quarkus.test.junit.QuarkusMock; diff --git a/src/test/java/health/ere/ps/service/cetp/config/KonnektorConfigTest.java b/src/test/java/health/ere/ps/service/cetp/config/KonnektorConfigTest.java index e0659775..0f4530e1 100644 --- a/src/test/java/health/ere/ps/service/cetp/config/KonnektorConfigTest.java +++ b/src/test/java/health/ere/ps/service/cetp/config/KonnektorConfigTest.java @@ -2,7 +2,7 @@ import de.health.service.cetp.SubscriptionManager; import de.health.service.cetp.konnektorconfig.FSConfigService; -import de.health.service.cetp.konnektorconfig.KonnektorConfig; +import de.servicehealth.config.KonnektorConfig; import health.ere.ps.config.AppConfig; import health.ere.ps.config.UserConfig; import health.ere.ps.model.config.UserConfigurations; @@ -65,8 +65,8 @@ public void twoConfigsWithSameKonnectorAreLoaded() { Properties sameKonnektorProperties = new Properties(); String konnektorHost = "192.168.178.42"; sameKonnektorProperties.put("connectorBaseURL", "https\\://" + konnektorHost); - sameKonnektorConfigs.add(new KonnektorConfig(null, 8585, new UserConfigurations(sameKonnektorProperties), null)); - sameKonnektorConfigs.add(new KonnektorConfig(null, 8586, new UserConfigurations(sameKonnektorProperties), null)); + sameKonnektorConfigs.add(new KonnektorConfig(null, 8585, null, new UserConfigurations(sameKonnektorProperties))); + sameKonnektorConfigs.add(new KonnektorConfig(null, 8586, null, new UserConfigurations(sameKonnektorProperties))); doReturn(sameKonnektorConfigs).when(configService).readFromPath(any());