moved prepareSparqlQuery up to superclass

Author: schlotze

context-core/src/main/java/de/atb/context/persistence/common/RepositoryTDB.java

@@ -17,6 +17,7 @@
 import de.atb.context.common.exceptions.ConfigurationException;
 import de.atb.context.common.util.BusinessCase;
 import de.atb.context.common.util.IApplicationScenarioProvider;
+import de.atb.context.context.util.OntologyNamespace;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.ReadWrite;
 import org.apache.jena.tdb.TDB;
@@ -74,6 +75,13 @@ protected static synchronized boolean clearDirectory(final File dir) {
         }
     }
 
+    public static synchronized String prepareSparqlQuery(final String query) {
+        logger.trace("Preparing sparql query '" + query);
+        String finalQuery = OntologyNamespace.prepareSparqlQuery(query);
+        logger.trace("Final query is " + finalQuery);
+        return finalQuery;
+    }
+
     /**
      * (non-Javadoc)
      *

context-extraction/src/main/java/de/atb/context/persistence/context/ContextRepository.java

@@ -311,7 +311,7 @@ private QueryExecution getQueryExecution(BusinessCase businessCase, String query
         if (query.trim().length() == 0) {
             throw new IllegalArgumentException("Query may not be empty!");
         }
-        String finalQuery = prepareSparqlQuery(businessCase, query);
+        String finalQuery = prepareSparqlQuery(query);
         Model model = dataset.getDefaultModel();
         OntModel ontModel;
         if (useReasoner) {
@@ -358,13 +358,6 @@ private synchronized ContextContainer prepareRawContextContainer(ContextContaine
         return container;
     }
 
-    private synchronized String prepareSparqlQuery(BusinessCase businessCase, String query) {
-        logger.debug("Preparing sparql query '" + query + "' for business case " + businessCase);
-        String finalQuery = OntologyNamespace.prepareSparqlQuery(query);
-        logger.debug("Final query is " + finalQuery);
-        return finalQuery;
-    }
-
     /**
      * (non-Javadoc)
      *
@@ -450,7 +443,7 @@ public synchronized List<String> getLastContextsIds(BusinessCase bc, TimeFrame t
     private synchronized List<String> getLastIds(String queryString, BusinessCase bc) throws QueryException {
         List<String> ids = new ArrayList<>();
         try {
-            String finalQuery = prepareSparqlQuery(bc, queryString);
+            String finalQuery = prepareSparqlQuery(queryString);
             Dataset ds = getDataSet(bc);
             ds.begin(ReadWrite.WRITE);
             ResultSet set = executeSelectSparqlQuery(finalQuery, ds.getDefaultModel());

context-monitoring/src/main/java/de/atb/context/persistence/monitoring/MonitoringDataRepository.java

@@ -19,7 +19,6 @@
 import de.atb.context.common.util.BusinessCase;
 import de.atb.context.common.util.SPARQLHelper;
 import de.atb.context.common.util.TimeFrame;
-import de.atb.context.context.util.OntologyNamespace;
 import de.atb.context.monitoring.config.models.DataSource;
 import de.atb.context.monitoring.models.IMonitoringDataModel;
 import de.atb.context.monitoring.rdf.RdfHelper;
@@ -40,7 +39,6 @@
 
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -473,13 +471,6 @@ public synchronized ResultSet executeSparqlSelectQuery(final BusinessCase busine
         });
     }
 
-    public static synchronized String prepareSparqlQuery(final String query) {
-        logger.trace("Preparing sparql query '" + query);
-        String finalQuery = OntologyNamespace.prepareSparqlQuery(query);
-        logger.trace("Final query is " + finalQuery);
-        return finalQuery;
-    }
-
     @SuppressWarnings("unchecked")
     private <T, D extends DataSource> IMonitoringDataModel<T, D> initLazyModel(final Model model, final Type data) {
         RDF2Bean bb = new RDF2Bean(model);