GH-10083: Apply Nullability to TCP/IP module #10306
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
artembilan
force-pushed
the
GH-10083_ip_module
branch
from
dd36f78 to
c0937d2
Compare
cppwfs
requested changes
Aug 14, 2025
Contributor
cppwfs
left a comment
cppwfs
left a comment
There was a problem hiding this comment.
The usual annoying questions ;-)
...src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java
Show resolved
Hide resolved
...g-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpInboundGateway.java
Show resolved
Hide resolved
...-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java
Show resolved
Hide resolved
...c/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java
Show resolved
Hide resolved
...on-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java
Outdated
Show resolved
Hide resolved
artembilan
force-pushed
the
GH-10083_ip_module
branch
from
c0937d2 to
c77b69c
Compare
Related to: spring-projects#10083 * Add `@NullMarked` to every package * Assume `BeanFactory` and `ApplicationEventPublisher` are not null in TCP/IP components. Therefore, fix all the failing tests to ensure those properties and their propagation via `afterPropertiesSet()`
…fType` instead of `try..catch`
* Remove `SyslogdTests.java` which are not tests.
…is set in the `onInit()` * Improve `UnicastSendingMessageHandler.restartAckThread()` to reflect the proper state of the `UnicastSendingMessageHandler`
artembilan
force-pushed
the
GH-10083_ip_module
branch
from
c77b69c to
66817b7
Compare
cppwfs
approved these changes
Aug 14, 2025
Contributor
cppwfs
left a comment
cppwfs
left a comment
There was a problem hiding this comment.
LGTM! Thank you!
Will merge after successful build!
mrpiggi
reviewed
Aug 14, 2025
| if (connection == null) { | ||
| publishNoConnectionEvent(message, connectionId); | ||
| logger.error(() -> "Connection not found when processing reply " + reply + " for " + message); | ||
| return false; |
Contributor
There was a problem hiding this comment.
Just curious: This method always returns false, but I didn't look into detail. If this is desired, I wondered if for the sake of readability, this one should be changed to void.
Member
Author
There was a problem hiding this comment.
Good catch, @mrpiggi !
The contract is this:
@FunctionalInterface
public interface TcpListener {
/**
* Called by a TCPConnection when a new message arrives.
* @param message The message.
* @return true if the message was intercepted
*/
boolean onMessage(Message<?> message);
}
So, we need to revise and return true at some point.
mrpiggi
reviewed
Aug 14, 2025
| catch (Exception ex) { | ||
| logger.error(ex, "Exception accepting new connection(s)"); | ||
| private void keyAcceptable(final Selector selector, @Nullable ServerSocketChannel server, final long now) { | ||
| if (server != null) { |
Contributor
There was a problem hiding this comment.
Just nitpicking: I tend to prefer if (server == null) { return; } as this reduces the level of indentation
Member
Author
There was a problem hiding this comment.
I think we had something like that before, but SonarQube has complained about unnecessary return; in the method. 🤷
The if (server != null) { also makes less code lines.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to: #10083
@NullMarkedto every packageBeanFactoryandApplicationEventPublisherare not null in TCP/IP components. Therefore, fix all the failing tests to ensure those properties and their propagation viaafterPropertiesSet()