* Remove trailing slashes from remote dirs to create

Author: artembilan

spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java

@@ -17,19 +17,9 @@
 package org.springframework.integration.sftp;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileSystem;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
 import java.util.Collections;
-import java.util.Objects;
 
-import org.apache.sshd.common.file.root.RootedFileSystem;
-import org.apache.sshd.common.file.root.RootedFileSystemProvider;
-import org.apache.sshd.common.file.root.RootedPath;
 import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory;
-import org.apache.sshd.common.session.SessionContext;
-import org.apache.sshd.common.util.io.IoUtils;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
 import org.apache.sshd.sftp.client.SftpClient;
@@ -81,7 +71,7 @@ public static void createServer() throws Exception {
 		});
 		sftpFactory.addSftpEventListener(EVENT_LISTENER);
 		server.setSubsystemFactories(Collections.singletonList(sftpFactory));
-		server.setFileSystemFactory(new FixedVirtualFileSystemFactory(getRemoteTempFolder()));
+		server.setFileSystemFactory(new VirtualFileSystemFactory(getRemoteTempFolder().toPath()));
 		server.start();
 		port = server.getPort();
 	}
@@ -111,37 +101,4 @@ public static void stopServer() throws Exception {
 		}
 	}
 
-	private static class FixedVirtualFileSystemFactory extends VirtualFileSystemFactory {
-
-		FixedVirtualFileSystemFactory(File defaultHomeDir) {
-			super(defaultHomeDir.toPath());
-		}
-
-		@Override
-		public FileSystem createFileSystem(SessionContext session) throws IOException {
-			Path dir = getUserHomeDir(session);
-			if (dir == null) {
-				throw new InvalidPathException(session.getUsername(), "Cannot resolve home directory");
-			}
-
-			return new FixedRootedFileSystemProvider().newFileSystem(dir, Collections.emptyMap());
-		}
-
-		private static class FixedRootedFileSystemProvider extends RootedFileSystemProvider {
-
-			protected Path resolveLocalPath(RootedPath path) {
-				Objects.requireNonNull(path, "No rooted path to resolve");
-				RootedFileSystem rfs = path.getFileSystem();
-				Path root = rfs.getRoot();
-				Path resolved = IoUtils.chroot(root, path).normalize();
-				if (!resolved.startsWith(root)) {
-					throw new InvalidPathException(root.toString(), "Not under root");
-				}
-				return resolved;
-			}
-
-		}
-
-	}
-
 }

spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java

@@ -77,8 +77,8 @@ public void testINT3412AppendStatRmdir() {
 		template.afterPropertiesSet();
 
 		template.execute(session -> {
-			session.mkdir("/foo/");
-			return session.mkdir("/foo/bar/");
+			session.mkdir("/foo");
+			return session.mkdir("/foo/bar");
 		});
 		template.append(new GenericMessage<>("foo"));
 		template.append(new GenericMessage<>("bar"));