GH-2710 refactored common exceptions and removed obsolete OpenRDFUtil

eclipse-rdf4j · Jul 25, 2021 · f15c707 · f15c707
1 parent 8d7c35d
commit f15c707
Show file tree

Hide file tree

Showing 120 changed files with 309 additions and 257 deletions.
diff --git a/...e/repository/src/test/java/org/eclipse/rdf4j/repository/http/HTTPStoreConnectionTest.java b/...e/repository/src/test/java/org/eclipse/rdf4j/repository/http/HTTPStoreConnectionTest.java
@@ -13,7 +13,7 @@
 
 import java.io.StringReader;
 
-import org.eclipse.rdf4j.RDF4JException;
+import org.eclipse.rdf4j.common.exception.RDF4JException;
 import org.eclipse.rdf4j.common.transaction.IsolationLevel;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.query.QueryLanguage;

diff --git a/...rc/test/java/org/eclipse/rdf4j/repository/http/RDFSchemaHTTPRepositoryConnectionTest.java b/...rc/test/java/org/eclipse/rdf4j/repository/http/RDFSchemaHTTPRepositoryConnectionTest.java
@@ -9,7 +9,7 @@
 
 import static org.junit.Assert.fail;
 
-import org.eclipse.rdf4j.RDF4JException;
+import org.eclipse.rdf4j.common.exception.RDF4JException;
 import org.eclipse.rdf4j.common.transaction.IsolationLevel;
 import org.eclipse.rdf4j.repository.RDFSchemaRepositoryConnectionTest;
 import org.eclipse.rdf4j.repository.Repository;

diff --git a/...pository/src/test/java/org/eclipse/rdf4j/repository/sparql/SPARQLStoreConnectionTest.java b/...pository/src/test/java/org/eclipse/rdf4j/repository/sparql/SPARQLStoreConnectionTest.java
@@ -15,7 +15,7 @@
 import java.lang.reflect.Field;
 import java.util.List;
 
-import org.eclipse.rdf4j.RDF4JException;
+import org.eclipse.rdf4j.common.exception.RDF4JException;
 import org.eclipse.rdf4j.common.iteration.Iterations;
 import org.eclipse.rdf4j.common.transaction.IsolationLevel;
 import org.eclipse.rdf4j.http.protocol.Protocol;

diff --git a/core/common/exception/pom.xml b/core/common/exception/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.rdf4j</groupId>
+		<artifactId>rdf4j-common</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>rdf4j-common-exception</artifactId>
+	<name>RDF4J: common exception</name>
+	<description>RDF4J common exception classes</description>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>rdf4j-common-annotation</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>rdf4j-model-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/core/common/exception/src/main/java/org/eclipse/rdf4j/RDF4JConfigException.java b/core/common/exception/src/main/java/org/eclipse/rdf4j/RDF4JConfigException.java
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) 2015 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;
+
+/**
+ * @deprecated use {@link org.eclipse.rdf4j.common.exception.RDF4JConfigException} instead.
+ */
+@Deprecated
+public class RDF4JConfigException extends RDF4JException {
+
+	private static final long serialVersionUID = -8121506409791182977L;
+
+}
diff --git a/core/common/exception/src/main/java/org/eclipse/rdf4j/RDF4JException.java b/core/common/exception/src/main/java/org/eclipse/rdf4j/RDF4JException.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Eclipse RDF4J contributors, Aduna, 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;
+
+/**
+ * 
+ * @deprecated use {@link org.eclipse.rdf4j.common.exception.RDF4JException} instead.
+ */
+@Deprecated
+public abstract class RDF4JException extends org.eclipse.rdf4j.common.exception.RDF4JException {
+
+}
diff --git a/...g/eclipse/rdf4j/RDF4JConfigException.java → ...ommon/exception/RDF4JConfigException.java b/...g/eclipse/rdf4j/RDF4JConfigException.java → ...ommon/exception/RDF4JConfigException.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  */
-package org.eclipse.rdf4j;
+package org.eclipse.rdf4j.common.exception;
 
 /**
  * Exception indicating a configuration problem in an RDF4J component.
@@ -14,7 +14,7 @@
  */
 public class RDF4JConfigException extends RDF4JException {
 
-	private static final long serialVersionUID = -8121506409791182977L;
+	private static final long serialVersionUID = 1268120252034047961L;
 
 	public RDF4JConfigException() {
 		super();

diff --git a/...ava/org/eclipse/rdf4j/RDF4JException.java → ...df4j/common/exception/RDF4JException.java b/...ava/org/eclipse/rdf4j/RDF4JException.java → ...df4j/common/exception/RDF4JException.java
@@ -5,17 +5,16 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *******************************************************************************/
-package org.eclipse.rdf4j;
+package org.eclipse.rdf4j.common.exception;
 
 /**
  * General superclass of all unchecked exceptions that parts of RDF4J can throw.
  *
  * @author Jeen Broekstra
  */
-@SuppressWarnings("deprecation")
-public abstract class RDF4JException extends OpenRDFException {
+public abstract class RDF4JException extends RuntimeException {
 
-	private static final long serialVersionUID = 8913366826930181397L;
+	private static final long serialVersionUID = 169031751338226782L;
 
 	public RDF4JException() {
 		super();

diff --git a/...rdf4j/exceptions/ValidationException.java → ...common/exception/ValidationException.java b/...rdf4j/exceptions/ValidationException.java → ...common/exception/ValidationException.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *******************************************************************************/
 
-package org.eclipse.rdf4j.exceptions;
+package org.eclipse.rdf4j.common.exception;
 
 import org.eclipse.rdf4j.common.annotation.Experimental;
 import org.eclipse.rdf4j.model.Model;

diff --git a/core/common/exception/src/main/java/org/eclipse/rdf4j/common/exception/package-info.java b/core/common/exception/src/main/java/org/eclipse/rdf4j/common/exception/package-info.java
@@ -0,0 +1,12 @@
+/*******************************************************************************
+ * Copyright (c) 2021 Eclipse RDF4J contributors.
+ * 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.
+ *******************************************************************************/
+/**
+ * @author jeen
+ *
+ */
+package org.eclipse.rdf4j.common.exception;
diff --git a/core/common/pom.xml b/core/common/pom.xml
@@ -12,6 +12,7 @@
 	<description>RDF4J common: shared classes</description>
 	<modules>
 		<module>annotation</module>
+		<module>exception</module>
 		<module>io</module>
 		<module>iterator</module>
 		<module>text</module>

diff --git a/core/http/client/pom.xml b/core/http/client/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>

diff --git a/core/http/client/src/main/java/org/eclipse/rdf4j/http/client/RDF4JProtocolSession.java b/core/http/client/src/main/java/org/eclipse/rdf4j/http/client/RDF4JProtocolSession.java
@@ -54,8 +54,7 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.eclipse.rdf4j.OpenRDFUtil;
-import org.eclipse.rdf4j.RDF4JException;
+import org.eclipse.rdf4j.common.exception.RDF4JException;
 import org.eclipse.rdf4j.common.io.IOUtil;
 import org.eclipse.rdf4j.common.transaction.IsolationLevel;
 import org.eclipse.rdf4j.common.transaction.TransactionSetting;
@@ -1053,7 +1052,8 @@ public void writeTo(OutputStream out) throws IOException {
 	protected void upload(HttpEntity reqEntity, String baseURI, boolean overwrite, boolean preserveNodeIds,
 			Action action, Resource... contexts)
 			throws IOException, RDFParseException, RepositoryException, UnauthorizedException {
-		OpenRDFUtil.verifyContextNotNull(contexts);
+		Objects.requireNonNull(contexts,
+				"contexts argument may not be null; either the value should be cast to Resource or an empty array should be supplied");
 
 		checkRepositoryURL();
 

diff --git a/core/http/client/src/main/java/org/eclipse/rdf4j/http/client/SPARQLProtocolSession.java b/core/http/client/src/main/java/org/eclipse/rdf4j/http/client/SPARQLProtocolSession.java
@@ -58,8 +58,8 @@
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.EntityUtils;
-import org.eclipse.rdf4j.RDF4JConfigException;
-import org.eclipse.rdf4j.RDF4JException;
+import org.eclipse.rdf4j.common.exception.RDF4JConfigException;
+import org.eclipse.rdf4j.common.exception.RDF4JException;
 import org.eclipse.rdf4j.common.io.ByteSink;
 import org.eclipse.rdf4j.common.io.CharSink;
 import org.eclipse.rdf4j.common.io.Sink;

diff --git a/...ent/src/main/java/org/eclipse/rdf4j/http/client/shacl/RemoteShaclValidationException.java b/...ent/src/main/java/org/eclipse/rdf4j/http/client/shacl/RemoteShaclValidationException.java
@@ -10,9 +10,9 @@
 
 import java.io.StringReader;
 
-import org.eclipse.rdf4j.RDF4JException;
 import org.eclipse.rdf4j.common.annotation.Experimental;
-import org.eclipse.rdf4j.exceptions.ValidationException;
+import org.eclipse.rdf4j.common.exception.RDF4JException;
+import org.eclipse.rdf4j.common.exception.ValidationException;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.vocabulary.SHACL;
 import org.eclipse.rdf4j.rio.RDFFormat;
@@ -23,6 +23,8 @@
 @Experimental
 public class RemoteShaclValidationException extends RDF4JException implements ValidationException {
 
+	private static final long serialVersionUID = 1546454692754781492L;
+
 	private final RemoteValidation remoteValidation;
 
 	public RemoteShaclValidationException(StringReader stringReader, String s, RDFFormat format) {

diff --git a/core/http/protocol/src/main/java/org/eclipse/rdf4j/http/protocol/Protocol.java b/core/http/protocol/src/main/java/org/eclipse/rdf4j/http/protocol/Protocol.java
@@ -7,7 +7,8 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.http.protocol;
 
-import org.eclipse.rdf4j.OpenRDFUtil;
+import java.util.Objects;
+
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Triple;
@@ -529,7 +530,8 @@ public static Resource decodeContext(String encodedValue, ValueFactory valueFact
 	 * @throws IllegalArgumentException If the <tt>contexts</tt> is <tt>null</tt>.
 	 */
 	public static String[] encodeContexts(Resource... contexts) {
-		OpenRDFUtil.verifyContextNotNull(contexts);
+		Objects.requireNonNull(contexts,
+				"contexts argument may not be null; either the value should be cast to Resource or an empty array should be supplied");
 
 		String[] result = new String[contexts.length];
 		for (int index = 0; index < contexts.length; index++) {

diff --git a/...rc/main/java/org/eclipse/rdf4j/http/protocol/transaction/operations/ContextOperation.java b/...rc/main/java/org/eclipse/rdf4j/http/protocol/transaction/operations/ContextOperation.java
@@ -8,8 +8,8 @@
 package org.eclipse.rdf4j.http.protocol.transaction.operations;
 
 import java.util.Arrays;
+import java.util.Objects;
 
-import org.eclipse.rdf4j.OpenRDFUtil;
 import org.eclipse.rdf4j.model.Resource;
 
 /**
@@ -31,7 +31,8 @@ public Resource[] getContexts() {
 	}
 
 	public void setContexts(Resource... contexts) {
-		OpenRDFUtil.verifyContextNotNull(contexts);
+		Objects.requireNonNull(contexts,
+				"contexts argument may not be null; either the value should be cast to Resource or an empty array should be supplied");
 
 		this.contexts = contexts;
 	}

diff --git a/core/model-api/pom.xml b/core/model-api/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>

diff --git a/core/model/pom.xml b/core/model/pom.xml
@@ -22,7 +22,22 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>rdf4j-util</artifactId>
+			<artifactId>rdf4j-common-exception</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>rdf4j-common-text</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>rdf4j-common-io</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>rdf4j-common-iterator</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

diff --git a/core/model/src/main/java/org/eclipse/rdf4j/OpenRDFException.java b/core/model/src/main/java/org/eclipse/rdf4j/OpenRDFException.java
diff --git a/core/model/src/main/java/org/eclipse/rdf4j/OpenRDFUtil.java b/core/model/src/main/java/org/eclipse/rdf4j/OpenRDFUtil.java
diff --git a/core/model/src/main/java/org/eclipse/rdf4j/model/impl/DynamicModel.java b/core/model/src/main/java/org/eclipse/rdf4j/model/impl/DynamicModel.java
@@ -19,15 +19,15 @@
 import java.util.Optional;
 import java.util.Set;
 
+import org.eclipse.rdf4j.common.iterator.EmptyIterator;
+import org.eclipse.rdf4j.common.iterator.SingletonIterator;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.ModelFactory;
 import org.eclipse.rdf4j.model.Namespace;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.Value;
-import org.eclipse.rdf4j.util.iterators.EmptyIterator;
-import org.eclipse.rdf4j.util.iterators.SingletonIterator;
 
 /**
  * A LinkedHashModel or a TreeModel achieves fast data access at the cost of higher indexing time. The DynamicModel