Merge pull request #172 from cinovo/timeoutexceptionproblem

timeoutexception problem with daemonscanner
taimos · Jan 10, 2025 · 8674869 · 8674869
2 parents 7ae1f5e + bf8c877
commit 8674869
Show file tree

Hide file tree

Showing 27 changed files with 41 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...ct/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/IDaemonMessageSender.java b/...ct/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/...rc/main/java/de/taimos/dvalin/interconnect/core/daemon/handler/ADaemonMessageHandler.java b/...rc/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/...rc/main/java/de/taimos/dvalin/interconnect/core/daemon/jms/InterconnectMessageSender.java b/...rc/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/...re/src/main/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectContext.java b/...re/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/...ain/java/de/taimos/dvalin/interconnect/core/daemon/model/InterconnectResponseContext.java b/...ain/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/...re/src/main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/ADaemonProxyFactory.java b/...re/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<br>

diff --git a/.../main/java/de/taimos/dvalin/interconnect/core/daemon/proxy/DefaultDaemonProxyFactory.java b/.../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/...e/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonExceptionMapper.java b/...e/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<br>

diff --git a/...in/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonMethodInvocationHandler.java b/...in/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
@@ -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/...s/exceptions/InfrastructureException.java → ...e/exceptions/InfrastructureException.java b/...s/exceptions/InfrastructureException.java → ...e/exceptions/InfrastructureException.java
@@ -1,4 +1,4 @@
-package de.taimos.dvalin.jms.exceptions;
+package de.taimos.dvalin.interconnect.core.exceptions;
 
 /*
  * #%L

diff --git a/...ms/exceptions/MessageCryptoException.java → ...re/exceptions/MessageCryptoException.java b/...ms/exceptions/MessageCryptoException.java → ...re/exceptions/MessageCryptoException.java
@@ -1,4 +1,4 @@
-package de.taimos.dvalin.jms.exceptions;
+package de.taimos.dvalin.interconnect.core.exceptions;
 
 /*
  * #%L

diff --git a/...ms/exceptions/SerializationException.java → ...re/exceptions/SerializationException.java b/...ms/exceptions/SerializationException.java → ...re/exceptions/SerializationException.java
@@ -1,4 +1,4 @@
-package de.taimos.dvalin.jms.exceptions;
+package de.taimos.dvalin.interconnect.core.exceptions;
 
 /*
  * #%L

diff --git a/...alin/jms/exceptions/TimeoutException.java → ...ect/core/exceptions/TimeoutException.java b/...alin/jms/exceptions/TimeoutException.java → ...ect/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,7 @@
 package de.taimos.dvalin.jms.exceptions;
 
+import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException;
+
 /**
  * Copyright 2024 Cinovo AG<br>
  * <br>

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
@@ -1,5 +1,7 @@
 package de.taimos.dvalin.jms.exceptions;
 
+import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException;
+
 /**
  * Copyright 2024 Cinovo AG<br>
  * <br>

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
@@ -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;