Merge pull request #176 from cinovo/eventsenderbugfix

Eventsenderbugfix

Author: YukiInu

CHANGELOG.md

@@ -16,9 +16,11 @@
     * Nimbus JOSE+JWT 10.3
     * Swagger 2.2.40
     * Velocity Engine 2.4.1
-* Fixing DaemonExceptionMapper 
-* Fixing problem with retry messages in Interconnect
-* Better error handling in CloudconductorPropertyProvider
+* Bugfix: Fixing DaemonExceptionMapper
+* Bugfix: Serialize EventSender messages to json
+* Bugfix: Fixes problem with events time to live set to 10 seconds
+* Bugfix: Fixing problem with retry messages in Interconnect
+* Bugfix: Better error handling in CloudconductorPropertyProvider
 * Fixed vulnerabilities: CVE-2024-13009(Jetty), CVE-2025-23184(Apache CXF), CVE-2024-57699 (Json-smart),CVE-2025-27533 (ActiveMQ)
 
 # 1.37

interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/AToTopicSender.java

@@ -54,12 +54,16 @@ protected AToTopicSender(IJmsConnector jmsConnector) {
      * @throws DaemonError is throw if there is a problem with sending the event
      */
     public void send(Serializable object, String topicName) throws DaemonError, TimeoutException {
+        this.send(object, topicName, IJmsConnector.REQUEST_TIMEOUT);
+    }
+
+    public void send(Serializable object, String topicName, Long timeout) throws DaemonError, TimeoutException {
         if (topicName == null) {
             this.logger.error("Invalid topic name: a non-null name is required");
             throw new IllegalArgumentException("Invalid topic name: a non-null name is required");
         }
         JmsContextBuilder context = new JmsContextBuilder().withTarget(JmsTarget.TOPIC)
-            .withDestinationName(topicName).withBody(object);
+            .withDestinationName(topicName).withTimeToLive(timeout, null).withBody(object);
 
         try {
             this.jmsConnector.send(context.build());

interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/EventSender.java

@@ -20,13 +20,20 @@
  * #L%
  */
 
+import de.taimos.dvalin.interconnect.core.daemon.util.DaemonExceptionMapper;
+import de.taimos.dvalin.interconnect.core.exceptions.InfrastructureException;
+import de.taimos.dvalin.interconnect.core.exceptions.SerializationException;
+import de.taimos.dvalin.interconnect.model.InterconnectMapper;
 import de.taimos.dvalin.interconnect.model.event.EventDomain;
 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.interconnect.core.exceptions.TimeoutException;
+import de.taimos.dvalin.jms.model.JmsContext.JmsContextBuilder;
+import de.taimos.dvalin.jms.model.JmsTarget;
 import org.springframework.core.annotation.AnnotationUtils;
 
+import java.io.IOException;
 import java.io.Serializable;
 
 /**
@@ -54,10 +61,14 @@ public EventSender(IJmsConnector jmsConnector) {
 
     @Override
     public void send(Serializable object, String topicName) throws DaemonError, TimeoutException {
-        if (object instanceof IEvent) {
-            this.send((IEvent) object);
-        } else {
-            super.send(object, topicName);
+        try {
+            if (object instanceof IEvent) {
+                super.send(InterconnectMapper.toJson((IEvent) object), topicName, 0L);
+            } else {
+                super.send(object, topicName);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -67,15 +78,19 @@ public void send(Serializable object, String topicName) throws DaemonError, Time
      * @throws TimeoutException in case of communication timeout
      */
     public void send(IEvent object) throws DaemonError, TimeoutException {
+        this.send(object, getTopicName(object));
+    }
+
+    private String getTopicName(IEvent object){
         EventDomain domainAnnotation = AnnotationUtils.findAnnotation(object.getClass(), EventDomain.class);
         if (domainAnnotation == null) {
             this.logger.error("The event {} has no domain annotation", object.getClass().getSimpleName());
-            return;
+            return null;
         }
         if (domainAnnotation.value().isEmpty()) {
             this.logger.error("The domainname for the event {} is empty", object.getClass().getSimpleName());
-            return;
+            return null;
         }
-        super.send(object, this.virtualTopicPrefix + "." + domainAnnotation.value());
+        return this.virtualTopicPrefix + "." + domainAnnotation.value();
     }
 }