Merge branch 'develop'

eclipse-rdf4j · Jun 30, 2018 · f75f92c · f75f92c
2 parents fd40eeb + fa70320
commit f75f92c
Show file tree

Hide file tree

Showing 205 changed files with 8,629 additions and 254 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ dependency-reduced-pom.xml
 # NetBean files
 **/nb-configuration.xml
 **/nbactions*.xml
+*.jfr
diff --git a/client/pom.xml b/client/pom.xml
@@ -3,8 +3,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
-		<artifactId>rdf4j-client-parent</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<artifactId>rdf4j-parent</artifactId>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-client</artifactId>
 	<name>RDF4J: Client Library</name>
@@ -212,7 +212,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
 				<executions>
 					<execution>
 						<id>create-manifest</id>

diff --git a/compliance/manager/pom.xml b/compliance/manager/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-manager-compliance</artifactId>

diff --git a/compliance/model/pom.xml b/compliance/model/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-model-compliance</artifactId>

diff --git a/compliance/pom.xml b/compliance/pom.xml
@@ -4,8 +4,8 @@
 
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
-		<artifactId>rdf4j-client-parent</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<artifactId>rdf4j-parent</artifactId>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-compliance</artifactId>

diff --git a/compliance/queryresultio/pom.xml b/compliance/queryresultio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-queryresultio-compliance</artifactId>

diff --git a/...resultio/src/test/java/org/eclipse/rdf4j/query/resultio/text/tsv/SPARQLTSVCustomTest.java b/...resultio/src/test/java/org/eclipse/rdf4j/query/resultio/text/tsv/SPARQLTSVCustomTest.java
@@ -11,7 +11,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 
@@ -76,7 +76,7 @@ private String writeTupleResult(TupleQueryResult tqr)
 	{
 		ByteArrayOutputStream output = new ByteArrayOutputStream();
 		QueryResultIO.writeTuple(tqr, TupleQueryResultFormat.TSV, output);
-		String result = new String(output.toByteArray(), Charset.forName("UTF-8"));
+		String result = new String(output.toByteArray(), StandardCharsets.UTF_8);
 		return result;
 	}
 

diff --git a/compliance/rio/pom.xml b/compliance/rio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-rio-compliance</artifactId>

diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/jsonld/JSONLDParserHandlerTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/jsonld/JSONLDParserHandlerTest.java
@@ -10,7 +10,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Namespace;
@@ -86,7 +86,7 @@ private InputStream writeJSONLD(Model statements)
 
 		// System.out.println(writer.toString());
 
-		return new ByteArrayInputStream(writer.toString().getBytes(Charset.forName("UTF-8")));
+		return new ByteArrayInputStream(writer.toString().getBytes(StandardCharsets.UTF_8));
 	}
 
 }
diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/nquads/NQuadsHandlingTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/nquads/NQuadsHandlingTest.java
@@ -10,7 +10,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -80,7 +80,7 @@ private InputStream writeNQuads(Model statements)
 		}
 		nQuadsWriter.endRDF();
 
-		return new ByteArrayInputStream(writer.toString().getBytes(Charset.forName("UTF-8")));
+		return new ByteArrayInputStream(writer.toString().getBytes(StandardCharsets.UTF_8));
 	}
 
 }
diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/ntriples/NTriplesHandlingTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/ntriples/NTriplesHandlingTest.java
@@ -10,7 +10,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -80,7 +80,7 @@ private InputStream writeNTriples(Model statements)
 		}
 		nTriplesWriter.endRDF();
 
-		return new ByteArrayInputStream(writer.toString().getBytes(Charset.forName("UTF-8")));
+		return new ByteArrayInputStream(writer.toString().getBytes(StandardCharsets.UTF_8));
 	}
 
 }
diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/rdfjson/RDFJSONHandlingTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/rdfjson/RDFJSONHandlingTest.java
@@ -10,7 +10,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -81,7 +81,7 @@ private InputStream writeRDFJSON(Model statements)
 		}
 		rdfjsonWriter.endRDF();
 
-		return new ByteArrayInputStream(writer.toString().getBytes(Charset.forName("UTF-8")));
+		return new ByteArrayInputStream(writer.toString().getBytes(StandardCharsets.UTF_8));
 	}
 
 }
diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/rdfxml/RDFXMLHandlingTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/rdfxml/RDFXMLHandlingTest.java
@@ -10,7 +10,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -80,7 +80,7 @@ private InputStream writeRDFXML(Model statements)
 		}
 		rdfxmlWriter.endRDF();
 
-		return new ByteArrayInputStream(writer.toString().getBytes(Charset.forName("UTF-8")));
+		return new ByteArrayInputStream(writer.toString().getBytes(StandardCharsets.UTF_8));
 	}
 
 }
diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/trig/TriGHandlingTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/trig/TriGHandlingTest.java
@@ -10,7 +10,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -80,7 +80,7 @@ private InputStream writeTriG(Model statements)
 		}
 		trigWriter.endRDF();
 
-		return new ByteArrayInputStream(writer.toString().getBytes(Charset.forName("UTF-8")));
+		return new ByteArrayInputStream(writer.toString().getBytes(StandardCharsets.UTF_8));
 	}
 
 }
diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleHandlingTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleHandlingTest.java
@@ -10,7 +10,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Statement;
@@ -80,7 +80,7 @@ private InputStream writeTurtle(Model statements)
 		}
 		turtleWriter.endRDF();
 
-		return new ByteArrayInputStream(writer.toString().getBytes(Charset.forName("UTF-8")));
+		return new ByteArrayInputStream(writer.toString().getBytes(StandardCharsets.UTF_8));
 	}
 
 }
diff --git a/http/client/pom.xml b/http/client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-http</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-http-client</artifactId>

diff --git a/http/client/src/main/java/org/eclipse/rdf4j/http/client/RDF4JProtocolSession.java b/http/client/src/main/java/org/eclipse/rdf4j/http/client/RDF4JProtocolSession.java
@@ -17,6 +17,7 @@
 import java.net.HttpURLConnection;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -898,7 +899,7 @@ protected void upload(final Reader contents, String baseURI, final RDFFormat dat
 			boolean overwrite, boolean preserveNodeIds, Action action, Resource... contexts)
 		throws IOException, RDFParseException, RepositoryException, UnauthorizedException
 	{
-		final Charset charset = dataFormat.hasCharset() ? dataFormat.getCharset() : Charset.forName("UTF-8");
+		final Charset charset = dataFormat.hasCharset() ? dataFormat.getCharset() : StandardCharsets.UTF_8;
 
 		HttpEntity entity = new AbstractHttpEntity() {
 

diff --git a/http/client/src/main/java/org/eclipse/rdf4j/http/client/SPARQLProtocolSession.java b/http/client/src/main/java/org/eclipse/rdf4j/http/client/SPARQLProtocolSession.java
@@ -14,6 +14,7 @@
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -122,7 +123,7 @@ public class SPARQLProtocolSession implements HttpClientDependent, AutoCloseable
 	 * Constants *
 	 *-----------*/
 
-	protected static final Charset UTF8 = Charset.forName("UTF-8");
+	protected static final Charset UTF8 = StandardCharsets.UTF_8;
 
 	/**
 	 * The default value of the threshold for URL length, beyond which we use the POST method for SPARQL query

diff --git a/http/client/src/test/java/org/eclipse/rdf4j/http/client/BackgroundGraphResultHangTest.java b/http/client/src/test/java/org/eclipse/rdf4j/http/client/BackgroundGraphResultHangTest.java
@@ -12,6 +12,7 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.rdf4j.query.QueryEvaluationException;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -60,7 +61,7 @@ public void testBGRHang()
 		String data = "@not-rdf";
 
 		BackgroundGraphResult gRes = new BackgroundGraphResult(new DummyParser(),
-				new ByteArrayInputStream(data.getBytes(Charset.forName("UTF-8"))), Charset.forName("UTF-8"),
+				new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8,
 				"http://base.org");
 
 		thrown.expect(QueryEvaluationException.class);

diff --git a/http/pom.xml b/http/pom.xml
@@ -4,8 +4,8 @@
 
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
-		<artifactId>rdf4j-client-parent</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<artifactId>rdf4j-parent</artifactId>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-http</artifactId>

diff --git a/http/protocol/pom.xml b/http/protocol/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-http</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-http-protocol</artifactId>

diff --git a/model/pom.xml b/model/pom.xml
@@ -4,8 +4,8 @@
 
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
-		<artifactId>rdf4j-client-parent</artifactId>
-		<version>2.3-SNAPSHOT</version>
+		<artifactId>rdf4j-parent</artifactId>
+		<version>2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-model</artifactId>