Merge branch 'develop' of github.com:eclipse/rdf4j into issues/#870-repo-mgr-sail

Author: James Leigh

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

@@ -94,8 +94,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Joiner;
-
 /**
  * The SPARQLProtocolSession provides low level HTTP methods for communication with SPARQL endpoints. All
  * methods are compliant to the <a href="https://www.w3.org/TR/sparql11-protocol/">SPARQL 1.1 Protocol W3C
@@ -151,11 +149,6 @@ public class SPARQLProtocolSession implements HttpClientDependent {
 
 	final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-	/**
-	 * shared instance of a {@link Joiner} for creating a comma-separated string.
-	 */
-	private static final Joiner commaJoiner = Joiner.on(", ");
-
 	/*-----------*
 	 * Variables *
 	 *-----------*/
@@ -828,7 +821,7 @@ private HttpResponse sendTupleQueryViaHttp(HttpUriRequest method, Set<QueryResul
 			}
 		}
 
-		method.addHeader(ACCEPT_PARAM_NAME, commaJoiner.join(acceptValues));
+		method.addHeader(ACCEPT_PARAM_NAME, String.join(", ", acceptValues));
 
 		try {
 			return executeOK(method);
@@ -966,7 +959,7 @@ private HttpResponse sendGraphQueryViaHttp(HttpUriRequest method, boolean requir
 		List<String> acceptParams = RDFFormat.getAcceptParams(rdfFormats, requireContext,
 				getPreferredRDFFormat());
 
-		method.addHeader(ACCEPT_PARAM_NAME, commaJoiner.join(acceptParams));
+		method.addHeader(ACCEPT_PARAM_NAME, String.join(", ", acceptParams));
 
 		try {
 			return executeOK(method);
@@ -1047,7 +1040,7 @@ private HttpResponse sendBooleanQueryViaHttp(HttpUriRequest method, Set<QueryRes
 			}
 		}
 
-		method.addHeader(ACCEPT_PARAM_NAME, commaJoiner.join(acceptValues));
+		method.addHeader(ACCEPT_PARAM_NAME, String.join(", ", acceptValues));
 
 		return executeOK(method);
 	}

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

@@ -10,24 +10,25 @@
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.utils.HttpClientUtils;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
 import org.eclipse.rdf4j.http.client.util.HttpClientBuilders;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
 /**
  * A Manager for HTTP sessions that uses a shared {@link HttpClient} to manage HTTP connections.
  * 
  * @author James Leigh
  */
 public class SharedHttpClientSessionManager implements HttpClientSessionManager, HttpClientDependent {
 
+	private static final AtomicLong threadCount = new AtomicLong();
+
 	/** independent life cycle */
 	private volatile HttpClient httpClient;
 
@@ -46,8 +47,16 @@ public class SharedHttpClientSessionManager implements HttpClientSessionManager,
 	 *--------------*/
 
 	public SharedHttpClientSessionManager() {
-		this.executor = Executors.newCachedThreadPool(
-				new ThreadFactoryBuilder().setNameFormat("rdf4j-sesameclientimpl-%d").build());
+		final ThreadFactory backingThreadFactory = Executors.defaultThreadFactory();
+		this.executor = Executors.newCachedThreadPool(new ThreadFactory() {
+
+			public Thread newThread(Runnable runnable) {
+				Thread thread = backingThreadFactory.newThread(runnable);
+				thread.setName(String.format("rdf4j-sesameclientimpl-%d", threadCount.getAndIncrement()));
+				thread.setDaemon(true);
+				return thread;
+			}
+		});
 	}
 
 	public SharedHttpClientSessionManager(CloseableHttpClient dependentClient,

core/model/src/main/java/org/eclipse/rdf4j/model/Model.java

@@ -28,7 +28,7 @@
  * @see org.eclipse.rdf4j.model.util.Models the Models utility class
  */
 @SuppressWarnings("deprecation")
-public interface Model extends Graph, Set<Statement>, Serializable {
+public interface Model extends Graph, Set<Statement>, Serializable, NamespaceAware {
 
 	/**
 	 * Returns an unmodifiable view of this model. This method provides "read-only" access to this model.
@@ -40,25 +40,6 @@ public interface Model extends Graph, Set<Statement>, Serializable {
 	 */
 	public Model unmodifiable();
 
-	/**
-	 * Gets the map that contains the assigned namespaces.
-	 * 
-	 * @return Map of prefix to namespace
-	 */
-	public Set<Namespace> getNamespaces();
-
-	/**
-	 * Gets the namespace that is associated with the specified prefix, if any.
-	 * 
-	 * @param prefix
-	 *        A namespace prefix.
-	 * @return The namespace name that is associated with the specified prefix, or {@link Optional#empty()} if
-	 *         there is no such namespace.
-	 */
-	public default Optional<Namespace> getNamespace(String prefix) {
-		return getNamespaces().stream().filter(t -> t.getPrefix().equals(prefix)).findAny();
-	}
-
 	/**
 	 * Sets the prefix for a namespace. This will replace any existing namespace associated to the prefix.
 	 * 

core/model/src/main/java/org/eclipse/rdf4j/model/NamespaceAware.java

@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Eclipse RDF4J contributors and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Distribution License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *******************************************************************************/
+package org.eclipse.rdf4j.model;
+
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * An interface that is used to signify that something is able to provide {@link Namespace} information, in
+ * addition to {@link Statement}s.
+ * 
+ * @author Peter Ansell
+ */
+@FunctionalInterface
+public interface NamespaceAware {
+
+	/**
+	 * Gets the set that contains the assigned namespaces.
+	 * 
+	 * @return A {@link Set} containing the {@link Namespace} objects that are available.
+	 */
+	public Set<Namespace> getNamespaces();
+
+	/**
+	 * Gets the namespace that is associated with the specified prefix, if any. If multiple namespaces match
+	 * the given prefix, the result may not be consistent over successive calls to this method.
+	 * 
+	 * @param prefix
+	 *        A namespace prefix.
+	 * @return The namespace name that is associated with the specified prefix, or {@link Optional#empty()} if
+	 *         there is no such namespace.
+	 */
+	public default Optional<Namespace> getNamespace(String prefix) {
+		return getNamespaces().stream().filter(t -> t.getPrefix().equals(prefix)).findAny();
+	}
+
+}

core/model/src/main/java/org/eclipse/rdf4j/model/util/Vocabularies.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2017 Eclipse RDF4J contributors, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Distribution License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.eclipse.rdf4j.model.util;
+
+import java.lang.reflect.Field;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.rdf4j.model.IRI;
+
+/**
+ * Utility functions for working with vocabularies.
+ * 
+ * @author Bart Hanssens
+ */
+public class Vocabularies {
+	/**
+	 * Get all the {@link IRI IRIs} of the classes and properties of a vocabulary.
+	 *
+	 * @param vocabulary RDF vocabulary
+	 * @return set of IRIs
+	 */
+	public static Set<IRI> getIRIs(Class vocabulary) {
+		Set<IRI> iris = new LinkedHashSet<>();
+
+		for (Field f : vocabulary.getFields()) {
+			if (f.getType().equals(IRI.class)) {
+				try {
+					iris.add((IRI) f.get(vocabulary));
+				} catch (IllegalAccessException ex) {
+					// should not happen
+					throw new RuntimeException("Cannot access vocabulary field", ex);
+				}
+			}
+		}
+		return iris;
+	}
+}

core/model/src/test/java/org/eclipse/rdf4j/model/util/VocabulariesTest.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2017 Eclipse RDF4J contributors, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Distribution License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.eclipse.rdf4j.model.util;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.vocabulary.DC;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Bart Hanssens
+ */
+public class VocabulariesTest {
+
+	@Test
+	public void testVocabAllIRI() throws Exception {
+		Set<IRI> dcIRIs = new HashSet<>(Arrays.asList(
+			DC.CONTRIBUTOR, DC.COVERAGE, DC.CREATOR, DC.DATE, DC.DESCRIPTION,
+			DC.FORMAT, DC.IDENTIFIER, DC.LANGUAGE, DC.PUBLISHER, DC.RELATION,
+			DC.RIGHTS, DC.SOURCE, DC.SUBJECT, DC.TITLE, DC.TYPE));
+
+		Set<IRI> allIRIs = Vocabularies.getIRIs(DC.class);
+
+		assertEquals(dcIRIs, allIRIs);
+	}
+}

core/repository/api/src/main/java/org/eclipse/rdf4j/repository/config/RepositoryConfig.java

@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.repository.config;
 
+import static org.eclipse.rdf4j.repository.config.RepositoryConfigSchema.NAMESPACE;
 import static org.eclipse.rdf4j.repository.config.RepositoryConfigSchema.REPOSITORY;
 import static org.eclipse.rdf4j.repository.config.RepositoryConfigSchema.REPOSITORYID;
 import static org.eclipse.rdf4j.repository.config.RepositoryConfigSchema.REPOSITORYIMPL;
@@ -19,6 +20,7 @@
 import org.eclipse.rdf4j.model.util.Models;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
 import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
 
 /**
  * @author Arjohn Kampman
@@ -131,6 +133,9 @@ public void export(Model model) {
 	 */
 	public void export(Model model, Resource repositoryNode) {
 		ValueFactory vf = SimpleValueFactory.getInstance();
+		model.setNamespace(RDFS.NS);
+		model.setNamespace(XMLSchema.NS);
+		model.setNamespace("rep", NAMESPACE);
 		model.add(repositoryNode, RDF.TYPE, REPOSITORY);
 
 		if (id != null) {

core/repository/http/src/main/java/org/eclipse/rdf4j/repository/http/config/HTTPRepositoryConfig.java

@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.repository.http.config;
 
+import static org.eclipse.rdf4j.repository.http.config.HTTPRepositorySchema.NAMESPACE;
 import static org.eclipse.rdf4j.repository.http.config.HTTPRepositorySchema.PASSWORD;
 import static org.eclipse.rdf4j.repository.http.config.HTTPRepositorySchema.REPOSITORYURL;
 import static org.eclipse.rdf4j.repository.http.config.HTTPRepositorySchema.USERNAME;
@@ -78,6 +79,7 @@ public Resource export(Model graph) {
 		Resource implNode = super.export(graph);
 
 		if (url != null) {
+			graph.setNamespace("http", NAMESPACE);
 			graph.add(implNode, REPOSITORYURL, SimpleValueFactory.getInstance().createIRI(url));
 		}
 		// if (username != null) {

core/repository/sail/src/main/java/org/eclipse/rdf4j/repository/sail/config/ProxyRepositoryConfig.java

@@ -50,6 +50,7 @@ public void validate()
 	public Resource export(Model model) {
 		Resource implNode = super.export(model);
 		if (null != this.proxiedID) {
+			model.setNamespace("proxy", ProxyRepositorySchema.NAMESPACE);
 			model.add(implNode, ProxyRepositorySchema.PROXIED_ID,
 					SimpleValueFactory.getInstance().createLiteral(this.proxiedID));
 		}

core/repository/sail/src/main/java/org/eclipse/rdf4j/repository/sail/config/SailRepositoryConfig.java

@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.repository.sail.config;
 
+import static org.eclipse.rdf4j.repository.sail.config.SailRepositorySchema.NAMESPACE;
 import static org.eclipse.rdf4j.repository.sail.config.SailRepositorySchema.SAILIMPL;
 import static org.eclipse.rdf4j.sail.config.SailConfigSchema.SAILTYPE;
 
@@ -69,6 +70,7 @@ public Resource export(Model model) {
 		Resource repImplNode = super.export(model);
 
 		if (sailImplConfig != null) {
+			model.setNamespace("sr", NAMESPACE);
 			Resource sailImplNode = sailImplConfig.export(model);
 			model.add(repImplNode, SAILIMPL, sailImplNode);
 		}