diff --git a/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/StandardLocalInfraAlgorithm.java b/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/StandardLocalInfraAlgorithm.java index 8e169bf..f0f8c40 100644 --- a/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/StandardLocalInfraAlgorithm.java +++ b/src/main/java/org/gcube/dataanalysis/ecoengine/interfaces/StandardLocalInfraAlgorithm.java @@ -21,7 +21,7 @@ public abstract class StandardLocalInfraAlgorithm extends StandardLocalExternalA if (!serviceAddress.endsWith("/")) serviceAddress = serviceAddress+"/"; - String requestForMessage = serviceAddress + "2/messages/writeMessageToUsers" + "?gcube-token=" + config.getGcubeToken(); + String requestForMessage = serviceAddress + "2/messages/write-message" + "?gcube-token=" + config.getGcubeToken(); requestForMessage = requestForMessage.replace("http://", "https://").replace(":80", ""); // remove the port (or set it to 443) otherwise you get an SSL error LOGGER.debug("Emailing System->Request url is going to be " + requestForMessage); diff --git a/src/test/java/org/gcube/dataanalysis/executor/tests/TestsMetaInfo.java b/src/test/java/org/gcube/dataanalysis/executor/tests/TestsMetaInfo.java index 386e41b..dba47c3 100644 --- a/src/test/java/org/gcube/dataanalysis/executor/tests/TestsMetaInfo.java +++ b/src/test/java/org/gcube/dataanalysis/executor/tests/TestsMetaInfo.java @@ -31,20 +31,20 @@ public static void main(String[] args) throws Exception { AlgorithmConfiguration config = new AlgorithmConfiguration(); config.setConfigPath("./cfg/"); - StatisticalType type = GeneratorsFactory.getAlgorithmOutput("./cfg/","AQUAMAPS_SUITABLE"); + StatisticalType type = GeneratorsFactory.getAlgorithmOutput("./cfg/","AQUAMAPS_SUITABLE", config); System.out.println("output for AQUAMAPS_SUITABLE algorithm: "+type); - type = ModelersFactory.getModelOutput("./cfg/","HSPEN"); + type = ModelersFactory.getModelOutput("./cfg/","HSPEN",config); System.out.println("output for HSPEN algorithm: "+type); - type = EvaluatorsFactory.getEvaluatorOutput("./cfg/","HRS"); + type = EvaluatorsFactory.getEvaluatorOutput("./cfg/","HRS",config); System.out.println("output for HRS algorithm: "+type); - type = ClusterersFactory.getClustererOutput("./cfg/","DBSCAN"); + type = ClusterersFactory.getClustererOutput("./cfg/","DBSCAN",config); System.out.println("output for DBSCAN algorithm: "+type); type = TransducerersFactory.getTransducerOutput(config,"BIOCLIMATE_HSPEC"); System.out.println("output for BIOCLIMATE_HSPEC algorithm: "+type); type = TransducerersFactory.getTransducerOutput(config,"BIONYM_LOCAL"); System.out.println("output for BIONYM_LOCAL algorithm: "+type); - map = GeneratorsFactory.getAlgorithmParameters("./cfg/","AQUAMAPS_SUITABLE"); + map = GeneratorsFactory.getAlgorithmParameters("./cfg/","AQUAMAPS_SUITABLE",config); System.out.println("input for AQUAMAPS_SUITABLE algorithm: "+map); System.out.println("\n***TEST 2 - Get Generator***"); @@ -64,7 +64,7 @@ public static void main(String[] args) throws Exception { System.out.println("Models: "+ModelersFactory.getModelers("./cfg/")); System.out.println("\n***TEST 7- Get Model parameters ***"); - map = ModelersFactory.getModelParameters("./cfg/","HSPEN"); + map = ModelersFactory.getModelParameters("./cfg/","HSPEN",config); System.out.println("input for HSPEN algorithm: "+map); System.out.println("\n***TEST 8- Get Database Default Parameters***"); @@ -75,7 +75,7 @@ public static void main(String[] args) throws Exception { System.out.println("Database Default Values: "+EvaluatorsFactory.getAllEvaluators("./cfg/")); System.out.println("\n***TEST 10- Get Evaluator Parameters ***"); - map = EvaluatorsFactory.getEvaluatorParameters("./cfg/","QUALITY_ANALYSIS"); + map = EvaluatorsFactory.getEvaluatorParameters("./cfg/","QUALITY_ANALYSIS",config); System.out.println("Database Default Values: "+map); System.out.println("\n***TEST 11- Get Evaluators with a config***"); @@ -91,7 +91,7 @@ public static void main(String[] args) throws Exception { System.out.println("All Clusterers: "+ClusterersFactory.getAllClusterers("./cfg/")); System.out.println("\n***TEST 14- Get Clusterer Parameters ***"); - map = ClusterersFactory.getClustererParameters("./cfg/","DBSCAN"); + map = ClusterersFactory.getClustererParameters("./cfg/","DBSCAN",config); System.out.println("Clusterers Params: "+map); System.out.println("\n***TEST 15- Get Clusterers with a config***"); @@ -111,7 +111,7 @@ public static void main(String[] args) throws Exception { System.out.println("\n***TEST 19- Get Agent Description***"); - String desc = ClusterersFactory.getDescription("./cfg/","DBSCAN"); + String desc = ClusterersFactory.getDescription("./cfg/","DBSCAN",config); System.out.println("DESCRIPTION: "+desc); System.out.println("\n***TEST 20- Get USER perspective***");