Add sending of sciptPath parameter so it could be processed by s-pipes

Author: Evgenii Grigorev

src/main/java/og_spipes/rest/FunctionController.java

@@ -76,6 +76,7 @@ public String executeFunction(@RequestBody ExecuteFunctionDTO dto) throws SPipes
 
         String function = dto.getFunction();
         String[] split = dto.getParams().split("&");
+        String scriptPath = dto.getScriptPath();
 
         Map<String, String> params = new HashMap<>();
         if(!dto.getParams().equals("")){
@@ -84,7 +85,7 @@ public String executeFunction(@RequestBody ExecuteFunctionDTO dto) throws SPipes
                     .collect(Collectors.toMap(e -> e[0], e -> e[1]));
         }
 
-        return executorService.serviceExecution(function, params);
+        return executorService.serviceExecution(function, params, scriptPath);
     }
 
     @PostMapping(path = "/module/execute")

src/main/java/og_spipes/service/SPipesExecutionService.java

@@ -53,11 +53,13 @@ public SPipesExecutionService(
 
     public String serviceExecution (
             String functionId,
-            Map<String, String> params
+            Map<String, String> params,
+            String scriptPath
     ) throws SPipesEngineException {
         String serviceUrl = engineUrl + "/service";
         params.put("_pId", functionId);
         params.put("_pConfigURL", pConfigURL);
+        params.put("_pScriptPath", scriptPath);
 
         UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(serviceUrl);
         for (Map.Entry<String, String> pair : params.entrySet()) {
@@ -97,6 +99,7 @@ public String moduleExecution(String moduleScript, String moduleInput, String mo
         params.put("_pId", moduleId);
         createDebugConfig(configLocation, moduleScript);
         params.put("_pConfigURL", configLocation);
+        params.put("_pScriptPath", moduleScript);
 
         UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(serviceUrl);
         for (Map.Entry<String, String> pair : params.entrySet()) {

src/test/java/og_spipes/service/SPipesExecutionServiceTest.java

@@ -48,7 +48,7 @@ public void serviceExecution() throws SPipesEngineException {
                 "execute-greeding",
                 new HashMap<String, String>() {{
                     put("firstName","karel");
-                }}
+                }}, "serviceExecutionTest.ttl"
         );
 
         Assertions.assertEquals("body", entity);