Remove Nullable from AbstractLeaderEvent

Author: cppwfs

spring-integration-core/src/main/java/org/springframework/integration/leader/event/AbstractLeaderEvent.java

@@ -16,8 +16,6 @@
 
 package org.springframework.integration.leader.event;
 
-import org.jspecify.annotations.Nullable;
-
 import org.springframework.context.ApplicationEvent;
 import org.springframework.integration.leader.Context;
 
@@ -32,9 +30,9 @@
 @SuppressWarnings("serial")
 public abstract class AbstractLeaderEvent extends ApplicationEvent {
 
-	private final @Nullable Context context;
+	private final Context context;
 
-	private final @Nullable String role;
+	private final String role;
 
 	/**
 	 * Create a new ApplicationEvent.
@@ -43,7 +41,7 @@ public abstract class AbstractLeaderEvent extends ApplicationEvent {
 	 * @param context the context associated with this event
 	 * @param role the role of the leader
 	 */
-	public AbstractLeaderEvent(Object source, @Nullable Context context, @Nullable String role) {
+	public AbstractLeaderEvent(Object source, Context context, String role) {
 		super(source);
 		this.context = context;
 		this.role = role;
@@ -54,7 +52,7 @@ public AbstractLeaderEvent(Object source, @Nullable Context context, @Nullable S
 	 *
 	 * @return the context
 	 */
-	public @Nullable Context getContext() {
+	public Context getContext() {
 		return this.context;
 	}
 
@@ -63,7 +61,7 @@ public AbstractLeaderEvent(Object source, @Nullable Context context, @Nullable S
 	 *
 	 * @return the role
 	 */
-	public @Nullable String getRole() {
+	public String getRole() {
 		return this.role;
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/support/DefaultMessageBuilderFactory.java

@@ -43,7 +43,7 @@ public class DefaultMessageBuilderFactory implements MessageBuilderFactory {
 	 * and {@link org.springframework.messaging.MessageHeaders#TIMESTAMP}.
 	 * @since 4.3.2
 	 */
-	public void setReadOnlyHeaders(@Nullable String... readOnlyHeaders) {
+	public void setReadOnlyHeaders(String @Nullable ... readOnlyHeaders) {
 		this.readOnlyHeaders = readOnlyHeaders != null ? Arrays.copyOf(readOnlyHeaders, readOnlyHeaders.length) : null;
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/support/SmartLifecycleRoleController.java

@@ -31,7 +31,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -204,7 +203,7 @@ public void startLifecyclesInRole(String role) {
 	 * Stop all registered {@link SmartLifecycle}s in the role.
 	 * @param role the role.
 	 */
-	public void stopLifecyclesInRole(@Nullable String role) {
+	public void stopLifecyclesInRole(String role) {
 		if (!this.lazyLifecycles.isEmpty()) {
 			addLazyLifecycles();
 		}
@@ -318,7 +317,6 @@ private void doAddLifecyclesToRole(String role, List<String> lifecycleBeanNames)
 	@Override
 	public void onApplicationEvent(AbstractLeaderEvent event) {
 		if (event instanceof OnGrantedEvent) {
-			Assert.state(event.getRole() != null, "A role is required");
 			startLifecyclesInRole(event.getRole());
 		}
 		else if (event instanceof OnRevokedEvent) {