Merge pull request #873 from jamesrdf/issues/#872-guava

Fix #872: Move guava dependency from util to sail-model

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/sail/model/pom.xml

@@ -19,6 +19,10 @@
 			<artifactId>rdf4j-sail-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+		</dependency>
 	</dependencies>
         <build>
                 <plugins>

…eclipse/rdf4j/util/NonSerializables.java …e/rdf4j/sail/model/NonSerializables.javacore/util/src/main/java/org/eclipse/rdf4j/util/NonSerializables.java renamed to core/sail/model/src/main/java/org/eclipse/rdf4j/sail/model/NonSerializables.java core/util/src/main/java/org/eclipse/rdf4j/util/NonSerializables.java renamed to core/sail/model/src/main/java/org/eclipse/rdf4j/sail/model/NonSerializables.java

@@ -5,11 +5,13 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *******************************************************************************/
-package org.eclipse.rdf4j.util;
+package org.eclipse.rdf4j.sail.model;
 
 import java.util.Map;
 import java.util.UUID;
 
+import org.eclipse.rdf4j.util.UUIDable;
+
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 

core/sail/model/src/main/java/org/eclipse/rdf4j/sail/model/SailModel.java

@@ -33,7 +33,6 @@
 import org.eclipse.rdf4j.model.util.ModelException;
 import org.eclipse.rdf4j.sail.SailConnection;
 import org.eclipse.rdf4j.sail.SailException;
-import org.eclipse.rdf4j.util.NonSerializables;
 
 /**
  * Model implementation for a {@link org.eclipse.rdf4j.sail.SailConnection}. All

core/util/pom.xml

@@ -14,11 +14,6 @@
 	<description>RDF4J utility classes</description>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>