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-84854: Use ProducerFlowProperties constructor that supports full session pass-through #340

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

DATAGO-84854: Use ProducerFlowProperties constructor that supports full session pass-through #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a89b78c
use ProducerFlowProperties constructor that supports full session pas…
Nephery Nov 19, 2024
6395c29
update test integration sub-module
Nephery Nov 19, 2024
4a59454
fix jakarta imports
Nephery Nov 19, 2024
a68a3b6
fix test failure
Nephery Nov 19, 2024
4717e4c
update IT infra
Nephery Nov 19, 2024
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 solace-integration-test-support
Open in desktop
Submodule solace-integration-test-support updated 12 files
+3 −1 .github/dependabot.yml
+35 −6 .github/workflows/release.yml
+1 −1 .github/workflows/snapshot-release.yml
+12 −16 junit-jupiter/pom.xml
+42 −40 pom.xml
+3 −3 semp-client/README.md
+189 −237 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
2 changes: 1 addition & 1 deletion solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

<dependency>
<groupId>com.solacesystems</groupId>
<artifactId>sol-jms</artifactId>
<artifactId>sol-jms-jakarta</artifactId>
<version>${solace.jms.version}</version>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 6 additions & 2 deletions ...main/java/com/solace/spring/cloud/stream/binder/outbound/JCSMPOutboundMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.solacesystems.jcsmp.Destination;
import com.solacesystems.jcsmp.JCSMPException;
import com.solacesystems.jcsmp.JCSMPFactory;
import com.solacesystems.jcsmp.JCSMPProperties;
import com.solacesystems.jcsmp.JCSMPSession;
import com.solacesystems.jcsmp.JCSMPStreamingPublishCorrelatingEventHandler;
import com.solacesystems.jcsmp.Topic;
Expand Down Expand Up @@ -48,6 +49,7 @@ public class JCSMPOutboundMessageHandler implements MessageHandler, Lifecycle {
private final DestinationType configDestinationType;
private final Destination configDestination;
private final JCSMPSession jcsmpSession;
private final JCSMPProperties jcsmpProperties;
private final MessageChannel errorChannel;
private final JCSMPSessionProducerManager producerManager;
private final ExtendedProducerProperties<SolaceProducerProperties> properties;
Expand All @@ -63,6 +65,7 @@ public class JCSMPOutboundMessageHandler implements MessageHandler, Lifecycle {

public JCSMPOutboundMessageHandler(ProducerDestination destination,
JCSMPSession jcsmpSession,
JCSMPProperties jcsmpProperties,
MessageChannel errorChannel,
JCSMPSessionProducerManager producerManager,
ExtendedProducerProperties<SolaceProducerProperties> properties,
Expand All @@ -72,6 +75,7 @@ public JCSMPOutboundMessageHandler(ProducerDestination destination,
JCSMPFactory.onlyInstance().createTopic(destination.getName()) :
JCSMPFactory.onlyInstance().createQueue(destination.getName());
this.jcsmpSession = jcsmpSession;
this.jcsmpProperties = jcsmpProperties;
this.errorChannel = errorChannel;
this.producerManager = producerManager;
this.properties = properties;
Expand Down Expand Up @@ -239,10 +243,10 @@ public void start() {
if (properties.getExtension().isTransacted()) {
LOGGER.info("Creating transacted session <message handler ID: {}>", id);
transactedSession = jcsmpSession.createTransactedSession();
producer = transactedSession.createProducer(SolaceProvisioningUtil.getProducerFlowProperties(jcsmpSession),
producer = transactedSession.createProducer(SolaceProvisioningUtil.getProducerFlowProperties(jcsmpProperties),
producerEventHandler);
} else {
producer = jcsmpSession.createProducer(SolaceProvisioningUtil.getProducerFlowProperties(jcsmpSession),
producer = jcsmpSession.createProducer(SolaceProvisioningUtil.getProducerFlowProperties(jcsmpProperties),
producerEventHandler);
}
} catch (Exception e) {
Expand Down
19 changes: 2 additions & 17 deletions .../main/java/com/solace/spring/cloud/stream/binder/provisioning/SolaceProvisioningUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.solacesystems.jcsmp.EndpointProperties;
import com.solacesystems.jcsmp.JCSMPFactory;
import com.solacesystems.jcsmp.JCSMPProperties;
import com.solacesystems.jcsmp.JCSMPSession;
import com.solacesystems.jcsmp.ProducerFlowProperties;
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
Expand Down Expand Up @@ -51,22 +50,8 @@ public static EndpointProperties getErrorQueueEndpointProperties(SolaceConsumerP
return endpointProperties;
}

public static ProducerFlowProperties getProducerFlowProperties(JCSMPSession jcsmpSession) {
ProducerFlowProperties producerFlowProperties = new ProducerFlowProperties();

// SOL-118898:
// PUB_ACK_WINDOW_SIZE & ACK_EVENT_MODE aren't automatically used as default values for
// ProducerFlowProperties.
Integer pubAckWindowSize = (Integer) jcsmpSession.getProperty(JCSMPProperties.PUB_ACK_WINDOW_SIZE);
if (pubAckWindowSize != null) {
producerFlowProperties.setWindowSize(pubAckWindowSize);
}
String ackEventMode = (String) jcsmpSession.getProperty(JCSMPProperties.ACK_EVENT_MODE);
if (ackEventMode != null) {
producerFlowProperties.setAckEventMode(ackEventMode);
}

return producerFlowProperties;
public static ProducerFlowProperties getProducerFlowProperties(JCSMPProperties jcsmpProperties) {
return new ProducerFlowProperties(jcsmpProperties);
}

public static ConsumerFlowProperties getConsumerFlowProperties(
Expand Down
8 changes: 6 additions & 2 deletions .../java/com/solace/spring/cloud/stream/binder/outbound/JCSMPOutboundMessageHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.cloud.stream.binder.BinderHeaders;
import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
Expand Down Expand Up @@ -69,6 +70,7 @@ public class JCSMPOutboundMessageHandlerTest {
private ArgumentCaptor<ProducerFlowProperties> producerFlowPropertiesCaptor;
private ExtendedProducerProperties<SolaceProducerProperties> producerProperties;
private JCSMPSessionProducerManager sessionProducerManager;
@Spy private JCSMPProperties jcsmpProperties = new JCSMPProperties();
@Mock private JCSMPSession session;
@Mock private TransactedSession transactedSession;
@Mock private XMLMessageProducer messageProducer;
Expand Down Expand Up @@ -105,6 +107,7 @@ public void init(@Mock MessageChannel errChannel,
messageHandler = new JCSMPOutboundMessageHandler(
dest,
session,
jcsmpProperties,
errChannel,
sessionProducerManager,
producerProperties,
Expand Down Expand Up @@ -500,6 +503,7 @@ public void test_dynamic_destinationName_with_destinationType_configured_on_mess
messageHandler = new JCSMPOutboundMessageHandler(
dest,
session,
jcsmpProperties,
null,
new JCSMPSessionProducerManager(session),
new ExtendedProducerProperties<>(producerProperties),
Expand Down Expand Up @@ -586,8 +590,8 @@ public void testJCSMPPropertiesInheritanceWorkaround(
@Values(strings = {
JCSMPProperties.SUPPORTED_ACK_EVENT_MODE_PER_MSG,
JCSMPProperties.SUPPORTED_ACK_EVENT_MODE_WINDOWED}) String ackEventMode) {
Mockito.when(session.getProperty(JCSMPProperties.PUB_ACK_WINDOW_SIZE)).thenReturn(pubAckWindowSize);
Mockito.when(session.getProperty(JCSMPProperties.ACK_EVENT_MODE)).thenReturn(ackEventMode);
jcsmpProperties.setProperty(JCSMPProperties.PUB_ACK_WINDOW_SIZE, pubAckWindowSize);
jcsmpProperties.setProperty(JCSMPProperties.ACK_EVENT_MODE, ackEventMode);
messageHandler.start();

assertThat(producerFlowPropertiesCaptor.getValue())
Expand Down
45 changes: 22 additions & 23 deletions ...der-core/src/test/java/com/solace/spring/cloud/stream/binder/util/JmsCompatibilityIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
import com.solacesystems.jcsmp.XMLMessageProducer;
import com.solacesystems.jms.SolConnectionFactory;
import com.solacesystems.jms.SolJmsUtility;
import jakarta.jms.Connection;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.ObjectMessage;
import jakarta.jms.Session;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.RandomUtils;
import org.assertj.core.api.SoftAssertions;
Expand All @@ -43,11 +48,6 @@
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.util.SerializationUtils;

import javax.jms.Connection;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.ObjectMessage;
import javax.jms.Session;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Enumeration;
Expand Down Expand Up @@ -281,20 +281,19 @@ public void testPayloadFromSpringToJms(SoftAssertions softly) throws Exception {
jmsConsumer.setMessageListener(msg -> {
LOGGER.info("Got message {}", msg);
try {
if (msg instanceof javax.jms.BytesMessage) {
javax.jms.BytesMessage bytesMessage = (javax.jms.BytesMessage) msg;
if (msg instanceof jakarta.jms.BytesMessage bytesMessage) {
byte[] payload = new byte[(int) bytesMessage.getBodyLength()];
softly.assertThat(bytesMessage.readBytes(payload)).isEqualTo(bytesMessage.getBodyLength());
softly.assertThat(payload).isEqualTo("test".getBytes());
processedMessageTypes.add(BytesMessage.class);
} else if (msg instanceof javax.jms.TextMessage) {
softly.assertThat(((javax.jms.TextMessage) msg).getText()).isEqualTo("test");
} else if (msg instanceof jakarta.jms.TextMessage textMessage) {
softly.assertThat(textMessage.getText()).isEqualTo("test");
processedMessageTypes.add(TextMessage.class);
} else if (msg instanceof javax.jms.StreamMessage) {
softly.assertThat(((javax.jms.StreamMessage) msg).readString()).isEqualTo("test");
} else if (msg instanceof jakarta.jms.StreamMessage streamMessage) {
softly.assertThat(streamMessage.readString()).isEqualTo("test");
processedMessageTypes.add(StreamMessage.class);
} else if (msg instanceof javax.jms.MapMessage) {
softly.assertThat(((javax.jms.MapMessage) msg).getString("test")).isEqualTo("test");
} else if (msg instanceof jakarta.jms.MapMessage mapMessage) {
softly.assertThat(mapMessage.getString("test")).isEqualTo("test");
processedMessageTypes.add(MapMessage.class);
} else {
throw new IllegalStateException(String.format("Message type %s has no test", msg.getClass()));
Expand Down Expand Up @@ -322,20 +321,20 @@ public void testPayloadFromSpringToJms(SoftAssertions softly) throws Exception {

@Test
public void testPayloadFromJmsToSpring(JCSMPSession jcsmpSession, SoftAssertions softly) throws Exception {
List<javax.jms.Message> messages = new ArrayList<>();
List<jakarta.jms.Message> messages = new ArrayList<>();

{
javax.jms.BytesMessage bytesMessage = jmsSession.createBytesMessage();
jakarta.jms.BytesMessage bytesMessage = jmsSession.createBytesMessage();
bytesMessage.writeBytes("test".getBytes());
messages.add(bytesMessage);

messages.add(jmsSession.createTextMessage("test"));

javax.jms.StreamMessage streamMessage = jmsSession.createStreamMessage();
jakarta.jms.StreamMessage streamMessage = jmsSession.createStreamMessage();
streamMessage.writeString("test");
messages.add(streamMessage);

javax.jms.MapMessage mapMessage = jmsSession.createMapMessage();
jakarta.jms.MapMessage mapMessage = jmsSession.createMapMessage();
mapMessage.setString("test", "test");
messages.add(mapMessage);
}
Expand All @@ -358,11 +357,11 @@ public void onReceive(BytesXMLMessage bytesXMLMessage) {
} else if (msg.getPayload() instanceof String) {
softly.assertThat(msg.getPayload()).isEqualTo("test");
processedMessageTypes.add(TextMessage.class);
} else if (msg.getPayload() instanceof SDTStream) {
softly.assertThat(((SDTStream) msg.getPayload()).readString()).isEqualTo("test");
} else if (msg.getPayload() instanceof SDTStream sdtStream) {
softly.assertThat(sdtStream.readString()).isEqualTo("test");
processedMessageTypes.add(StreamMessage.class);
} else if (msg.getPayload() instanceof SDTMap) {
softly.assertThat(((SDTMap) msg.getPayload()).getString("test")).isEqualTo("test");
} else if (msg.getPayload() instanceof SDTMap sdtMap) {
softly.assertThat(sdtMap.getString("test")).isEqualTo("test");
processedMessageTypes.add(MapMessage.class);
}
} catch (Exception e) {
Expand All @@ -379,7 +378,7 @@ public void onException(JCSMPException e) {}

jcsmpSession.addSubscription(JCSMPFactory.onlyInstance().createTopic(topicName));
messageConsumer.start();
for (javax.jms.Message message : messages) {
for (jakarta.jms.Message message : messages) {
jmsProducer.send(message);
}

Expand All @@ -402,7 +401,7 @@ public void testSerializedPayloadFromSpringToJms(SoftAssertions softly) throws E
try {
softly.assertThat(msg.getBooleanProperty(SolaceBinderHeaders.SERIALIZED_PAYLOAD)).isTrue();

javax.jms.BytesMessage bytesMessage = (javax.jms.BytesMessage) msg;
jakarta.jms.BytesMessage bytesMessage = (jakarta.jms.BytesMessage) msg;
byte[] receivedPayload = new byte[(int) bytesMessage.getBodyLength()];
bytesMessage.readBytes(receivedPayload);
softly.assertThat(SerializationUtils.deserialize(receivedPayload)).isEqualTo(payload);
Expand Down
10 changes: 7 additions & 3 deletions ...inder/src/main/java/com/solace/spring/cloud/stream/binder/SolaceMessageChannelBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.solacesystems.jcsmp.Context;
import com.solacesystems.jcsmp.Endpoint;
import com.solacesystems.jcsmp.EndpointProperties;
import com.solacesystems.jcsmp.JCSMPProperties;
import com.solacesystems.jcsmp.JCSMPSession;
import com.solacesystems.jcsmp.Queue;
import com.solacesystems.jcsmp.XMLMessage;
Expand Down Expand Up @@ -52,6 +53,7 @@ public class SolaceMessageChannelBinder
DisposableBean {

private final JCSMPSession jcsmpSession;
private final JCSMPProperties jcsmpProperties;
private final Context jcsmpContext;
private final JCSMPSessionProducerManager sessionProducerManager;
private final AtomicBoolean consumersRemoteStopFlag = new AtomicBoolean(false);
Expand All @@ -61,12 +63,13 @@ public class SolaceMessageChannelBinder
private static final SolaceMessageHeaderErrorMessageStrategy errorMessageStrategy = new SolaceMessageHeaderErrorMessageStrategy();
@Nullable private SolaceBinderHealthAccessor solaceBinderHealthAccessor;

public SolaceMessageChannelBinder(JCSMPSession jcsmpSession, SolaceEndpointProvisioner solaceEndpointProvisioner) {
this(jcsmpSession, null, solaceEndpointProvisioner);
public SolaceMessageChannelBinder(JCSMPSession jcsmpSession, JCSMPProperties jcsmpProperties, SolaceEndpointProvisioner solaceEndpointProvisioner) {
this(jcsmpSession, jcsmpProperties, null, solaceEndpointProvisioner);
}
public SolaceMessageChannelBinder(JCSMPSession jcsmpSession, Context jcsmpContext, SolaceEndpointProvisioner solaceEndpointProvisioner) {
public SolaceMessageChannelBinder(JCSMPSession jcsmpSession, JCSMPProperties jcsmpProperties, Context jcsmpContext, SolaceEndpointProvisioner solaceEndpointProvisioner) {
super(new String[0], solaceEndpointProvisioner);
this.jcsmpSession = jcsmpSession;
this.jcsmpProperties = jcsmpProperties;
this.jcsmpContext = jcsmpContext;
this.sessionProducerManager = new JCSMPSessionProducerManager(jcsmpSession);
}
Expand Down Expand Up @@ -94,6 +97,7 @@ protected MessageHandler createProducerMessageHandler(ProducerDestination destin
JCSMPOutboundMessageHandler handler = new JCSMPOutboundMessageHandler(
destination,
jcsmpSession,
jcsmpProperties,
errorChannel,
sessionProducerManager,
producerProperties,
Expand Down
2 changes: 1 addition & 1 deletion ...com/solace/spring/cloud/stream/binder/config/SolaceMessageChannelBinderConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private void initSession() throws JCSMPException {
SolaceMessageChannelBinder solaceMessageChannelBinder(SolaceEndpointProvisioner solaceEndpointProvisioner,
@Nullable SolaceBinderHealthAccessor solaceBinderHealthAccessor,
@Nullable SolaceMeterAccessor solaceMeterAccessor) {
SolaceMessageChannelBinder binder = new SolaceMessageChannelBinder(jcsmpSession, context, solaceEndpointProvisioner);
SolaceMessageChannelBinder binder = new SolaceMessageChannelBinder(jcsmpSession, jcsmpProperties, context, solaceEndpointProvisioner);
binder.setExtendedBindingProperties(solaceExtendedBindingProperties);
binder.setSolaceMeterAccessor(solaceMeterAccessor);
if (solaceBinderHealthAccessor != null) {
Expand Down
1 change: 1 addition & 0 deletions ...om/solace/spring/cloud/stream/binder/test/junit/extension/SpringCloudStreamExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
LOGGER.info("Creating {}", SpringCloudStreamContext.class.getSimpleName());
SpringCloudStreamContext context = new SpringCloudStreamContext(
PubSubPlusExtension.getJCSMPSession(extensionContext),
PubSubPlusExtension.getJCSMPProperties(extensionContext),
PubSubPlusExtension.getSempV2Api(extensionContext));
context.before();
return context;
Expand Down
7 changes: 5 additions & 2 deletions ...test/java/com/solace/spring/cloud/stream/binder/test/spring/SpringCloudStreamContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.solace.spring.cloud.stream.binder.properties.SolaceProducerProperties;
import com.solace.spring.cloud.stream.binder.test.util.SolaceTestBinder;
import com.solace.test.integration.semp.v2.SempV2Api;
import com.solacesystems.jcsmp.JCSMPProperties;
import com.solacesystems.jcsmp.JCSMPSession;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.extension.ExtensionContext;
Expand Down Expand Up @@ -35,10 +36,12 @@ public class SpringCloudStreamContext extends PartitionCapableBinderTests<Solace
implements ExtensionContext.Store.CloseableResource {
private static final Logger LOGGER = LoggerFactory.getLogger(SpringCloudStreamContext.class);
private JCSMPSession jcsmpSession;
private JCSMPProperties jcsmpProperties;
private SempV2Api sempV2Api;

public SpringCloudStreamContext(JCSMPSession jcsmpSession, SempV2Api sempV2Api) {
public SpringCloudStreamContext(JCSMPSession jcsmpSession, JCSMPProperties jcsmpProperties, SempV2Api sempV2Api) {
this.jcsmpSession = Objects.requireNonNull(jcsmpSession);
this.jcsmpProperties = Objects.requireNonNull(jcsmpProperties);
this.sempV2Api = sempV2Api;
}

Expand Down Expand Up @@ -67,7 +70,7 @@ public SolaceTestBinder getBinder() {
throw new IllegalStateException("JCSMPSession cannot be null or closed");
}
logger.info("Creating new test binder");
testBinder = new SolaceTestBinder(jcsmpSession, sempV2Api);
testBinder = new SolaceTestBinder(jcsmpSession, jcsmpProperties, sempV2Api);
}
return testBinder;
}
Expand Down
4 changes: 2 additions & 2 deletions ...inder/src/test/java/com/solace/spring/cloud/stream/binder/test/util/SolaceTestBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ public class SolaceTestBinder
private final Map<String, String> bindingNameToErrorQueueName = new HashMap<>();
private static final Logger LOGGER = LoggerFactory.getLogger(SolaceTestBinder.class);

public SolaceTestBinder(JCSMPSession jcsmpSession, SempV2Api sempV2Api) {
public SolaceTestBinder(JCSMPSession jcsmpSession, JCSMPProperties jcsmpProperties, SempV2Api sempV2Api) {
this.applicationContext = new AnnotationConfigApplicationContext(Config.class);
this.jcsmpSession = jcsmpSession;
this.sempV2Api = sempV2Api;
SolaceMessageChannelBinder binder = new SolaceMessageChannelBinder(jcsmpSession, new SolaceEndpointProvisioner(jcsmpSession));
SolaceMessageChannelBinder binder = new SolaceMessageChannelBinder(jcsmpSession, jcsmpProperties, new SolaceEndpointProvisioner(jcsmpSession));
binder.setApplicationContext(this.applicationContext);
this.setPollableConsumerBinder(binder);
}
Expand Down
Loading