From 75fcddac00174c262ac4b995abe743bd7e5f2b15 Mon Sep 17 00:00:00 2001
From: Falk Hanisch <hanisch.latex@outlook.com>
Date: Tue, 10 Oct 2023 18:28:04 +0200
Subject: [PATCH] GH-8754: MessageBuilder: enhance `@Nullable`

Fixes spring-projects/spring-integration#8754

* `AbstractIntegrationMessageBuilder.setExpirationDate(@Nullable Long expirationDate)`
* `MessageBuilder.setExpirationDate(@Nullable Long expirationDate)`
* `MessageBuilder.setExpirationDate(@Nullable Date expirationDate)`

**Cherry-pick to `6.1.x` & `6.0.x`**
---
 .../support/AbstractIntegrationMessageBuilder.java            | 2 +-
 .../springframework/integration/support/MessageBuilder.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/AbstractIntegrationMessageBuilder.java b/spring-integration-core/src/main/java/org/springframework/integration/support/AbstractIntegrationMessageBuilder.java
index c07159c643..d16f7dc8d2 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/AbstractIntegrationMessageBuilder.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/AbstractIntegrationMessageBuilder.java
@@ -44,7 +44,7 @@ import org.springframework.util.PatternMatchUtils;
  */
 public abstract class AbstractIntegrationMessageBuilder<T> {
 
-	public AbstractIntegrationMessageBuilder<T> setExpirationDate(Long expirationDate) {
+	public AbstractIntegrationMessageBuilder<T> setExpirationDate(@Nullable Long expirationDate) {
 		return setHeader(IntegrationMessageHeaderAccessor.EXPIRATION_DATE, expirationDate);
 	}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java b/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java
index afa32a8279..8e812c1f4a 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java
@@ -241,13 +241,13 @@ public final class MessageBuilder<T> extends AbstractIntegrationMessageBuilder<T
 	}
 
 	@Override
-	public MessageBuilder<T> setExpirationDate(Long expirationDate) {
+	public MessageBuilder<T> setExpirationDate(@Nullable Long expirationDate) {
 		super.setExpirationDate(expirationDate);
 		return this;
 	}
 
 	@Override
-	public MessageBuilder<T> setExpirationDate(Date expirationDate) {
+	public MessageBuilder<T> setExpirationDate(@Nullable Date expirationDate) {
 		super.setExpirationDate(expirationDate);
 		return this;
 	}