Adjust @nullable annotations

Signed-off-by: Tran Ngoc Nhan <[email protected]>

Author: ngocnhan-tran1996

spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java

@@ -511,7 +511,7 @@ protected boolean shouldMarkSessionAsDirty(Exception ex) {
 	}
 
 	@Override
-	public <T, C> T executeWithClient(ClientCallback<C, T> callback) {
+	public <T, C> @Nullable T executeWithClient(ClientCallback<C, T> callback) {
 		throw new UnsupportedOperationException("executeWithClient() is not supported by the generic template");
 	}
 

spring-integration-file/src/main/java/org/springframework/integration/file/remote/server/FileServerEvent.java

@@ -16,6 +16,8 @@
 
 package org.springframework.integration.file.remote.server;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.integration.events.IntegrationEvent;
 
 /**
@@ -34,7 +36,7 @@ public FileServerEvent(Object source) {
 		super(source);
 	}
 
-	public FileServerEvent(Object source, Throwable cause) {
+	public FileServerEvent(Object source, @Nullable Throwable cause) {
 		super(source, cause);
 	}
 

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java

@@ -17,7 +17,6 @@
 package org.springframework.integration.sftp.inbound;
 
 import org.apache.sshd.sftp.client.SftpClient;
-import org.jspecify.annotations.Nullable;
 
 import org.springframework.integration.file.remote.session.SessionFactory;
 import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizer;
@@ -47,8 +46,8 @@ public SftpInboundFileSynchronizer(SessionFactory<SftpClient.DirEntry> sessionFa
 	}
 
 	@Override
-	protected boolean isFile(SftpClient.@Nullable DirEntry file) {
-		return file != null && file.getAttributes().isRegularFile();
+	protected boolean isFile(SftpClient.DirEntry file) {
+		return file.getAttributes().isRegularFile();
 	}
 
 	@Override

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSource.java

@@ -80,8 +80,8 @@ protected List<AbstractFileInfo<SftpClient.DirEntry>> asFileInfoList(Collection<
 	}
 
 	@Override
-	protected boolean isDirectory(SftpClient.@Nullable DirEntry file) {
-		return file != null && file.getAttributes().isDirectory();
+	protected boolean isDirectory(SftpClient.DirEntry file) {
+		return file.getAttributes().isDirectory();
 	}
 
 }

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/ApacheMinaSftpEvent.java

@@ -36,7 +36,6 @@ public ApacheMinaSftpEvent(Object source) {
 		super(source);
 	}
 
-	@SuppressWarnings("NullAway") // Overridden method does not define nullability
 	public ApacheMinaSftpEvent(Object source, @Nullable Throwable cause) {
 		super(source, cause);
 	}

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/DirectoryCreatedEvent.java

@@ -19,8 +19,6 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * An event emitted when a directory is created.
  *
@@ -43,7 +41,7 @@ public DirectoryCreatedEvent(Object source, Path path, Map<String, ?> attrs) {
 		this.attrs = attrs;
 	}
 
-	public @Nullable Path getPath() {
+	public Path getPath() {
 		return this.path;
 	}
 

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/FileWrittenEvent.java

@@ -48,7 +48,7 @@ public String getRemoteHandle() {
 		return this.remoteHandle;
 	}
 
-	public @Nullable Path getFile() {
+	public Path getFile() {
 		return this.file;
 	}
 

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/PathMovedEvent.java

@@ -41,11 +41,11 @@ public PathMovedEvent(Object source, Path srcPath, Path dstPath, @Nullable Throw
 		this.dstPath = dstPath;
 	}
 
-	public @Nullable Path getSrcPath() {
+	public Path getSrcPath() {
 		return this.srcPath;
 	}
 
-	public @Nullable Path getDstPath() {
+	public Path getDstPath() {
 		return this.dstPath;
 	}
 

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/PathRemovedEvent.java

@@ -41,7 +41,7 @@ public PathRemovedEvent(Object source, Path path, boolean isDirectory, @Nullable
 		this.isDirectory = isDirectory;
 	}
 
-	public @Nullable Path getPath() {
+	public Path getPath() {
 		return this.path;
 	}
 

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplate.java

@@ -58,7 +58,7 @@ public SftpRemoteFileTemplate(SessionFactory<SftpClient.DirEntry> sessionFactory
 		super(sessionFactory);
 	}
 
-	@SuppressWarnings({"unchecked", "NullAway"}) // Overridden method does not define nullability
+	@SuppressWarnings("unchecked")
 	@Override
 	public <T, C> @Nullable T executeWithClient(final ClientCallback<C, T> callback) {
 		return doExecuteWithClient((ClientCallback<SftpClient, T>) callback);