Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DATAGO-89778: upgrade solace-integration-test-support to 2.0.0 #346

Merged
merged 2 commits into from
Jan 23, 2025
Merged

DATAGO-89778: upgrade solace-integration-test-support to 2.0.0 #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
745dabd
upgrade solace-integration-test-support to 2.0.0
Nephery Jan 9, 2025
c7ff7cc
fix SempV2Client param order
Nephery Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<solace.spring.cloud.stream-starter.version>5.6.1-SNAPSHOT</solace.spring.cloud.stream-starter.version>

<solace.integration.test.support.version>1.1.2</solace.integration.test.support.version>
<solace.integration.test.support.version>2.0.0</solace.integration.test.support.version>
<solace.integration.test.support.fetch_checkout.skip>false</solace.integration.test.support.fetch_checkout.skip>
<solace.integration.test.support.install.skip>true</solace.integration.test.support.install.skip>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion solace-integration-test-support
Open in desktop
Submodule solace-integration-test-support updated 14 files
+3 −1 .github/dependabot.yml
+2 −2 .github/workflows/build-test.yml
+35 −6 .github/workflows/release.yml
+1 −1 .github/workflows/snapshot-release.yml
+12 −26 junit-jupiter/pom.xml
+46 −40 pom.xml
+3 −3 semp-client/README.md
+157 −240 semp-client/pom.xml
+0 −4 semp-client/src/main/java/com/solace/test/integration/semp/v2/SempV2Api.java
+3,178 −732 semp-client/src/main/resources/semp-v2-swagger-action.json
+21,644 −5,824 semp-client/src/main/resources/semp-v2-swagger-config.json
+22,439 −9,100 semp-client/src/main/resources/semp-v2-swagger-monitor.json
+3 −3 semp-client/src/test/java/com/solace/test/integration/semp/v2/SempV2ApiIT.java
+0 −9 testcontainer/pom.xml
26 changes: 16 additions & 10 deletions ...spring/cloud/stream/binder/inbound/acknowledge/JCSMPAcknowledgementCallbackFactoryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,10 @@ public void testRejectFail(@Values(ints = {1, 255}) int numMessages,
messageContainers, flowReceiverContainer.getTransactedSession());

LOGGER.info("Disabling egress for queue {}", queue.getName());
sempV2Api.config().updateMsgVpnQueue((String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
queue.getName(), new ConfigMsgVpnQueue().egressEnabled(false), null, null);
sempV2Api.config().updateMsgVpnQueue(
new ConfigMsgVpnQueue().egressEnabled(false),
(String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
queue.getName(), null, null);
retryAssert(() -> assertFalse(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, queue.getName(), null)
.getData()
Expand All @@ -213,8 +215,9 @@ public void testRejectFail(@Values(ints = {1, 255}) int numMessages,
.isGreaterThan(1);

LOGGER.info("Enabling egress for queue {}", queue.getName());
sempV2Api.config().updateMsgVpnQueue((String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
queue.getName(), new ConfigMsgVpnQueue().egressEnabled(true), null, null);
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().egressEnabled(true),
(String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
queue.getName(), null, null);
retryAssert(() -> assertTrue(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, queue.getName(), null)
.getData()
Expand Down Expand Up @@ -275,8 +278,9 @@ public void testRejectWithErrorQueueFail(@Values(ints = {1, 255}) int numMessage
messageContainers, flowReceiverContainer.getTransactedSession());

LOGGER.info("Disabling ingress for error queue {}", errorQueueInfrastructure.getErrorQueueName());
sempV2Api.config().updateMsgVpnQueue((String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
errorQueueInfrastructure.getErrorQueueName(), new ConfigMsgVpnQueue().ingressEnabled(false), null, null);
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().ingressEnabled(false),
(String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
errorQueueInfrastructure.getErrorQueueName(), null, null);
retryAssert(() -> assertFalse(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, errorQueueInfrastructure.getErrorQueueName(), null)
.getData()
Expand Down Expand Up @@ -347,8 +351,9 @@ public void testRequeueFail(@Values(ints = {1, 255}) int numMessages,
messageContainers, flowReceiverContainer.getTransactedSession());

LOGGER.info("Disabling egress for queue {}", queue.getName());
sempV2Api.config().updateMsgVpnQueue((String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
queue.getName(), new ConfigMsgVpnQueue().egressEnabled(false), null, null);
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().egressEnabled(false),
(String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
queue.getName(), null, null);
retryAssert(() -> assertFalse(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, queue.getName(), null)
.getData()
Expand All @@ -368,8 +373,9 @@ public void testRequeueFail(@Values(ints = {1, 255}) int numMessages,
.isGreaterThan(1);

LOGGER.info("Enabling egress for queue {}", queue.getName());
sempV2Api.config().updateMsgVpnQueue((String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
queue.getName(), new ConfigMsgVpnQueue().egressEnabled(true), null, null);
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().egressEnabled(true),
(String) jcsmpSession.getProperty(JCSMPProperties.VPN_NAME),
queue.getName(), null, null);
retryAssert(() -> assertTrue(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, queue.getName(), null)
.getData()
Expand Down
8 changes: 4 additions & 4 deletions .../java/com/solace/spring/cloud/stream/binder/util/ErrorQueueRepublishCorrelationKeyIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ public void testHandleErrorAsyncRetry(boolean isDurable, JCSMPSession jcsmpSessi
ErrorQueueRepublishCorrelationKey key = createKey(messageContainer, flowReceiverContainer);

LOGGER.info("Shutting down ingress for queue {}", errorQueue.getName());
sempV2Api.config().updateMsgVpnQueue(vpnName, errorQueue.getName(),
new ConfigMsgVpnQueue().ingressEnabled(false), null, null);
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().ingressEnabled(false), vpnName,
errorQueue.getName(), null, null);
retryAssert(() -> assertFalse(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, errorQueue.getName(), null)
.getData()
Expand All @@ -182,8 +182,8 @@ public void testHandleErrorAsyncRetry(boolean isDurable, JCSMPSession jcsmpSessi
Mockito.doAnswer(invocation -> {
if (key.getErrorQueueDeliveryAttempt() == errorQueueInfrastructure.getMaxDeliveryAttempts()) {
LOGGER.info("Starting ingress for queue {}", errorQueue.getName());
sempV2Api.config().updateMsgVpnQueue(vpnName, errorQueue.getName(),
new ConfigMsgVpnQueue().ingressEnabled(true), null, null);
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().ingressEnabled(true),
vpnName, errorQueue.getName(), null, null);
retryAssert(() -> assertTrue(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, errorQueue.getName(), null)
.getData()
Expand Down
12 changes: 6 additions & 6 deletions ...ore/src/test/java/com/solace/spring/cloud/stream/binder/util/FlowReceiverContainerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ public void testReceiveInterruptedByFlowReconnect(@Values(booleans = {false, tru
assertFalse(receiveFuture.isDone());

logger.info(String.format("Disabling egress to queue %s", queue.getName()));
sempV2Api.config().updateMsgVpnQueue(vpnName, queue.getName(), new ConfigMsgVpnQueue().egressEnabled(false),
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().egressEnabled(false), vpnName, queue.getName(),
null, null);
retryAssert(() -> assertFalse(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, queue.getName(), null)
Expand All @@ -783,7 +783,7 @@ public void testReceiveInterruptedByFlowReconnect(@Values(booleans = {false, tru
producer.send(JCSMPFactory.onlyInstance().createMessage(TextMessage.class), queue);

logger.info(String.format("Enabling egress to queue %s", queue.getName()));
sempV2Api.config().updateMsgVpnQueue(vpnName, queue.getName(), new ConfigMsgVpnQueue().egressEnabled(true),
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().egressEnabled(true), vpnName, queue.getName(),
null, null);
retryAssert(() -> assertTrue(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, queue.getName(), null)
Expand Down Expand Up @@ -818,7 +818,7 @@ public void testReceiveInterruptedBySessionReconnect(@Values(booleans = {false,
assertFalse(receiveFuture.isDone());

logger.info(String.format("Remotely disconnecting client %s", clientName));
sempV2Api.action().doMsgVpnClientDisconnect(vpnName, clientName, new ActionMsgVpnClientDisconnect());
sempV2Api.action().doMsgVpnClientDisconnect(new ActionMsgVpnClientDisconnect(), vpnName, clientName);
Thread.sleep(TimeUnit.SECONDS.toMillis(5));

logger.info(String.format("Sending message to queue %s", queue.getName()));
Expand Down Expand Up @@ -870,7 +870,7 @@ public void testAcknowledgeAfterFlowReconnect(JCSMPSession jcsmpSession, Queue q
assertNotNull(receivedMessage);

logger.info(String.format("Disabling egress to queue %s", queue.getName()));
sempV2Api.config().updateMsgVpnQueue(vpnName, queue.getName(), new ConfigMsgVpnQueue().egressEnabled(false),
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().egressEnabled(false), vpnName, queue.getName(),
null, null);
retryAssert(() -> assertFalse(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, queue.getName(), null)
Expand All @@ -880,7 +880,7 @@ public void testAcknowledgeAfterFlowReconnect(JCSMPSession jcsmpSession, Queue q
Thread.sleep(TimeUnit.SECONDS.toMillis(1));

logger.info(String.format("Enabling egress to queue %s", queue.getName()));
sempV2Api.config().updateMsgVpnQueue(vpnName, queue.getName(), new ConfigMsgVpnQueue().egressEnabled(true),
sempV2Api.config().updateMsgVpnQueue(new ConfigMsgVpnQueue().egressEnabled(true), vpnName, queue.getName(),
null, null);
retryAssert(() -> assertTrue(sempV2Api.monitor()
.getMsgVpnQueue(vpnName, queue.getName(), null)
Expand Down Expand Up @@ -920,7 +920,7 @@ public void testAcknowledgeAfterSessionReconnect(boolean isDurable, JCSMPSession
String clientName = (String) jcsmpSession.getProperty(JCSMPProperties.CLIENT_NAME);

logger.info(String.format("Remotely disconnecting client %s", clientName));
sempV2Api.action().doMsgVpnClientDisconnect(vpnName, clientName, new ActionMsgVpnClientDisconnect());
sempV2Api.action().doMsgVpnClientDisconnect(new ActionMsgVpnClientDisconnect(), vpnName, clientName);
Thread.sleep(TimeUnit.SECONDS.toMillis(5));

logger.info(String.format("Acknowledging message %s", receivedMessage.getMessage().getMessageId()));
Expand Down
Loading
Loading