fix filename

haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java

@@ -39,7 +39,7 @@ import cz.it4i.fiji.haas_java_client.proxy.UserAndLimitationManagementWsSoap;
 import cz.it4i.fiji.scpclient.ScpClient;
 
 public class HaaSClient {
-	
+
 	static public class SynchronizableFiles {
 
 		private Collection<TaskFileOffsetExt> files = new LinkedList<>();
@@ -110,7 +110,7 @@ public class HaaSClient {
 		WS_STATE2STATE = Collections.unmodifiableMap(map);
 	}
 
-	public HaaSClient(Long templateId, Integer timeOut,Long  clusterNodeType, String projectId) {
+	public HaaSClient(Long templateId, Integer timeOut, Long clusterNodeType, String projectId) {
 		super();
 		this.templateId = templateId;
 		this.timeOut = timeOut;
@@ -131,10 +131,10 @@ public class HaaSClient {
 
 				for (Path file : files) {
 					System.out.println("Uploading file: " + file.getFileName());
-					String destFile = fileTransfer.getSharedBasepath() + "/" ;
+					String destFile = "'" + fileTransfer.getSharedBasepath() + "/" + file.getFileName() + "'";
 					boolean result = scpClient.upload(file, destFile);
-					System.out.println(result?"File uploaded.":"File not uploaded");
-					if(!result) {
+					System.out.println(result ? "File uploaded." : "File not uploaded");
+					if (!result) {
 						throw new HaaSClientException("Uploading of " + file + " to " + destFile + " failed");
 					}
 				}
@@ -191,16 +191,16 @@ public class HaaSClient {
 				for (String fileName : getFileTransfer().listChangedFilesForJob(jobId, getSessionID())) {
 					fileName = fileName.replaceFirst("/", "");
 					Path rFile = workDirectory.resolve(fileName);
-					if(!Files.exists(rFile.getParent())) {
+					if (!Files.exists(rFile.getParent())) {
 						Files.createDirectories(rFile.getParent());
 					}
-					String fileToDownload = ft.getSharedBasepath() + "/" + fileName;
+					String fileToDownload = "'" + ft.getSharedBasepath() + "/" + fileName + "'";
 					scpClient.download(fileToDownload, rFile);
-					
+
 				}
 			}
 			getFileTransfer().endFileTransfer(jobId, ft, getSessionID());
-			
+
 		} catch (IOException | JSchException | ServiceException e) {
 			throw new HaaSClientException(e);
 		}

haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClientWithSPIM.java

@@ -17,8 +17,8 @@ public class TestHaaSJavaClientWithSPIM {
 		HaaSClient client = new HaaSClient(2l, 9600, 6l, "DD-17-31");
 		Path baseDir = Paths.get("/home/koz01/Work/vyzkumnik/fiji/work/aaa");
 
-		long jobId =  client.start(getAllFiles(baseDir.resolve("spim-data")), "TestOutRedirect",
-						 Collections.emptyList());
+		long jobId = client.start(getAllFiles(baseDir.resolve("spim-data")), "TestOutRedirect",
+				Collections.emptyList());
 		Path workDir = baseDir.resolve("" + jobId);
 		if (!Files.isDirectory(workDir)) {
 			Files.createDirectories(workDir);
@@ -49,7 +49,7 @@ public class TestHaaSJavaClientWithSPIM {
 	}
 
 	private static Iterable<Path> getAllFiles(Path resolve) {
-		
+
 		return () -> {
 			try {
 				return Files.newDirectoryStream(resolve).iterator();

java-scpclient/src/test/java/TestSCP.java

+import java.io.IOException;
+import java.nio.file.Paths;
+
+import com.jcraft.jsch.JSchException;
+
+import cz.it4i.fiji.scpclient.ScpClient;
+
+public class TestSCP {
+
+	public TestSCP() {
+		
+	}
+	
+	public static void main(String[] args) throws JSchException, IOException {
+		try(ScpClient scp = new ScpClient("salomon.it4i.cz", "koz01", "/home/koz01/.ssh/it4i_rsa-np", null)) {
+			System.out.println( scp.upload(Paths.get("/home/koz01/Work/vyzkumnik/fiji/work/aaa/spim-data/exampleSingleChannel(9).czi"), "'/home/koz01/exampleSingleChannel(9).czi'"));
+		}
+	}
+
+}