Merge pull request #813 from jamesrdf/issues/#812-service-strategy

Fix #812: Pass service resolver from store to eval strategy factory

Author: James Leigh

compliance/store/src/test/java/org/eclipse/rdf4j/repository/sparql/SPARQLServiceEvaluationTest.java

@@ -26,16 +26,21 @@
 import org.eclipse.rdf4j.query.QueryLanguage;
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.evaluation.EvaluationStrategy;
+import org.eclipse.rdf4j.query.algebra.evaluation.federation.FederatedServiceResolverImpl;
+import org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 import org.eclipse.rdf4j.repository.RepositoryException;
 import org.eclipse.rdf4j.repository.http.HTTPMemServer;
 import org.eclipse.rdf4j.repository.http.HTTPRepository;
 import org.eclipse.rdf4j.repository.sail.SailRepository;
-import org.eclipse.rdf4j.rio.RDFFormat;
 import org.eclipse.rdf4j.rio.RDFParseException;
 import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.sail.Sail;
 import org.eclipse.rdf4j.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.sail.memory.config.MemoryStoreConfig;
+import org.eclipse.rdf4j.sail.memory.config.MemoryStoreFactory;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -100,6 +105,12 @@ public void setUp()
 		localRepository = new SailRepository(new MemoryStore());
 		localRepository.initialize();
 
+		prepareLocalRepository();
+	}
+
+	private void prepareLocalRepository()
+		throws IOException
+	{
 		loadDataSet(localRepository, "/testdata-query/defaultgraph.ttl");
 
 		f = localRepository.getValueFactory();
@@ -199,4 +210,23 @@ else if (alice.equals(x)) {
 			conn.close();
 		}
 	}
+
+	/**
+	 * The provided FederatedServiceResolver should finds it way to the {@link EvaluationStrategy}
+	 */
+	@Test
+	public void testRepositoryConfigurationSetup()
+		throws Exception
+	{
+		tearDown();
+		MemoryStoreFactory factory = new MemoryStoreFactory();
+		MemoryStoreConfig config = new MemoryStoreConfig();
+		config.setEvaluationStrategyFactoryClassName(StrictEvaluationStrategyFactory.class.getName());
+		Sail sail = factory.getSail(config);
+		localRepository = new SailRepository(sail);
+		localRepository.setFederatedServiceResolver(new FederatedServiceResolverImpl());
+		localRepository.initialize();
+		prepareLocalRepository();
+		testSimpleServiceQuery();
+	}
 }

core/http/client/src/main/java/org/eclipse/rdf4j/http/client/SPARQLProtocolSession.java

@@ -1144,9 +1144,12 @@ else if (errInfo.getErrorType() == ErrorType.MALFORMED_QUERY) {
 						else if (errInfo.getErrorType() == ErrorType.UNSUPPORTED_QUERY_LANGUAGE) {
 							throw new UnsupportedQueryLanguageException(errInfo.getErrorMessage());
 						}
-						else {
+						else if (errInfo.toString().length() > 0){
 							throw new RepositoryException(errInfo.toString());
 						}
+						else {
+							throw new RepositoryException(response.getStatusLine().getReasonPhrase());
+						}
 				}
 			}
 		}

core/sail/memory/src/main/java/org/eclipse/rdf4j/sail/memory/MemoryStore.java

@@ -214,7 +214,7 @@ public synchronized FederatedServiceResolver getFederatedServiceResolver() {
 			if (dependentServiceResolver == null) {
 				dependentServiceResolver = new FederatedServiceResolverImpl();
 			}
-			return serviceResolver = dependentServiceResolver;
+			setFederatedServiceResolver(dependentServiceResolver);
 		}
 		return serviceResolver;
 	}
@@ -226,8 +226,11 @@ public synchronized FederatedServiceResolver getFederatedServiceResolver() {
 	 * @param reslover
 	 *        The SERVICE resolver to set.
 	 */
-	public synchronized void setFederatedServiceResolver(FederatedServiceResolver reslover) {
-		this.serviceResolver = reslover;
+	public synchronized void setFederatedServiceResolver(FederatedServiceResolver resolver) {
+		this.serviceResolver = resolver;
+		if (resolver != null && evalStratFactory instanceof FederatedServiceResolverClient) {
+			((FederatedServiceResolverClient)evalStratFactory).setFederatedServiceResolver(resolver);
+		}
 	}
 
 	/**

core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/NativeStore.java

@@ -199,7 +199,7 @@ public synchronized FederatedServiceResolver getFederatedServiceResolver() {
 			if (dependentServiceResolver == null) {
 				dependentServiceResolver = new FederatedServiceResolverImpl();
 			}
-			return serviceResolver = dependentServiceResolver;
+			setFederatedServiceResolver(dependentServiceResolver);
 		}
 		return serviceResolver;
 	}
@@ -213,6 +213,9 @@ public synchronized FederatedServiceResolver getFederatedServiceResolver() {
 	 */
 	public synchronized void setFederatedServiceResolver(FederatedServiceResolver resolver) {
 		this.serviceResolver = resolver;
+		if (resolver != null && evalStratFactory instanceof FederatedServiceResolverClient) {
+			((FederatedServiceResolverClient)evalStratFactory).setFederatedServiceResolver(resolver);
+		}
 	}
 
 	/**