Use latest Spring Framework 7.1.0-SNAPSHOT by cppwfs · Pull Request #11351 · spring-projects/spring-integration

cppwfs · 2026-08-20T19:16:58Z

The latest snapshots have introduced some breaking changes.
Resolve the issues below

Treat a null result from MessageConverter.fromMessage() as a
conversion failure across all inbound JMS paths.
Throw MessageConversionException from AbstractJmsChannel,
JmsDestinationPollingSource, ChannelPublishingJmsMessageListener,
and JmsOutboundGateway instead of silently discarding the message.
Remove the discard branch in SubscribableJmsChannel since a null
conversion is no longer possible without an exception.
Add tests asserting MessageConversionException for each of the
four affected components.
Updated core to use builder for SpelParserConfiguration as the
constructor is now deprecated.

artembilan

Please, repurpose this PR just for SF 7.2.0-SNAPSHOT.
Looks like this is going to take a while until it is in a good shape.
The rest of dependencies should not suffer.

Thanks

cppwfs · 2026-08-24T15:59:15Z

This change includes those that were in PR #11367. So if this one still needs alot of work then merge 11367 and I'll continue work on this PR.

artembilan

I think this is something what deserves some docs, too.
Including whats-new.

Thanks

artembilan · 2026-08-24T18:55:47Z

+/**
+ * @author Glenn Renfro
+ */
+public class JmsDestinationPollingSourceTests implements TestApplicationContextAware {


I think we agreed that public is redundant in tests.

Not fixed.
I see changes in the test methods, but class declaration could also benefit from not having public modifier 😄

artembilan · 2026-08-24T18:57:28Z

I mean.
Document JMS part as it is some kind of breaking change.

artembilan · 2026-08-24T18:58:44Z

Also, please, add a comment into this PR with a Attention required: hint explaining how JMS module now fails for null conversion results.
Thanks

artembilan · 2026-08-25T17:14:08Z

 	}

+	/**
+	 * Converts {@link jakarta.jms.Message} to a Spring {@link Message}.


Method Javadocs must be imperative, like commands.

artembilan · 2026-08-25T17:15:55Z

 	}

+	/**
+	 * Processes an incoming JMS message, transforms it into a Spring Integration message,


I think this Javadoc was generated by AI.
Please, revise it as it is too much info.
And it is not imperative.

artembilan · 2026-08-25T17:17:20Z

+	 * @param jmsMessage the incoming {@link jakarta.jms.Message} to process
+	 * @param session the active JMS {@link jakarta.jms.Session} associated with the listener
+	 * @throws JMSException if a native JMS error occurs while processing, resolving destinations, or sending replies
+	 * @throws MessageConversionException if payload extraction produces a {@code null} result when required


I don't think this is only case.
The message converter may thrown such an exception for other reason.
We probably should rephrase it somehow saying that in case of null such an exception is thrown, too.
Or what is better wording would it be from English perspective 😄

artembilan · 2026-08-25T17:18:18Z

@@ -408,6 +423,9 @@ public void onMessage(jakarta.jms.Message jmsMessage, Session session) throws JM
 				result = this.messageConverter.fromMessage(jmsMessage);
 				this.logger.debug(() -> "converted JMS Message [" + jmsMessage + "] to integration Message payload ["


And no this debug message is suspicious with null result.
I think we need to revise logic as if..else.

artembilan · 2026-08-25T17:18:31Z

 	 * Will receive a JMS {@link jakarta.jms.Message} converting and returning it as
 	 * a Spring Integration {@link Message}. This method will also use the current
 	 * {@link JmsHeaderMapper} instance to map JMS properties to the MessageHeaders.
+	 * @throws MessageConversionException if the converter returns {@code null}.


artembilan · 2026-08-25T17:24:40Z

+		source.setBeanFactory(TEST_INTEGRATION_CONTEXT);
+		source.afterPropertiesSet();
+
+		// A JMS message converted to a null payload is a conversion failure, not a message to discard.


artembilan · 2026-08-25T17:25:47Z

+	}
+
+	@Test
+	void payloadFromConverterIsUsed() throws Exception {


I don't see value in this test.
Or better to say: we do have such a coverage in other tests in the module.

artembilan · 2026-08-25T17:31:46Z

+		when(session.createProducer(any())).thenReturn(mock());
+		MessageConsumer consumer = mock();
+		when(session.createConsumer(any())).thenReturn(consumer);
+		when(consumer.receive(anyLong())).thenReturn(mock());


See MockSettings instead of all of these, e.g. Answers.RETURNS_MOCKS.
More over I think this is too much just for an exception in the end.
See if StubConnection and friends can help anyhow instead of this mock nightmare.

artembilan · 2026-08-25T17:33:34Z

+[[x7.2-jms-changes]]
+=== JMS Support Changes
+Spring Integration supports Spring Framework's ability to return `null` when converting a JMS `Message` where the payload has not been set.
+This also means that if a Spring `Message` uses the payload of a JMS `Message` that is null, a  `MessageConversionException` will be thrown.


I think this text needs to be revised.
It is also missing a link to the target chapter.
And I don't see a change in the target chapter.

artembilan

Very close.
Thank you!

artembilan · 2026-08-26T15:07:17Z

+		factoryBean.setBeanFactory(mock());
+		MessageConverter messageConverter = spy(new SimpleMessageConverter());
+		given(messageConverter.fromMessage(any())).willReturn(null);
+		factoryBean.setMessageConverter(messageConverter);


I don't think I asked for a spy when said that same factoryBean.setMessageConverter(mock()); trick could be used here.
Why do we do it different in this class than in the next one?
Why do we need to stub willReturn(null) if mock() returns null by default?
And why is the spy() if we don't verify anything in the end.
And I agree that we must not.
Please, elaborate on this code which is not what we've agreed upon in the next class.

artembilan · 2026-08-26T15:09:39Z

+		Message jmsMessage = new StubTextMessage("test");
+
+		MessageConverter converter = mock();
+		given(converter.fromMessage(any())).willReturn(null);


Again: why explicit .willReturn(null) if it is assumed by default via mock()?

artembilan · 2026-08-26T15:11:15Z

+		given(jmsTemplate.receiveSelected(nullable(String.class))).willReturn(jmsMessage);
+
+		JmsDestinationPollingSource source = new JmsDestinationPollingSource(jmsTemplate);
+		source.setBeanFactory(TEST_INTEGRATION_CONTEXT);


I'm not sure if we need real ApplicationContext in this test class at all since everything else are just mocks.
Cannot just mock() work here, too?

artembilan · 2026-08-26T15:18:51Z

 The `HeaderMappingMessageConverter` itself delegates to a target `MessageConverter` while also mapping the Spring Integration `MessageHeaders` to JMS message properties and back again.

+IMPORTANT: If `MessageConverter.fromMessage()` returns `null` (for example, because the JMS `Message` has no payload), Spring Integration treats this as a conversion failure and throws a `MessageConversionException`, rather than silently discarding the message.
+This applies to the inbound and outbound channel adapters, the inbound and outbound gateways, and JMS-backed message channels (see xref:jms.adoc#jms-channel[JMS-backed Message Channels]).


I don't think it is true for the outbound channel adapters.

I also think that we don't need full link to that jms-channel section exactly in this jms.adoc file.

Please, revise.

- The latest snapshots have introduced some breaking changes. Resolve the issues below - Treat a null result from `MessageConverter.fromMessage()` as a conversion failure across all inbound JMS paths. - Throw `MessageConversionException` from `AbstractJmsChannel`, `JmsDestinationPollingSource`, `ChannelPublishingJmsMessageListener`, and `JmsOutboundGateway` instead of silently discarding the message. - Remove the discard branch in `SubscribableJmsChannel` since a null conversion is no longer possible without an exception. - Add tests asserting `MessageConversionException` for each of the four affected components. - Updated core to use builder for `SpelParserConfiguration` as the constructor is now deprecated.

- Update docs to reflect SI's response to framewworks changes to Jms message conversion - Add author tags

Fixed jms doc to remove outbound channel adapters as being impacted by nulls being returned from converters

artembilan · 2026-08-26T17:29:37Z

@@ -780,6 +798,9 @@ private AbstractIntegrationMessageBuilder<?> buildReply(jakarta.jms.Message jmsR
 			result = this.messageConverter.fromMessage(jmsReply);
 			logger.debug(() ->
 					"converted JMS Message [" + jmsReply + "] to integration Message payload [" + result + "]");


Why this debug message was not fixed to if..else like in other place we have agreed?

artembilan · 2026-08-26T17:31:46Z

+
+		PollableJmsChannel channel = new PollableJmsChannel(jmsTemplate);
+		channel.setBeanFactory(mock());
+		channel.afterPropertiesSet();


According to channel.receive() code flow for our null payload, we don't need these two lines.

artembilan · 2026-08-26T17:33:25Z

+		factoryBean.setBeanFactory(mock());
+		factoryBean.afterPropertiesSet();
+		SubscribableJmsChannel channel = (SubscribableJmsChannel) factoryBean.getObject();
+		channel.afterPropertiesSet();


This is suspicious since it has been just called for its FB.
Please, revise the setting of this test (and probably all new introduced here) to get rid of those options which are out of use and don't contribute to the test outcome.

artembilan · 2026-08-26T17:35:00Z

+
+		JmsDestinationPollingSource source = new JmsDestinationPollingSource(jmsTemplate);
+		source.setBeanFactory(beanFactory);
+		source.afterPropertiesSet();


Same here.
If we remove these two lines, we won't need to worry about SpEL at all.

artembilan · 2026-08-26T17:35:47Z

+		Connection connection = new StubConnection("reply");
+		when(connectionFactory.createConnection()).thenReturn(connection);
+
+		gateway.afterPropertiesSet();


artembilan · 2026-08-26T17:37:08Z

 Starting with version 7.1, the `AbstractJmsChannel` and its implementations use a `DefaultJmsHeaderMapper` internally to map all headers from the message-to-send to JMS message properties; and on consuming side, map all JMS message properties into message headers.
 The custom header-mapping and payload conversion logic can be done by the `org.springframework.jms.support.converter.MessagingMessageConverter` injection into the `JmsTemplate` used for `AbstractJmsChannel` instances.

+Starting with version 7.2, if the `MessageConverter` returns `null` when converting an incoming JMS `Message`, `AbstractJmsChannel` (and, therefore, `SubscribableJmsChannel` and `PollableJmsChannel`) treats it as a conversion failure and throws a `MessageConversionException` rather than discarding the message.


Why cannot we say here something like instead "the AbstractJmsChannel implementations..."?
What if we are going to have more than those you've just iterated?

artembilan · 2026-08-26T17:41:02Z

 The `HeaderMappingMessageConverter` itself delegates to a target `MessageConverter` while also mapping the Spring Integration `MessageHeaders` to JMS message properties and back again.

+IMPORTANT: If `MessageConverter.fromMessage()` returns `null` (for example, because the JMS `Message` has no payload), Spring Integration treats this as a conversion failure and throws a `MessageConversionException`, rather than silently discarding the message.
+This applies to the inbound channel adapters, the inbound and outbound gateways, and JMS-backed message channels.


And why did you remove the link?
I asked just for a reference in the same chapter, similar to the one in the end of grpc.adoc:

See <<grpc-outbound-method-name-configuration>>.

artembilan · 2026-08-26T19:06:53Z

Attention required:

Jms MessageConverters now return null when converting an incoming JMS Message with no payload.
The AbstractJmsChannel treats it as a conversion failure and throws a MessageConversionException rather than discarding the message.

cppwfs added this to the 7.2.0-M2 milestone Aug 20, 2026

cppwfs requested a review from artembilan August 20, 2026 19:16

cppwfs added in: jms type: task labels Aug 20, 2026

artembilan requested changes Aug 24, 2026

View reviewed changes

Comment thread ...on-jms/src/main/java/org/springframework/integration/jms/channel/SubscribableJmsChannel.java Outdated

cppwfs force-pushed the GH-7-2-SNAPSHOT branch from bffb7d2 to b13b232 Compare August 24, 2026 15:57

cppwfs force-pushed the GH-7-2-SNAPSHOT branch 2 times, most recently from db5bc01 to 0ecf55c Compare August 24, 2026 16:50

cppwfs changed the title ~~Update release train dependencies to the current snapshots.~~ Set Spring Dependencies back to snapshot Aug 24, 2026

artembilan mentioned this pull request Aug 24, 2026

Bump org.springframework:spring-framework-bom from 7.1.0-M1 to 7.1.0-SNAPSHOT #11374

Closed

cppwfs force-pushed the GH-7-2-SNAPSHOT branch from 0ecf55c to 102a20f Compare August 24, 2026 18:43

artembilan requested changes Aug 24, 2026

View reviewed changes

artembilan added the for: upgrade-attention Breaking change, some extra configuration etc. label Aug 24, 2026

cppwfs force-pushed the GH-7-2-SNAPSHOT branch 2 times, most recently from afaa17b to 83fc3ad Compare August 25, 2026 13:03

artembilan changed the title ~~Set Spring Dependencies back to snapshot~~ Use latest Spring Framework 7.1.0-SNAPSHOT Aug 25, 2026

artembilan requested changes Aug 25, 2026

View reviewed changes

cppwfs force-pushed the GH-7-2-SNAPSHOT branch from 83fc3ad to 4b6deaa Compare August 26, 2026 13:59

artembilan requested changes Aug 26, 2026

View reviewed changes

cppwfs added 5 commits August 26, 2026 12:03

Set Spring Framework version to snapshot

9ea0893

Add documentation and whats new

26e4d80

- Update docs to reflect SI's response to framewworks changes to Jms message conversion - Add author tags

Applied requested document changes

0d70317

Simplified mock usage in tests

44ded09

Fixed jms doc to remove outbound channel adapters as being impacted by nulls being returned from converters

cppwfs force-pushed the GH-7-2-SNAPSHOT branch from 4b6deaa to 44ded09 Compare August 26, 2026 16:05

artembilan requested changes Aug 26, 2026

View reviewed changes

		@@ -408,6 +423,9 @@ public void onMessage(jakarta.jms.Message jmsMessage, Session session) throws JM
		result = this.messageConverter.fromMessage(jmsMessage);
		this.logger.debug(() -> "converted JMS Message [" + jmsMessage + "] to integration Message payload ["

Uh oh!

Conversation

cppwfs commented Aug 20, 2026 • edited by artembilan Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

artembilan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cppwfs commented Aug 24, 2026

Uh oh!

artembilan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

artembilan commented Aug 24, 2026

Uh oh!

artembilan commented Aug 24, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

artembilan left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

artembilan commented Aug 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

cppwfs commented Aug 20, 2026 •

edited by artembilan

Loading