Remove unnecessary SuppressWarnings

Remove unnecessary if statements following review

Author: cppwfs

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

@@ -32,7 +32,6 @@
 import org.springframework.messaging.support.ErrorMessage;
 import org.springframework.messaging.support.GenericMessage;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
 
 /**
  * The {@link AbstractIntegrationMessageBuilder} extension for the default logic to build message.
@@ -64,12 +63,10 @@ public abstract class BaseMessageBuilder<T, B extends BaseMessageBuilder<T, B>>
 
 	private final IntegrationMessageHeaderAccessor headerAccessor;
 
-	@Nullable
-	private final Message<T> originalMessage;
+	private final @Nullable Message<T> originalMessage;
 
 	private volatile boolean modified;
 
-	@SuppressWarnings("NullAway.Init")
 	private String @Nullable [] readOnlyHeaders;
 
 	protected BaseMessageBuilder(T payload, @Nullable Message<T> originalMessage) {
@@ -287,7 +284,7 @@ public B setPriority(Integer priority) {
 	 * @return the current {@link BaseMessageBuilder}
 	 * @see IntegrationMessageHeaderAccessor#isReadOnly(String)
 	 */
-	public B readOnlyHeaders(String... readOnlyHeaders) {
+	public B readOnlyHeaders(String @Nullable ... readOnlyHeaders) {
 		this.readOnlyHeaders = readOnlyHeaders != null ? Arrays.copyOf(readOnlyHeaders, readOnlyHeaders.length) : null;
 		if (readOnlyHeaders != null) {
 			this.headerAccessor.setReadOnlyHeaders(readOnlyHeaders);
@@ -319,9 +316,9 @@ public Message<T> build() {
 	}
 
 	private boolean containsReadOnly(MessageHeaders headers) {
-		if (!ObjectUtils.isEmpty(this.readOnlyHeaders)) {
+		if (this.readOnlyHeaders != null) {
 			for (String readOnly : this.readOnlyHeaders) {
-				if (readOnly != null && headers.containsKey(readOnly)) {
+				if (headers.containsKey(readOnly)) {
 					return true;
 				}
 			}

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

@@ -32,7 +32,6 @@
  */
 public class DefaultMessageBuilderFactory implements MessageBuilderFactory {
 
-	@SuppressWarnings("NullAway.Init")
 	private String @Nullable [] readOnlyHeaders;
 
 	/**
@@ -66,24 +65,14 @@ public void addReadOnlyHeaders(String... readOnlyHeaders) {
 
 	@Override
 	public <T> MessageBuilder<T> fromMessage(Message<T> message) {
-		if (this.readOnlyHeaders != null) {
-			return MessageBuilder.fromMessage(message)
-					.readOnlyHeaders(this.readOnlyHeaders);
-		}
-		else {
-			return MessageBuilder.fromMessage(message);
-		}
+		return MessageBuilder.fromMessage(message)
+				.readOnlyHeaders(this.readOnlyHeaders);
 	}
 
 	@Override
 	public <T> MessageBuilder<T> withPayload(T payload) {
-		if (this.readOnlyHeaders != null) {
-			return MessageBuilder.withPayload(payload)
-					.readOnlyHeaders(this.readOnlyHeaders);
-		}
-		else {
-			return MessageBuilder.withPayload(payload);
-		}
+		return MessageBuilder.withPayload(payload)
+				.readOnlyHeaders(this.readOnlyHeaders);
 	}
 
 }