diff --git a/haas-java-client/pom.xml b/haas-java-client/pom.xml index f0021744668446e6856da14105a111dba7958402..69a177f983346a5fdf37cd942184902455dd228e 100644 --- a/haas-java-client/pom.xml +++ b/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> diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/Constants.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/Constants.java index 35f602ac95f040ba9912f83bc9596754673025be..623d3797beaec094e0675d0208ed578a17534044 100644 --- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/Constants.java +++ b/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() { diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/TestingConstants.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/SettingsProvider.java similarity index 86% rename from haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/TestingConstants.java rename to haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/SettingsProvider.java index 389ebe716048fbbcbe0f683c3908ad6b3a415db9..7e09dc731324df29ce3523381a5a624d3e407db1 100644 --- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/TestingConstants.java +++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/SettingsProvider.java @@ -1,9 +1,9 @@ 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 diff --git a/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestConcurentAccessToHaaSFileTransfer.java b/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestConcurentAccessToHaaSFileTransfer.java index 8646f9816af46e211d499ce6ed1704fe44ab0653..68546f9ae7f3540722a6dd7557c98f046e1adbd3 100644 --- a/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestConcurentAccessToHaaSFileTransfer.java +++ b/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"))); diff --git a/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient.java b/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient.java index b8b693824565f80dc1ff91300cd5db7ba8074353..d19be89ffd1cacd215bf4096042bb8b418caafeb 100644 --- a/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient.java +++ b/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"))); diff --git a/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClientWithSPIM.java b/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClientWithSPIM.java index 1feeda28fab960db550d1500923058b288ffc4dc..585d93ea852f986ec9d54f2978622424ed610eb6 100644 --- a/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClientWithSPIM.java +++ b/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()); diff --git a/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestingConstants.java b/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestingConstants.java new file mode 100644 index 0000000000000000000000000000000000000000..8c144644fc8d01ca8b377b1e4abcf6f42d3a76b2 --- /dev/null +++ b/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestingConstants.java @@ -0,0 +1,7 @@ +package cz.it4i.fiji.haas_java_client; + +public interface TestingConstants { + + String CONFIGURATION_FILE_NAME = "configuration.properties"; + +}