Fix failing tests

SolaceLabs · Jul 17, 2024 · 51a205b · 51a205b
1 parent b6aa984
commit 51a205b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...c/main/java/com/solace/quarkus/messaging/incoming/SolaceDirectMessageIncomingChannel.java b/...c/main/java/com/solace/quarkus/messaging/incoming/SolaceDirectMessageIncomingChannel.java
@@ -83,9 +83,6 @@ public SolaceDirectMessageIncomingChannel(Vertx vertx, SolaceConnectorIncomingCo
 
         boolean lazyStart = ic.getClientLazyStart();
         this.ackHandler = null;
-        if (ic.getConsumerErrorTopic().isEmpty()) {
-            throw ex.illegalArgumentInvalidFailureStrategy(SolaceFailureHandler.Strategy.ERROR_TOPIC.name());
-        }
         this.failureHandler = createFailureHandler(ic, solace);
 
         // TODO Here use a subscription receiver.receiveAsync with an internal queue
@@ -161,6 +158,9 @@ private SolaceFailureHandler createFailureHandler(SolaceConnectorIncomingConfigu
             case IGNORE:
                 return new SolaceIgnoreFailure(ic.getChannel());
             case ERROR_TOPIC:
+                if (ic.getConsumerErrorTopic().isEmpty()) {
+                    throw ex.illegalArgumentInvalidFailureStrategy(strategy);
+                }
                 return new SolaceErrorTopic(ic.getChannel(), ic.getConsumerErrorTopic().get(),
                         ic.getConsumerErrorMessageDmqEligible(), ic.getConsumerErrorMessageTtl().orElse(null),
                         ic.getConsumerErrorMessageMaxDeliveryAttempts(), null, solace);

diff --git a/...or/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceIncomingChannel.java b/...or/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceIncomingChannel.java
@@ -105,9 +105,6 @@ public SolaceIncomingChannel(Vertx vertx, SolaceConnectorIncomingConfiguration i
         this.receiver = builder.build(getQueue(ic));
         boolean lazyStart = ic.getClientLazyStart();
         this.ackHandler = new SolaceAckHandler(receiver);
-        if (ic.getConsumerErrorTopic().isEmpty()) {
-            throw ex.illegalArgumentInvalidFailureStrategy(SolaceFailureHandler.Strategy.ERROR_TOPIC.name());
-        }
         this.failureHandler = createFailureHandler(ic, solace);
 
         // TODO Here use a subscription receiver.receiveAsync with an internal queue
@@ -186,6 +183,9 @@ private SolaceFailureHandler createFailureHandler(SolaceConnectorIncomingConfigu
             case DISCARD:
                 return new SolaceDiscard(ic.getChannel(), receiver);
             case ERROR_TOPIC:
+                if (ic.getConsumerErrorTopic().isEmpty()) {
+                    throw ex.illegalArgumentInvalidFailureStrategy(strategy);
+                }
                 return new SolaceErrorTopic(ic.getChannel(), ic.getConsumerErrorTopic().get(),
                         ic.getConsumerErrorMessageDmqEligible(), ic.getConsumerErrorMessageTtl().orElse(null),
                         ic.getConsumerErrorMessageMaxDeliveryAttempts(), null, solace);