GH-4819 fix bugs and optimize imports

Author: hmottestad

compliance/sparql/src/test/java/org/eclipse/rdf4j/sail/extensiblestore/impl/OrderedDataStructure.java

@@ -12,6 +12,7 @@
 
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.EnumSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -90,7 +91,7 @@ public long getEstimatedSize() {
 	@Override
 	public Set<StatementOrder> getSupportedOrders(Resource subj, IRI pred, Value obj, boolean inferred,
 			Resource... contexts) {
-		return Set.of(StatementOrder.S, StatementOrder.P, StatementOrder.O, StatementOrder.C);
+		return EnumSet.of(StatementOrder.S, StatementOrder.P, StatementOrder.O, StatementOrder.C);
 	}
 
 	@Override

core/common/io/src/main/java/org/eclipse/rdf4j/common/lang/ObjectUtil.java

@@ -11,8 +11,6 @@
 
 package org.eclipse.rdf4j.common.lang;
 
-import java.util.Objects;
-
 /**
  * Generic utility methods related to objects.
  *

core/common/iterator/src/main/java/org/eclipse/rdf4j/common/iteration/AbstractCloseableIteratorIteration.java

@@ -13,7 +13,6 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 
 /**
  * An Iteration that can convert an {@link Iterator} to a {@link CloseableIteration}.

core/common/iterator/src/main/java/org/eclipse/rdf4j/common/iteration/DualUnionIteration.java

@@ -46,6 +46,8 @@ public DualUnionIteration(StatementOrder statementOrder, Comparator<Value> cmp,
 		this.iteration2 = iteration2;
 		this.statementOrder = statementOrder;
 		this.cmp = cmp;
+
+		// TODO
 		throw new UnsupportedOperationException("Not implemented yet");
 	}
 

core/common/iterator/src/main/java/org/eclipse/rdf4j/common/iteration/IndexReportingIterator.java

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2023 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.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************/
+
+package org.eclipse.rdf4j.common.iteration;
+
+import org.eclipse.rdf4j.common.annotation.Experimental;
+
+/**
+ * The index name of the underlying data structure, e.g. SPOC, POSC, etc.
+ */
+@Experimental
+public interface IndexReportingIterator {
+
+	String getIndexName();
+
+}

core/common/iterator/src/main/java/org/eclipse/rdf4j/common/iteration/QueueIteration.java

@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.common.iteration;
 
-import java.lang.ref.WeakReference;
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;

core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/XSD.java

@@ -10,14 +10,6 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.model.vocabulary;
 
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Namespace;
 import org.eclipse.rdf4j.model.base.CoreDatatype;

core/model/src/main/java/org/eclipse/rdf4j/model/impl/DecimalLiteral.java

@@ -15,7 +15,6 @@
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.base.CoreDatatype;
-import org.eclipse.rdf4j.model.vocabulary.XSD;
 
 /**
  * An extension of {@link SimpleLiteral} that stores an integer value using a {@link BigDecimal} object.

core/model/src/main/java/org/eclipse/rdf4j/model/impl/IntegerLiteral.java

@@ -15,7 +15,6 @@
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.base.CoreDatatype;
-import org.eclipse.rdf4j.model.vocabulary.XSD;
 
 /**
  * An extension of {@link SimpleLiteral} that stores an integer value using a {@link BigInteger} object.

core/model/src/main/java/org/eclipse/rdf4j/model/impl/NumericLiteral.java

@@ -17,7 +17,6 @@
 import org.eclipse.rdf4j.model.base.AbstractLiteral;
 import org.eclipse.rdf4j.model.base.CoreDatatype;
 import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil;
-import org.eclipse.rdf4j.model.vocabulary.XSD;
 
 /**
  * An extension of {@link AbstractLiteral} that stores a numeric value to avoid parsing.