Skip to content

GH-10083: Nullability for graph in core module #10371

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

Closed
wants to merge 3 commits into from
Closed

GH-10083: Nullability for graph in core module #10371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c082bad
GH-10083: Nullability for graph in core module
cppwfs Sep 2, 2025
3ed266f
Remove unnecessary Nullable annotations
cppwfs Sep 3, 2025
ec20eb0
Update local variables to be used consistently
cppwfs Sep 3, 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
4 changes: 3 additions & 1 deletion ...core/src/main/java/org/springframework/integration/graph/CompositeMessageHandlerNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.List;

import org.jspecify.annotations.Nullable;

import org.springframework.messaging.MessageHandler;

/**
Expand All @@ -33,7 +35,7 @@ public class CompositeMessageHandlerNode extends MessageHandlerNode {

private final List<InnerHandler> handlers = new ArrayList<>();

public CompositeMessageHandlerNode(int nodeId, String name, MessageHandler handler, String input, String output,
public CompositeMessageHandlerNode(int nodeId, String name, MessageHandler handler, String input, @Nullable String output,
List<InnerHandler> handlers) {

super(nodeId, name, handler, input, output);
Expand Down
10 changes: 6 additions & 4 deletions ...ore/src/main/java/org/springframework/integration/graph/DiscardingMessageHandlerNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.integration.graph;

import org.jspecify.annotations.Nullable;

import org.springframework.messaging.MessageHandler;

/**
Expand All @@ -28,16 +30,16 @@
*/
public class DiscardingMessageHandlerNode extends MessageHandlerNode {

private final String discards;
private final @Nullable String discards;

public DiscardingMessageHandlerNode(int nodeId, String name, MessageHandler handler, String input, String output,
String discards) {
public DiscardingMessageHandlerNode(int nodeId, String name, MessageHandler handler, String input,
@Nullable String output, @Nullable String discards) {

super(nodeId, name, handler, input, output);
this.discards = discards;
}

public String getDiscards() {
public @Nullable String getDiscards() {
return this.discards;
}

Expand Down
8 changes: 5 additions & 3 deletions ...ng-integration-core/src/main/java/org/springframework/integration/graph/EndpointNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.integration.graph;

import org.jspecify.annotations.Nullable;

/**
* Base class for all endpoints.
*
Expand All @@ -26,14 +28,14 @@
*/
public abstract class EndpointNode extends IntegrationNode {

private final String output;
private final @Nullable String output;

protected EndpointNode(int nodeId, String name, Object nodeObject, String output) {
protected EndpointNode(int nodeId, String name, Object nodeObject, @Nullable String output) {
super(nodeId, name, nodeObject);
this.output = output;
}

public String getOutput() {
public @Nullable String getOutput() {
return this.output;
}

Expand Down
10 changes: 6 additions & 4 deletions ...n/java/org/springframework/integration/graph/ErrorCapableCompositeMessageHandlerNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import java.util.List;

import org.jspecify.annotations.Nullable;

import org.springframework.integration.handler.CompositeMessageHandler;

/**
Expand All @@ -31,17 +33,17 @@
*/
public class ErrorCapableCompositeMessageHandlerNode extends CompositeMessageHandlerNode implements ErrorCapableNode {

private final String errors;
private final @Nullable String errors;

public ErrorCapableCompositeMessageHandlerNode(int nodeId, String name, CompositeMessageHandler handler, String input,
String output, String errors, List<InnerHandler> handlers) {
public ErrorCapableCompositeMessageHandlerNode(int nodeId, String name, CompositeMessageHandler handler,
String input, @Nullable String output, @Nullable String errors, List<InnerHandler> handlers) {

super(nodeId, name, handler, input, output, handlers);
this.errors = errors;
}

@Override
public String getErrors() {
public @Nullable String getErrors() {
return this.errors;
}

Expand Down
8 changes: 5 additions & 3 deletions .../java/org/springframework/integration/graph/ErrorCapableDiscardingMessageHandlerNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.integration.graph;

import org.jspecify.annotations.Nullable;

import org.springframework.messaging.MessageHandler;

/**
Expand All @@ -29,17 +31,17 @@
*/
public class ErrorCapableDiscardingMessageHandlerNode extends DiscardingMessageHandlerNode implements ErrorCapableNode {

private final String errors;
private final @Nullable String errors;

public ErrorCapableDiscardingMessageHandlerNode(int nodeId, String name, MessageHandler handler, String input,
String output, String discards, String errors) {
@Nullable String output, @Nullable String discards, @Nullable String errors) {

super(nodeId, name, handler, input, output, discards);
this.errors = errors;
}

@Override
public String getErrors() {
public @Nullable String getErrors() {
return this.errors;
}

Expand Down
8 changes: 5 additions & 3 deletions ...on-core/src/main/java/org/springframework/integration/graph/ErrorCapableEndpointNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.integration.graph;

import org.jspecify.annotations.Nullable;

/**
* Represents nodes that can natively handle errors.
*
Expand All @@ -26,15 +28,15 @@
*/
public class ErrorCapableEndpointNode extends EndpointNode implements ErrorCapableNode {

private final String errors;
private final @Nullable String errors;

protected ErrorCapableEndpointNode(int nodeId, String name, Object nodeObject, String output, String errors) {
protected ErrorCapableEndpointNode(int nodeId, String name, Object nodeObject, @Nullable String output, @Nullable String errors) {
super(nodeId, name, nodeObject, output);
this.errors = errors;
}

@Override
public String getErrors() {
public @Nullable String getErrors() {
return this.errors;
}

Expand Down
8 changes: 5 additions & 3 deletions ...e/src/main/java/org/springframework/integration/graph/ErrorCapableMessageHandlerNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.integration.graph;

import org.jspecify.annotations.Nullable;

import org.springframework.messaging.MessageHandler;

/**
Expand All @@ -27,17 +29,17 @@
*/
public class ErrorCapableMessageHandlerNode extends MessageHandlerNode implements ErrorCapableNode {

private final String errors;
private final @Nullable String errors;

public ErrorCapableMessageHandlerNode(int nodeId, String name, MessageHandler handler, String input,
String output, String errors) {
@Nullable String output, @Nullable String errors) {

super(nodeId, name, handler, input, output);
this.errors = errors;
}

@Override
public String getErrors() {
public @Nullable String getErrors() {
return this.errors;
}

Expand Down
3 changes: 3 additions & 0 deletions ...ntegration-core/src/main/java/org/springframework/integration/graph/ErrorCapableNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.integration.graph;

import org.jspecify.annotations.Nullable;

/**
* Nodes implementing this interface are capable of emitting errors.
*
Expand All @@ -26,6 +28,7 @@
*/
public interface ErrorCapableNode {

@Nullable
String getErrors();

}
10 changes: 6 additions & 4 deletions ...ion-core/src/main/java/org/springframework/integration/graph/ErrorCapableRoutingNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import java.util.Collection;

import org.jspecify.annotations.Nullable;

import org.springframework.messaging.MessageHandler;

/**
Expand All @@ -31,17 +33,17 @@
*/
public class ErrorCapableRoutingNode extends RoutingMessageHandlerNode implements ErrorCapableNode {

private final String errors;
private final @Nullable String errors;

public ErrorCapableRoutingNode(int nodeId, String name, MessageHandler handler, String input, String output,
String errors, Collection<String> routes) {
public ErrorCapableRoutingNode(int nodeId, String name, MessageHandler handler, String input, @Nullable String output,
@Nullable String errors, Collection<String> routes) {

super(nodeId, name, handler, input, output, routes);
this.errors = errors;
}

@Override
public String getErrors() {
public @Nullable String getErrors() {
return this.errors;
}

Expand Down
4 changes: 3 additions & 1 deletion ...ore/src/main/java/org/springframework/integration/graph/IntegrationGraphRuntimeHints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.integration.graph;

import org.jspecify.annotations.Nullable;

import org.springframework.aot.hint.BindingReflectionHintsRegistrar;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
Expand All @@ -31,7 +33,7 @@
class IntegrationGraphRuntimeHints implements RuntimeHintsRegistrar {

@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
new BindingReflectionHintsRegistrar()
.registerReflectionHints(hints.reflection(),
Graph.class,
Expand Down
Loading
Loading