Merge pull request #277 from WDAqua/initializeGraph

Added query to insert required triples on graph init.

qanary_commons/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.wdaqua.qanary</groupId>
 	<artifactId>qa.commons</artifactId>
-	<version>3.13.0</version>
+	<version>3.14.0</version>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>

qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java

@@ -20,6 +20,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -54,6 +55,7 @@ public class QanaryQuestion<T> {
 	private QanaryConfigurator myQanaryConfigurator;
 
   private String FILENAME_SELECT_TRANSLATION_ANNOTATION = "/queries/select_all_AnnotationOfQuestionTranslation.rq";
+  private String REQUIRED_TRIPLES = "/queries/insert_required_triples.rq";
 	private String FILENAME_SELECT_URI_TEXTUAL_REPRESENTATION = "/queries/select_uri_textual_representation.rq";
 
 	/**
@@ -139,10 +141,28 @@ public QanaryQuestion(final URL questionUri, QanaryConfigurator qanaryConfigurat
 		// loadTripleStore(sparqlquery, qanaryConfigurator); // TODO: remove
 		qanaryConfigurator.getQanaryTripleStoreConnector().update(sparqlquery);
 
+		loadRequiredTriplesToTriplestore(qanaryConfigurator.getQanaryTripleStoreConnector());
 
 		initFromTriplestore(qanaryConfigurator);
 	}
 
+	/**
+	 * Function that inserts required triples for graph initialization
+	 * @param qanaryTripleStoreConnector
+	 */
+	private void loadRequiredTriplesToTriplestore(QanaryTripleStoreConnector qanaryTripleStoreConnector) {
+		QuerySolutionMap querySolutionMap = new QuerySolutionMap();
+		querySolutionMap.add("graph", ResourceFactory.createResource(namedGraph.toASCIIString()));
+		try {
+			String sparqlQuery = QanaryTripleStoreConnector.readFileFromResourcesWithMap(REQUIRED_TRIPLES, querySolutionMap);
+			qanaryTripleStoreConnector.update(sparqlQuery);
+		} catch(IOException e) {
+			logger.warn("Read query from file failed with message: {}", e.getMessage());
+		} catch(SparqlQueryFailed e) {
+			logger.warn("Inserting required triples to triplestore failed, skipping.");
+		}
+	}
+
 	/**
 	 * create QanaryQuestion from the information available in the provided graph
 	 * (data is retrieved from the Qanary triplestore, see application.properties)
@@ -197,8 +217,7 @@ public QanaryTripleStoreConnector getQanaryTripleStoreConnector() {
 
 	/**
 	 * init object properties from a given triplestore URI
-	 * 
-	 * @param triplestore
+	 *
 	 * @throws URISyntaxException
 	 */
 	private void initFromTriplestore(final QanaryConfigurator myQanaryConfigurator) throws URISyntaxException {

qanary_commons/src/main/resources/queries/insert_required_triples.rq

@@ -0,0 +1,9 @@
+PREFIX qa: <http://www.wdaqua.eu/qa#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+
+INSERT {
+	GRAPH ?graph {
+        qa:AnnotationOfLogQuery rdfs:subClassOf qa:AnnotationOfLog .
+
+	}
+}