From bf8c877ca2a3ce98105feabb9c019d7b8e8ac393 Mon Sep 17 00:00:00 2001 From: YukiInu Date: Thu, 9 Jan 2025 14:24:02 +0100 Subject: [PATCH] timeoutexception problem with daemonscanner --- CHANGELOG.md | 3 +++ .../taimos/dvalin/interconnect/core/AToTopicSender.java | 6 +++--- .../de/taimos/dvalin/interconnect/core/EventSender.java | 2 +- .../taimos/dvalin/interconnect/core/IToTopicSender.java | 2 +- .../taimos/dvalin/interconnect/core/IVORefreshSender.java | 2 +- .../interconnect/core/daemon/IDaemonMessageSender.java | 2 +- .../core/daemon/handler/ADaemonMessageHandler.java | 2 +- .../core/daemon/jms/InterconnectMessageSender.java | 6 +++--- .../core/daemon/model/InterconnectContext.java | 2 +- .../core/daemon/model/InterconnectResponseContext.java | 2 +- .../core/daemon/proxy/ADaemonProxyFactory.java | 2 +- .../core/daemon/proxy/DefaultDaemonProxyFactory.java | 2 +- .../core/daemon/util/DaemonExceptionMapper.java | 8 ++++---- .../core/daemon/util/DaemonMethodInvocationHandler.java | 2 +- .../taimos/dvalin/jms/activemq/ActiveMqCryptoService.java | 2 +- .../core}/exceptions/InfrastructureException.java | 2 +- .../core}/exceptions/MessageCryptoException.java | 2 +- .../core}/exceptions/SerializationException.java | 2 +- .../core}/exceptions/TimeoutException.java | 2 +- .../src/main/java/de/taimos/dvalin/jms/IJmsConnector.java | 4 ++-- .../src/main/java/de/taimos/dvalin/jms/JmsConnector.java | 6 +++--- .../java/de/taimos/dvalin/jms/crypto/ACryptoService.java | 2 +- .../java/de/taimos/dvalin/jms/crypto/ICryptoService.java | 2 +- .../de/taimos/dvalin/jms/crypto/JmsMessageCryptoUtil.java | 2 +- .../jms/exceptions/CommunicationFailureException.java | 2 ++ .../taimos/dvalin/jms/exceptions/CreationException.java | 2 ++ .../taimos/dvalin/jms/crypto/MessageCryptoUtilTest.java | 2 +- 27 files changed, 41 insertions(+), 34 deletions(-) rename jms/core/src/main/java/de/taimos/dvalin/{jms => interconnect/core}/exceptions/InfrastructureException.java (96%) rename jms/core/src/main/java/de/taimos/dvalin/{jms => interconnect/core}/exceptions/MessageCryptoException.java (96%) rename jms/core/src/main/java/de/taimos/dvalin/{jms => interconnect/core}/exceptions/SerializationException.java (96%) rename jms/core/src/main/java/de/taimos/dvalin/{jms => interconnect/core}/exceptions/TimeoutException.java (94%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f6ba147..dff97578 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # current master +* Major bug in interconnect core: DaemonScanner causes IllegalArgumentException due to wrong path of TimeoutException + +# 1.36 * Update dependencies * Spring 5.3.39 * AWS 1.12.772 diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/AToTopicSender.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/AToTopicSender.java index fcd255a2..8b12df02 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/AToTopicSender.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/AToTopicSender.java @@ -23,9 +23,9 @@ import de.taimos.dvalin.interconnect.core.daemon.util.DaemonExceptionMapper; import de.taimos.dvalin.interconnect.model.service.DaemonError; import de.taimos.dvalin.jms.IJmsConnector; -import de.taimos.dvalin.jms.exceptions.InfrastructureException; -import de.taimos.dvalin.jms.exceptions.SerializationException; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; +import de.taimos.dvalin.interconnect.core.exceptions.SerializationException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; import de.taimos.dvalin.jms.model.JmsContext.JmsContextBuilder; import de.taimos.dvalin.jms.model.JmsTarget; import org.slf4j.Logger; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/EventSender.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/EventSender.java index f0c61592..102b6abd 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/EventSender.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/EventSender.java @@ -24,7 +24,7 @@ import de.taimos.dvalin.interconnect.model.event.IEvent; import de.taimos.dvalin.interconnect.model.service.DaemonError; import de.taimos.dvalin.jms.IJmsConnector; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; import org.springframework.core.annotation.AnnotationUtils; import java.io.Serializable; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/IToTopicSender.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/IToTopicSender.java index 6fa1373e..4396526a 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/IToTopicSender.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/IToTopicSender.java @@ -1,7 +1,7 @@ package de.taimos.dvalin.interconnect.core; import de.taimos.dvalin.interconnect.model.service.DaemonError; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; import java.io.Serializable; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/IVORefreshSender.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/IVORefreshSender.java index 330ac1e5..17c7a6b6 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/IVORefreshSender.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/IVORefreshSender.java @@ -25,7 +25,7 @@ import de.taimos.dvalin.interconnect.model.service.DaemonError; import de.taimos.dvalin.jms.IJmsConnector; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; import java.io.Serializable; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/IDaemonMessageSender.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/IDaemonMessageSender.java index 2064ac6a..98acad09 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/IDaemonMessageSender.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/IDaemonMessageSender.java @@ -22,7 +22,7 @@ import de.taimos.dvalin.interconnect.core.daemon.model.InterconnectContext; import de.taimos.dvalin.interconnect.model.service.DaemonError; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; import java.util.concurrent.Future; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/handler/ADaemonMessageHandler.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/handler/ADaemonMessageHandler.java index ff06024c..d0deacfe 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/handler/ADaemonMessageHandler.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/handler/ADaemonMessageHandler.java @@ -41,7 +41,7 @@ import de.taimos.dvalin.interconnect.model.service.DaemonScanner.DaemonMethod; import de.taimos.dvalin.interconnect.model.service.IDaemonHandler; import de.taimos.dvalin.jms.crypto.ICryptoService; -import de.taimos.dvalin.jms.exceptions.MessageCryptoException; +import de.taimos.dvalin.interconnect.core.exceptions.MessageCryptoException; import org.slf4j.Logger; import javax.jms.JMSException; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/jms/InterconnectMessageSender.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/jms/InterconnectMessageSender.java index 17489ffb..2a38f877 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/jms/InterconnectMessageSender.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/jms/InterconnectMessageSender.java @@ -37,9 +37,9 @@ import de.taimos.dvalin.jms.IJmsConnector; import de.taimos.dvalin.jms.exceptions.CreationException; import de.taimos.dvalin.jms.exceptions.CreationException.Source; -import de.taimos.dvalin.jms.exceptions.InfrastructureException; -import de.taimos.dvalin.jms.exceptions.SerializationException; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; +import de.taimos.dvalin.interconnect.core.exceptions.SerializationException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; import de.taimos.dvalin.jms.model.JmsResponseContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectContext.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectContext.java index dc13ecf6..2ddf4f12 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectContext.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectContext.java @@ -3,7 +3,7 @@ import com.google.common.base.Preconditions; import de.taimos.dvalin.interconnect.model.InterconnectMapper; import de.taimos.dvalin.interconnect.model.InterconnectObject; -import de.taimos.dvalin.jms.exceptions.InfrastructureException; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; import de.taimos.dvalin.jms.model.JmsContext; import de.taimos.dvalin.jms.model.JmsTarget; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectResponseContext.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectResponseContext.java index ed7ce40e..88aa4076 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectResponseContext.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectResponseContext.java @@ -25,7 +25,7 @@ import de.taimos.dvalin.interconnect.model.InterconnectMapper; import de.taimos.dvalin.interconnect.model.InterconnectObject; import de.taimos.dvalin.interconnect.model.service.DaemonScanner.DaemonMethod; -import de.taimos.dvalin.jms.exceptions.InfrastructureException; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; import de.taimos.dvalin.jms.model.JmsResponseContext; import de.taimos.dvalin.jms.model.JmsTarget; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/ADaemonProxyFactory.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/ADaemonProxyFactory.java index 8c8ba620..760eff3b 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/ADaemonProxyFactory.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/ADaemonProxyFactory.java @@ -25,7 +25,7 @@ import de.taimos.dvalin.interconnect.core.daemon.util.DaemonMethodInvocationHandler; import de.taimos.dvalin.interconnect.model.service.DaemonError; import de.taimos.dvalin.interconnect.model.service.IDaemon; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; /** * Copyright 2015 Taimos GmbH
diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/DefaultDaemonProxyFactory.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/DefaultDaemonProxyFactory.java index 72b52411..60956ff0 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/DefaultDaemonProxyFactory.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/DefaultDaemonProxyFactory.java @@ -24,7 +24,7 @@ import de.taimos.dvalin.interconnect.core.daemon.model.InterconnectContext; import de.taimos.dvalin.interconnect.core.daemon.util.DaemonExceptionMapper; import de.taimos.dvalin.interconnect.model.service.DaemonError; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonExceptionMapper.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonExceptionMapper.java index f5e8c5a8..f94cd06c 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonExceptionMapper.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonExceptionMapper.java @@ -8,10 +8,10 @@ import de.taimos.dvalin.jms.exceptions.CommunicationFailureException.CommunicationError; import de.taimos.dvalin.jms.exceptions.CreationException; import de.taimos.dvalin.jms.exceptions.CreationException.Source; -import de.taimos.dvalin.jms.exceptions.InfrastructureException; -import de.taimos.dvalin.jms.exceptions.MessageCryptoException; -import de.taimos.dvalin.jms.exceptions.SerializationException; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; +import de.taimos.dvalin.interconnect.core.exceptions.MessageCryptoException; +import de.taimos.dvalin.interconnect.core.exceptions.SerializationException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; /** * Copyright 2024 Cinovo AG
diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonMethodInvocationHandler.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonMethodInvocationHandler.java index 51477abe..a2103c92 100644 --- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonMethodInvocationHandler.java +++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonMethodInvocationHandler.java @@ -9,7 +9,7 @@ import de.taimos.dvalin.interconnect.model.service.DaemonScanner; import de.taimos.dvalin.interconnect.model.service.DaemonScanner.DaemonMethod; import de.taimos.dvalin.interconnect.model.service.IDaemon; -import de.taimos.dvalin.jms.exceptions.InfrastructureException; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; import de.taimos.dvalin.jms.model.JmsTarget; import java.lang.reflect.InvocationHandler; diff --git a/jms/activemq-classic/src/main/java/de/taimos/dvalin/jms/activemq/ActiveMqCryptoService.java b/jms/activemq-classic/src/main/java/de/taimos/dvalin/jms/activemq/ActiveMqCryptoService.java index 8f842acd..a39bbcce 100644 --- a/jms/activemq-classic/src/main/java/de/taimos/dvalin/jms/activemq/ActiveMqCryptoService.java +++ b/jms/activemq-classic/src/main/java/de/taimos/dvalin/jms/activemq/ActiveMqCryptoService.java @@ -2,7 +2,7 @@ import de.taimos.dvalin.jms.crypto.ACryptoService; import de.taimos.dvalin.jms.crypto.JmsMessageCryptoUtil; -import de.taimos.dvalin.jms.exceptions.MessageCryptoException; +import de.taimos.dvalin.interconnect.core.exceptions.MessageCryptoException; import org.apache.activemq.command.ActiveMQTextMessage; import javax.jms.JMSException; diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/InfrastructureException.java b/jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/InfrastructureException.java similarity index 96% rename from jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/InfrastructureException.java rename to jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/InfrastructureException.java index a60f8cc2..bc2e797e 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/InfrastructureException.java +++ b/jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/InfrastructureException.java @@ -1,4 +1,4 @@ -package de.taimos.dvalin.jms.exceptions; +package de.taimos.dvalin.interconnect.core.exceptions; /* * #%L diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/MessageCryptoException.java b/jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/MessageCryptoException.java similarity index 96% rename from jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/MessageCryptoException.java rename to jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/MessageCryptoException.java index 31585766..a638ed55 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/MessageCryptoException.java +++ b/jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/MessageCryptoException.java @@ -1,4 +1,4 @@ -package de.taimos.dvalin.jms.exceptions; +package de.taimos.dvalin.interconnect.core.exceptions; /* * #%L diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/SerializationException.java b/jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/SerializationException.java similarity index 96% rename from jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/SerializationException.java rename to jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/SerializationException.java index 064b9db3..4b65abb9 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/SerializationException.java +++ b/jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/SerializationException.java @@ -1,4 +1,4 @@ -package de.taimos.dvalin.jms.exceptions; +package de.taimos.dvalin.interconnect.core.exceptions; /* * #%L diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/TimeoutException.java b/jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/TimeoutException.java similarity index 94% rename from jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/TimeoutException.java rename to jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/TimeoutException.java index 65f8bc2a..94a4d50d 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/TimeoutException.java +++ b/jms/core/src/main/java/de/taimos/dvalin/interconnect/core/exceptions/TimeoutException.java @@ -1,4 +1,4 @@ -package de.taimos.dvalin.jms.exceptions; +package de.taimos.dvalin.interconnect.core.exceptions; /* * #%L diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/IJmsConnector.java b/jms/core/src/main/java/de/taimos/dvalin/jms/IJmsConnector.java index 9e44b742..7a2a5041 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/IJmsConnector.java +++ b/jms/core/src/main/java/de/taimos/dvalin/jms/IJmsConnector.java @@ -20,8 +20,8 @@ * #L% */ -import de.taimos.dvalin.jms.exceptions.InfrastructureException; -import de.taimos.dvalin.jms.exceptions.SerializationException; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; +import de.taimos.dvalin.interconnect.core.exceptions.SerializationException; import de.taimos.dvalin.jms.model.JmsContext; import de.taimos.dvalin.jms.model.JmsResponseContext; diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/JmsConnector.java b/jms/core/src/main/java/de/taimos/dvalin/jms/JmsConnector.java index 9902f1e3..79751853 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/JmsConnector.java +++ b/jms/core/src/main/java/de/taimos/dvalin/jms/JmsConnector.java @@ -5,9 +5,9 @@ import de.taimos.dvalin.jms.exceptions.CommunicationFailureException.CommunicationError; import de.taimos.dvalin.jms.exceptions.CreationException; import de.taimos.dvalin.jms.exceptions.CreationException.Source; -import de.taimos.dvalin.jms.exceptions.InfrastructureException; -import de.taimos.dvalin.jms.exceptions.SerializationException; -import de.taimos.dvalin.jms.exceptions.TimeoutException; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; +import de.taimos.dvalin.interconnect.core.exceptions.SerializationException; +import de.taimos.dvalin.interconnect.core.exceptions.TimeoutException; import de.taimos.dvalin.jms.model.JmsContext; import de.taimos.dvalin.jms.model.JmsResponseContext; import org.slf4j.Logger; diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/ACryptoService.java b/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/ACryptoService.java index 0138a7ac..ee0258a7 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/ACryptoService.java +++ b/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/ACryptoService.java @@ -1,6 +1,6 @@ package de.taimos.dvalin.jms.crypto; -import de.taimos.dvalin.jms.exceptions.MessageCryptoException; +import de.taimos.dvalin.interconnect.core.exceptions.MessageCryptoException; import javax.jms.JMSException; import javax.jms.Message; diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/ICryptoService.java b/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/ICryptoService.java index 0521ab26..27a7c655 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/ICryptoService.java +++ b/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/ICryptoService.java @@ -1,6 +1,6 @@ package de.taimos.dvalin.jms.crypto; -import de.taimos.dvalin.jms.exceptions.MessageCryptoException; +import de.taimos.dvalin.interconnect.core.exceptions.MessageCryptoException; import javax.jms.JMSException; import javax.jms.Message; diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/JmsMessageCryptoUtil.java b/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/JmsMessageCryptoUtil.java index 7a941c25..c2034501 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/JmsMessageCryptoUtil.java +++ b/jms/core/src/main/java/de/taimos/dvalin/jms/crypto/JmsMessageCryptoUtil.java @@ -20,7 +20,7 @@ * #L% */ -import de.taimos.dvalin.jms.exceptions.MessageCryptoException; +import de.taimos.dvalin.interconnect.core.exceptions.MessageCryptoException; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/CommunicationFailureException.java b/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/CommunicationFailureException.java index beb9d18d..c3c85b49 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/CommunicationFailureException.java +++ b/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/CommunicationFailureException.java @@ -1,5 +1,7 @@ package de.taimos.dvalin.jms.exceptions; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; + /** * Copyright 2024 Cinovo AG
*
diff --git a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/CreationException.java b/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/CreationException.java index 8cf935fd..f42aa984 100644 --- a/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/CreationException.java +++ b/jms/core/src/main/java/de/taimos/dvalin/jms/exceptions/CreationException.java @@ -1,5 +1,7 @@ package de.taimos.dvalin.jms.exceptions; +import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException; + /** * Copyright 2024 Cinovo AG
*
diff --git a/jms/core/src/test/java/de/taimos/dvalin/jms/crypto/MessageCryptoUtilTest.java b/jms/core/src/test/java/de/taimos/dvalin/jms/crypto/MessageCryptoUtilTest.java index 9d5c8678..ee3e9a90 100644 --- a/jms/core/src/test/java/de/taimos/dvalin/jms/crypto/MessageCryptoUtilTest.java +++ b/jms/core/src/test/java/de/taimos/dvalin/jms/crypto/MessageCryptoUtilTest.java @@ -23,7 +23,7 @@ * #L% */ -import de.taimos.dvalin.jms.exceptions.MessageCryptoException; +import de.taimos.dvalin.interconnect.core.exceptions.MessageCryptoException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test;