Move settings for HaaS to specific interface

haas-imagej-client/src/main/java/cz/it4i/fiji/haas/.gitignore

+/TestingConstants.java

haas-imagej-client/src/main/java/cz/it4i/fiji/haas/CheckStatusOfHaaS.java

@@ -45,7 +45,7 @@ public class CheckStatusOfHaaS implements Command {
 	@Override
 	public void run() {
 		try {
-			jobManager = new JobManager(getWorkingDirectoryPath());
+			jobManager = new JobManager(getWorkingDirectoryPath(),TestingConstants.getSettings());
 			if (uiService.isHeadless()) {
 				downloadAll();
 			} else {

haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java

@@ -121,7 +121,7 @@ public class Job {
 
 	synchronized public void download(Progress progress) {
 		if (!needsDownload()) {
-			throw new IllegalStateException("Job: " + getJobId() + " dosn't need download");
+			throw new IllegalStateException("Job: " + getJobId() + " doesn't need download");
 		}
 		haasClientSupplier.get().download(getJobId(), jobDir, new P_ProgressNotifierAdapter(progress));
 		needsDownload = false;

haas-imagej-client/src/main/java/cz/it4i/fiji/haas/JobManager.java

@@ -11,6 +11,7 @@ import java.util.stream.Collectors;
 
 import cz.it4i.fiji.haas_java_client.HaaSClient;
 import cz.it4i.fiji.haas_java_client.JobState;
+import cz.it4i.fiji.haas_java_client.Settings;
 import javafx.beans.value.ObservableValueBase;
 import net.imagej.updater.util.Progress;
 
@@ -22,9 +23,12 @@ public class JobManager {
 
 	private HaaSClient haasClient;
 
+	private Settings settings;
+
 	
-	public JobManager(Path workDirectory) throws IOException {
+	public JobManager(Path workDirectory, Settings settings) throws IOException {
 		this.workDirectory = workDirectory;
+		this.settings = settings;
 		Files.list(this.workDirectory).filter(p -> Files.isDirectory(p) && Job.isJobPath(p)).forEach(p -> {
 			try {
 				jobs.add(new Job(p, this::getHaasClient));
@@ -56,7 +60,7 @@ public class JobManager {
 
 	private HaaSClient getHaasClient() {
 		if (haasClient == null) {
-			haasClient = new HaaSClient(2l, 9600, 6l, "DD-17-31");
+			haasClient = new HaaSClient(settings);
 		}
 		return haasClient;
 	}

haas-imagej-client/src/main/java/cz/it4i/fiji/haas/RunWithHaaS.java

@@ -49,7 +49,7 @@ public class RunWithHaaS implements Command {
 	@Override
 	public void run() {
 		try {
-			jobManager = new JobManager(getWorkingDirectoryPath());
+			jobManager = new JobManager(getWorkingDirectoryPath(),TestingConstants.getSettings());
 			jobManager.startJob(getWorkingDirectoryPath(), getContent(dataDirectory),
 					ModalDialogs.doModal(new ProgressDialog(getFrame())));
 		} catch (IOException e) {

haas-imagej-client/src/main/java/cz/it4i/fiji/haas/TestingConstants.template

+package cz.it4i.fiji.haas;
+
+import cz.it4i.fiji.haas_java_client.Settings;
+
+interface TestingConstants {
+	String USER_NAME = <user name to haas>;
+	String PASSWORD = <password to haas>;
+	String EMAIL = ;
+	String PHONE = ;
+	
+	
+	static Settings getSettings() {
+		long templateId = 2l;
+		int timeOut = 9600; 
+		long clusterNodeType = 6l;
+		String projectId = "DD-17-31";
+		return new Settings() {
+			
+			@Override
+			public String getUserName() {
+				return USER_NAME;
+			}
+			
+			@Override
+			public String getPhone() {
+				return PHONE;
+			}
+			
+			@Override
+			public String getPassword() {
+				return PASSWORD;
+			}
+			
+			@Override
+			public String getEmail() {
+				return EMAIL;
+			}
+
+			@Override
+			public long getTemplateId() {
+				return templateId;
+			}
+			
+			@Override
+			public int getTimeout() {
+				return timeOut;
+			}
+			
+			@Override
+			public long getClusterNodeType() {
+				return clusterNodeType;
+			}
+
+			@Override
+			public String getProjectId() {
+				return projectId;
+			}
+		};
+	}
+	
+}
\ No newline at end of file

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

@@ -118,6 +118,8 @@ public class HaaSClient {
 		}
 	};
 
+	private Settings settings;
+
 	final static private Map<JobStateExt, JobState> WS_STATE2STATE;
 
 	static {
@@ -132,12 +134,13 @@ public class HaaSClient {
 		WS_STATE2STATE = Collections.unmodifiableMap(map);
 	}
 
-	public HaaSClient(Long templateId, Integer timeOut, Long clusterNodeType, String projectId) {
+	public HaaSClient(Settings settings) {
 		super();
-		this.templateId = templateId;
-		this.timeOut = timeOut;
-		this.clusterNodeType = clusterNodeType;
-		this.projectId = projectId;
+		this.settings = settings;
+		this.templateId = settings.getTemplateId();
+		this.timeOut = settings.getTimeout();
+		this.clusterNodeType = settings.getClusterNodeType();
+		this.projectId = settings.getProjectId();
 	}
 
 	public long start(Iterable<Path> files, String name, Collection<Entry<String, String>> templateParameters) {
@@ -297,8 +300,8 @@ public class HaaSClient {
 		testJob.setProject(projectId);
 		testJob.setWaitingLimit(null);
 		testJob.setWalltimeLimit(timeOut);
-		testJob.setNotificationEmail(Constants.EMAIL);
-		testJob.setPhoneNumber(Constants.PHONE);
+		testJob.setNotificationEmail(settings.getEmail());
+		testJob.setPhoneNumber(settings.getPhone());
 		testJob.setNotifyOnAbort(false);
 		testJob.setNotifyOnFinish(false);
 		testJob.setNotifyOnStart(false);
@@ -337,7 +340,7 @@ public class HaaSClient {
 
 	private String authenticate() throws RemoteException, ServiceException {
 		return getUserAndLimitationManagement()
-				.authenticateUserPassword(new PasswordCredentialsExt(Constants.USER_NAME, Constants.PASSWORD));
+				.authenticateUserPassword(new PasswordCredentialsExt(settings.getUserName(), settings.getPassword()));
 	}
 
 	private UserAndLimitationManagementWsSoap getUserAndLimitationManagement() throws ServiceException {

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

+package cz.it4i.fiji.haas_java_client;
+
+public interface Settings {
+	String getUserName();
+	String getPassword();
+	String getEmail();
+	String getPhone();
+	long getTemplateId();
+	int getTimeout();
+	long getClusterNodeType();
+	String getProjectId();
+}

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

+package cz.it4i.fiji.haas_java_client;
+
+interface TestingConstants {
+	String USER_NAME = "testuser";
+	String PASSWORD = "57f9caaf84";
+	String EMAIL = "jan.kozusznik@vsb.cz";
+	String PHONE = "999111000";
+	
+	static Settings getSettings(long templateId, int timeOut, long clusterNodeType, String projectId) {
+		return new Settings() {
+			
+			@Override
+			public String getUserName() {
+				return USER_NAME;
+			}
+			
+			@Override
+			public String getPhone() {
+				return PHONE;
+			}
+			
+			@Override
+			public String getPassword() {
+				return PASSWORD;
+			}
+			
+			@Override
+			public String getEmail() {
+				return EMAIL;
+			}
+
+			@Override
+			public long getTemplateId() {
+				return templateId;
+			}
+			
+			@Override
+			public int getTimeout() {
+				return timeOut;
+			}
+			
+			@Override
+			public long getClusterNodeType() {
+				return clusterNodeType;
+			}
+
+			@Override
+			public String getProjectId() {
+				return projectId;
+			}
+		};
+	}
+	
+}
\ No newline at end of file

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

@@ -20,8 +20,8 @@ public class TestHaaSJavaClient {
 		Map<String, String> params = new HashMap<>();
 		params.put("inputParam", "someStringParam");
 		Path baseDir = Paths.get("/home/koz01/aaa");
-		HaaSClient client = new HaaSClient( 1l,600, 7l,"DD-17-31");
-		long jobId = client.start(Arrays.asList(Paths.get("/home/koz01/aaa/vecmath.jar")), "TestOutRedirect", params.entrySet());
+		HaaSClient client = new HaaSClient(TestingConstants.getSettings(1l, 600,7l, "DD-17-31"));
+		long jobId = client.start(Arrays.asList(Paths.get("/home/koz01/.inputrc")), "TestOutRedirect", params.entrySet());
 		Path workDir = baseDir.resolve("" + jobId);
 		if (!Files.isDirectory(workDir)) {
 			Files.createDirectories(workDir);

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

@@ -14,7 +14,7 @@ import cz.it4i.fiji.haas_java_client.proxy.JobFileContentExt;
 public class TestHaaSJavaClientWithSPIM {
 
 	public static void main(String[] args) throws ServiceException, IOException {
-		HaaSClient client = new HaaSClient(2l, 9600, 6l, "DD-17-31");
+		HaaSClient client = new HaaSClient(TestingConstants.getSettings(2, 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",