Fix deprecations from SF; prepare for release

Author: artembilan

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.core.ConfigurableObjectInputStream;
-import org.springframework.core.NestedIOException;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.serializer.DefaultDeserializer;
 import org.springframework.core.serializer.Deserializer;
@@ -169,7 +168,7 @@ protected Class<?> resolveClass(ObjectStreamClass classDesc)
 			return objectInputStream.readObject();
 		}
 		catch (ClassNotFoundException ex) {
-			throw new NestedIOException("Failed to deserialize object type", ex);
+			throw new IOException("Failed to deserialize object type", ex);
 		}
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.core.NestedIOException;
 import org.springframework.integration.file.remote.session.Session;
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
@@ -100,7 +99,7 @@ public boolean remove(String path) throws IOException {
 			return true;
 		}
 		catch (SftpException e) {
-			throw new NestedIOException("Failed to remove file.", e);
+			throw new IOException("Failed to remove file.", e);
 		}
 	}
 
@@ -120,7 +119,7 @@ public LsEntry[] list(String path) throws IOException {
 			}
 		}
 		catch (SftpException e) {
-			throw new NestedIOException("Failed to list files", e);
+			throw new IOException("Failed to list files", e);
 		}
 		return new LsEntry[0];
 	}
@@ -148,7 +147,7 @@ public void read(String source, OutputStream os) throws IOException {
 			FileCopyUtils.copy(is, os);
 		}
 		catch (SftpException e) {
-			throw new NestedIOException("failed to read file " + source, e);
+			throw new IOException("failed to read file " + source, e);
 		}
 	}
 
@@ -158,7 +157,7 @@ public InputStream readRaw(String source) throws IOException {
 			return this.channel.get(source);
 		}
 		catch (SftpException e) {
-			throw new NestedIOException("failed to read file " + source, e);
+			throw new IOException("failed to read file " + source, e);
 		}
 	}
 
@@ -174,7 +173,7 @@ public void write(InputStream inputStream, String destination) throws IOExceptio
 			this.channel.put(inputStream, destination);
 		}
 		catch (SftpException e) {
-			throw new NestedIOException("failed to write file", e);
+			throw new IOException("failed to write file", e);
 		}
 	}
 
@@ -185,7 +184,7 @@ public void append(InputStream inputStream, String destination) throws IOExcepti
 			this.channel.put(inputStream, destination, ChannelSftp.APPEND);
 		}
 		catch (SftpException e) {
-			throw new NestedIOException("failed to write file", e);
+			throw new IOException("failed to write file", e);
 		}
 	}
 
@@ -227,7 +226,7 @@ public void rename(String pathFrom, String pathTo) throws IOException {
 				}
 			}
 			catch (IOException ioex) {
-				NestedIOException exception = new NestedIOException("Failed to delete file " + pathTo, sftpex);
+				IOException exception = new IOException("Failed to delete file " + pathTo, sftpex);
 				exception.addSuppressed(ioex);
 				throw exception; // NOSONAR - added to suppressed exceptions
 			}
@@ -236,8 +235,8 @@ public void rename(String pathFrom, String pathTo) throws IOException {
 				this.channel.rename(pathFrom, pathTo);
 			}
 			catch (SftpException sftpex2) {
-				NestedIOException exception =
-						new NestedIOException("failed to rename from " + pathFrom + " to " + pathTo, sftpex);
+				IOException exception =
+						new IOException("failed to rename from " + pathFrom + " to " + pathTo, sftpex);
 				exception.addSuppressed(sftpex2);
 				throw exception; // NOSONAR - added to suppressed exceptions
 			}
@@ -254,7 +253,7 @@ public boolean mkdir(String remoteDirectory) throws IOException {
 		}
 		catch (SftpException ex) {
 			if (ex.id != ChannelSftp.SSH_FX_FAILURE || !exists(remoteDirectory)) {
-				throw new NestedIOException("failed to create remote directory '" + remoteDirectory + "'.", ex);
+				throw new IOException("failed to create remote directory '" + remoteDirectory + "'.", ex);
 			}
 		}
 		return true;
@@ -266,7 +265,7 @@ public boolean rmdir(String remoteDirectory) throws IOException {
 			this.channel.rmdir(remoteDirectory);
 		}
 		catch (SftpException e) {
-			throw new NestedIOException("failed to remove remote directory '" + remoteDirectory + "'.", e);
+			throw new IOException("failed to remove remote directory '" + remoteDirectory + "'.", e);
 		}
 		return true;
 	}

spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ClientWebSocketContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -272,7 +272,7 @@ protected void closeConnection() throws Exception { // NOSONAR
 		}
 
 		@Override
-		protected boolean isConnected() {
+		public boolean isConnected() {
 			return ((ClientWebSocketContainer.this.clientSession != null)
 					&& (ClientWebSocketContainer.this.clientSession.isOpen()));
 		}

spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java

@@ -195,7 +195,7 @@ private void configureSockJsOptionsIfAny(WebSocketHandlerRegistration registrati
 					.acceptIfNotNull(this.sockJsServiceOptions.messageCodec,
 							sockJsServiceRegistration::setMessageCodec)
 					.acceptIfNotNull(this.sockJsServiceOptions.suppressCors,
-							sockJsServiceRegistration::setSupressCors);
+							sockJsServiceRegistration::setSuppressCors);
 		}
 	}