From 1124d6d7894f820da2b536c6a3ceff1e726b70fd Mon Sep 17 00:00:00 2001
From: Miroslav Blasko <blcham@gmail.com>
Date: Wed, 2 Aug 2023 19:39:14 +0200
Subject: [PATCH] [Upd] Refactor

---
 .../cvut/spipes/modules/AbstractModule.java   |  7 ++---
 .../java/cz/cvut/spipes/util/QueryUtils.java  | 27 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/modules/AbstractModule.java b/s-pipes-core/src/main/java/cz/cvut/spipes/modules/AbstractModule.java
index 2a1fe6f0..a94fd7c5 100644
--- a/s-pipes-core/src/main/java/cz/cvut/spipes/modules/AbstractModule.java
+++ b/s-pipes-core/src/main/java/cz/cvut/spipes/modules/AbstractModule.java
@@ -9,6 +9,7 @@
 import cz.cvut.spipes.engine.VariablesBinding;
 import cz.cvut.spipes.exception.ValidationConstraintFailedException;
 import cz.cvut.spipes.util.JenaUtils;
+import cz.cvut.spipes.util.QueryUtils;
 import org.apache.jena.atlas.lib.NotImplemented;
 import org.apache.jena.ontology.OntModel;
 import org.apache.jena.query.*;
@@ -306,9 +307,9 @@ protected String getQueryComment(org.topbraid.spin.model.Query query) {
         if (query.getComment() != null) {
             return query.getComment();
         }
-        String comment = query.toString().split(System.lineSeparator())[0];
-        if (comment.matches("\\s*#.*")) {
-            return comment.split("\\s*#\\s*", 2)[1];
+        String comment = QueryUtils.getQueryComment(query.toString());
+        if (comment != null) {
+            return comment;
         }
 //        Resource obj = query.getPropertyResourceValue(RDFS.comment);
 //        if (obj == null) {
diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/util/QueryUtils.java b/s-pipes-core/src/main/java/cz/cvut/spipes/util/QueryUtils.java
index c8fe5724..05dbe87a 100644
--- a/s-pipes-core/src/main/java/cz/cvut/spipes/util/QueryUtils.java
+++ b/s-pipes-core/src/main/java/cz/cvut/spipes/util/QueryUtils.java
@@ -1,25 +1,18 @@
 package cz.cvut.spipes.util;
 
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.stream.Collectors;
-import org.apache.jena.query.ARQ;
-import org.apache.jena.query.ParameterizedSparqlString;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
+import org.apache.jena.query.*;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.sparql.mgt.Explain;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.regex.Matcher;
+import java.util.stream.Collectors;
+
 public class QueryUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(QueryUtils.class);
@@ -176,4 +169,12 @@ private interface QueryExecutor<T> {
         T execQuery(QueryExecution execution);
     }
 
+    public static String getQueryComment(String query) {
+        String comment = query.split(System.lineSeparator())[0];
+        if (comment.matches("\\s*#.*")) {
+            return comment.split("\\s*#\\s*", 2)[1];
+        }
+        return null;
+    }
+
 }