From 49cd14cb8a7249fb730fe21b65d1023586cfdbe0 Mon Sep 17 00:00:00 2001 From: Falk Hanisch Date: Tue, 10 Oct 2023 19:46:57 +0200 Subject: [PATCH] GH-8750: Add `@Nullable` to getRegistrationById() Fixes https://github.com/spring-projects/spring-integration/issues/8750 * annotate `IntegrationFlowRegistration.getRegistrationById(String flowId)` with `@org.springframework.lang.Nullable` * annotate `StandardIntegrationFlowContext.getRegistrationById(String flowId)` with `@org.springframework.lang.Nullable` **Cherry-pick to `6.1.x` & `6.0.x`** --- .../integration/dsl/context/IntegrationFlowContext.java | 1 + .../integration/dsl/context/StandardIntegrationFlowContext.java | 1 + 2 files changed, 2 insertions(+) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowContext.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowContext.java index 31ad6c3b12..ea67587f61 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowContext.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowContext.java @@ -70,6 +70,7 @@ public interface IntegrationFlowContext { * @param flowId the bean name to obtain * @return the IntegrationFlowRegistration for provided {@code id} or {@code null} */ + @Nullable IntegrationFlowRegistration getRegistrationById(String flowId); /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/StandardIntegrationFlowContext.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/StandardIntegrationFlowContext.java index be0ffc5748..e2023ccf01 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/StandardIntegrationFlowContext.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/StandardIntegrationFlowContext.java @@ -178,6 +178,7 @@ public final class StandardIntegrationFlowContext implements IntegrationFlowCont * @return the IntegrationFlowRegistration for provided {@code id} or {@code null} */ @Override + @Nullable public IntegrationFlowRegistration getRegistrationById(String flowId) { return this.registry.get(flowId); }