feature: generalize settings

haas-java-client/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cz.it4i.fiji</groupId>
 	<artifactId>haas-java-client</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 	<name>HaaS library for Java</name>
 	<packaging>jar</packaging>
 	<build>

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

@@ -3,8 +3,8 @@ package cz.it4i.fiji.haas_java_client;
 class Constants extends Configuration{
 
 	
-	public Constants() {
-		super("configuration.properties");
+	public Constants(String configFileName) {
+		super(configFileName);
 	}
 
 	public String getUserName() {

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

 package cz.it4i.fiji.haas_java_client;
 
-interface TestingConstants {
+interface SettingsProvider {
 	
-	static Settings getSettings(long templateId, int timeOut, long clusterNodeType, String projectId) {
-		Constants constants = new Constants();
+	static Settings getSettings(long templateId, int timeOut, long clusterNodeType, String projectId, String configFileName) {
+		Constants constants = new Constants(configFileName);
 		return new Settings() {
 			
 			@Override

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

@@ -13,7 +13,7 @@ public class TestConcurentAccessToHaaSFileTransfer {
 	private static Logger log = LoggerFactory.getLogger(cz.it4i.fiji.haas_java_client.TestConcurentAccessToHaaSFileTransfer.class);
 
 	public static void main(String[] args) throws ServiceException, IOException {
-		HaaSClient client = new HaaSClient(TestingConstants.getSettings(1l, 600, 7l, "OPEN-12-20"));
+		HaaSClient client = new HaaSClient(SettingsProvider.getSettings(1l, 600, 7l, "OPEN-12-20",TestingConstants.CONFIGURATION_FILE_NAME));
 		HaaSFileTransfer tr1 = client.startFileTransfer(250, HaaSClient.DUMMY_TRANSFER_FILE_PROGRESS);
 		HaaSFileTransfer tr2 = client.startFileTransfer(249, HaaSClient.DUMMY_TRANSFER_FILE_PROGRESS);
 		log.info("config.yaml - size:" + tr1.obtainSize(Arrays.asList("config.yaml")));

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

@@ -25,7 +25,7 @@ public class TestHaaSJavaClient {
 		Map<String, String> params = new HashMap<>();
 		params.put("inputParam", "someStringParam");
 		Path baseDir = Paths.get("/home/koz01/aaa");
-		HaaSClient client = new HaaSClient(TestingConstants.getSettings(1l, 600, 7l, "DD-17-31"));
+		HaaSClient client = new HaaSClient(SettingsProvider.getSettings(1l, 600, 7l, "DD-17-31", TestingConstants.CONFIGURATION_FILE_NAME));
 		long jobId = client.createJob("TestOutRedirect", params.entrySet());
 		try (HaaSFileTransfer tr = client.startFileTransfer(jobId, HaaSClient.DUMMY_TRANSFER_FILE_PROGRESS)) {
 			tr.upload(new UploadingFileImpl(Paths.get("/home/koz01/aaa/vecmath.jar")));

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

@@ -21,7 +21,7 @@ public class TestHaaSJavaClientWithSPIM {
 	private static Logger log = LoggerFactory.getLogger(cz.it4i.fiji.haas_java_client.TestHaaSJavaClientWithSPIM.class);
 
 	public static void main(String[] args) throws ServiceException, IOException {
-		HaaSClient client = new HaaSClient(TestingConstants.getSettings(2, 9600, 6l, "DD-17-31"));
+		HaaSClient client = new HaaSClient(SettingsProvider.getSettings(2, 9600, 6l, "DD-17-31", TestingConstants.CONFIGURATION_FILE_NAME));
 		Path baseDir = Paths.get("/home/koz01/Work/vyzkumnik/fiji/work/aaa");
 
 		long jobId = client.createJob("TestOutRedirect", Collections.emptyList());

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

+package cz.it4i.fiji.haas_java_client;
+
+public interface TestingConstants {
+
+	String CONFIGURATION_FILE_NAME = "configuration.properties";
+
+}