Rename has-pipeline-name to has-script

Author: Evgenii Grigorev

src/main/java/og_spipes/model/spipes/TransformationDTO.java

@@ -12,7 +12,7 @@
 public class TransformationDTO extends Transformation {
 
 //    //TODO ask why this attribute is not possible to map??? Also I lose properties field
-//    @OWLDataProperty(iri = "http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name")
+//    @OWLDataProperty(iri = "http://onto.fel.cvut.cz/ontologies/s-pipes/has-script")
 //    private String pipelineName;
 //
 //    @OWLDataProperty(iri = "http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-execution-duration")

src/main/java/og_spipes/persistence/dao/TransformationDAO.java

@@ -41,7 +41,7 @@ public String getPipelineName(String executionId) {
         String execUri = "http://onto.fel.cvut.cz/ontologies/dataset-descriptor/pipeline-execution/" + executionId;
         String sparql = "SELECT DISTINCT ?pipelineName WHERE { " +
                 "<" + execUri + "> <http://onto.fel.cvut.cz/ontologies/dataset-descriptor/has-part> ?moduleExec . " +
-                "?moduleExec <http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name> ?pipelineName . " +
+                "?moduleExec <http://onto.fel.cvut.cz/ontologies/s-pipes/has-script> ?pipelineName . " +
                 "}";
         Query query = em.createNativeQuery(sparql);
         return query.getSingleResult().toString();

src/main/java/og_spipes/service/FormService.java

@@ -448,10 +448,17 @@ public Question functionToForm(Model script, Resource function) {
 
             subQuestions.add(functionQ);
 
-            for(Statement st : script.listStatements(null, new PropertyImpl("http://spinrdf.org/sp#varName"), (String) null).toList()){
+            Property parameterProp = function.getModel().createProperty("http://www.w3.org/ns/shacl#parameter");
+            Property pathProp = function.getModel().createProperty("http://www.w3.org/ns/shacl#path");
+
+            StmtIterator parameters = function.listProperties(parameterProp);
+            while (parameters.hasNext()) {
+                Resource constraint = parameters.nextStatement().getResource();
+                Statement st = constraint.getProperty(pathProp);
+
                 Question q = new Question();
                 initializeQuestionUri(q);
-                q.setLabel(st.getObject().toString());
+                q.setLabel(st.getResource().getLocalName());
                 q.setProperties(extractQuestionMetadata(st));
                 q.setPrecedingQuestions(Collections.singleton(functionQ));
                 subQuestions.add(q);

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

@@ -127,10 +127,10 @@ public String moduleExecution(String moduleScript, String moduleInput, String mo
      */
     public List<ExecutionDTO> getAllExecution() {
         return transformationDAO.getAllExecutionTransformation().stream()
-                .filter(x -> x.getProperties().containsKey("http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name"))
+                .filter(x -> x.getProperties().containsKey("http://onto.fel.cvut.cz/ontologies/s-pipes/has-script"))
                 .map(x -> {
                     Map<String, Set<Object>> properties = x.getProperties();
-                    String pipelineURI = properties.get("http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name").stream().findFirst().orElse("").toString();
+                    String pipelineURI = properties.get("http://onto.fel.cvut.cz/ontologies/s-pipes/has-script").stream().findFirst().orElse("").toString();
                     String name = pipelineURI.substring(pipelineURI.lastIndexOf("/")+1);
                     String duration = properties.get("http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-execution-duration").stream().findFirst().orElse("").toString();
                     Date startDate = x.getStart_date();

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

@@ -75,7 +75,7 @@ public void moduleExecution() throws IOException, SPipesEngineException {
     @Test
     public void getAllExecution() throws IOException {
         Map<String, Set<Object>> properties = new HashMap<>();
-        properties.put("http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name", Collections.singleton("http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2"));
+        properties.put("http://onto.fel.cvut.cz/ontologies/s-pipes/has-script", Collections.singleton("http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2"));
         properties.put("http://onto.fel.cvut.cz/ontologies/dataset-descriptor/has-part", Collections.singleton("http://onto.fel.cvut.cz/ontologies/dataset-descriptor/transformation/1618874296751000"));
         properties.put("http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-execution-start-date", Collections.singleton(new Date(1619039405731L)));
         properties.put("http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-execution-finish-date", Collections.singleton(new Date(1619039432986L)));

src/test/resources/rdf4j_source/repositories/rdf4j_export

@@ -14,7 +14,7 @@
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-execution-finish-date-unix>
     "1619043855186"^^<http://www.w3.org/2001/XMLSchema#long>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-execution-duration> "281"^^<http://www.w3.org/2001/XMLSchema#long>;
-  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
+  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-script> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
 
 <http://onto.fel.cvut.cz/ontologies/s-pipes/query_solution_1619043854967> a <http://onto.fel.cvut.cz/ontologies/s-pipes/query_solution>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has_binding> <http://onto.fel.cvut.cz/ontologies/s-pipes/query_solution_1619043854967/repositoryName>,
@@ -58,7 +58,7 @@
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-input-model-triple-count> "0"^^<http://www.w3.org/2001/XMLSchema#long>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-module-type> <http://topbraid.org/sparqlmotionlib#BindWithConstant>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-module-execution-duration> "4"^^<http://www.w3.org/2001/XMLSchema#long>;
-  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
+  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-script> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
 
 <http://onto.fel.cvut.cz/ontologies/dataset-descriptor/transformation/1619043854875003-1312806988-399429203>
   a <http://www.w3.org/2002/07/owl#Thing>, <http://onto.fel.cvut.cz/ontologies/dataset-descriptor/transformation>;
@@ -77,7 +77,7 @@
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-input-model-triple-count> "0"^^<http://www.w3.org/2001/XMLSchema#long>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-module-type> <http://topbraid.org/sparqlmotionlib#BindWithConstant>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-module-execution-duration> "3"^^<http://www.w3.org/2001/XMLSchema#long>;
-  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
+  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-script> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
 
 <file:/home/jordan/apache-tomcat-9.0.45/temp/2021-04-21T22_23_58.900Z-s-pipes-log-5181096301762785817/pipeline-execution-1619043854875003/2021-04-21T22_24_14.926Z-module-1619043854875003-845999858-399429203-input.ttl>
   a <http://onto.fel.cvut.cz/ontologies/dataset-descriptor/source-dataset-snapshot> .
@@ -132,7 +132,7 @@
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-input-model-triple-count> "0"^^<http://www.w3.org/2001/XMLSchema#long>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-module-type> <http://topbraid.org/sparqlmotionlib#ApplyConstruct>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-module-execution-duration> "4"^^<http://www.w3.org/2001/XMLSchema#long>;
-  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
+  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-script> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
 
 <file:/home/jordan/apache-tomcat-9.0.45/temp/2021-04-21T22_23_58.900Z-s-pipes-log-5181096301762785817/pipeline-execution-1619043854875003/2021-04-21T22_24_14.994Z-module-1619043854875003-1312806988-399429203-input.ttl>
   a <http://onto.fel.cvut.cz/ontologies/dataset-descriptor/source-dataset-snapshot> .
@@ -191,7 +191,7 @@
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-input-model-triple-count> "1"^^<http://www.w3.org/2001/XMLSchema#long>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-module-type> <http://topbraid.org/sparqlmotionlib#ReturnRDF>;
   <http://onto.fel.cvut.cz/ontologies/s-pipes/has-module-execution-duration> "2"^^<http://www.w3.org/2001/XMLSchema#long>;
-  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-pipeline-name> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
+  <http://onto.fel.cvut.cz/ontologies/s-pipes/has-script> <http://onto.fel.cvut.cz/ontologies/s-pipes/hello-world-example-0.2> .
 
 <file:/home/jordan/apache-tomcat-9.0.45/temp/2021-04-21T22_23_58.900Z-s-pipes-log-5181096301762785817/pipeline-execution-1619043854875003/2021-04-21T22_24_15.059Z-module-1619043854875003-1304810422-399429203-input.ttl>
   a <http://onto.fel.cvut.cz/ontologies/dataset-descriptor/source-dataset-snapshot> .