GH-5663: add deprecation notices for FedX (#5665)

aschwarte10 · web-flow · commit a710fe7be43f · 2026-02-18T07:35:40.000+01:00
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/api/FedXApi.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/api/FedXApi.java
@@ -22,6 +22,7 @@
 import org.eclipse.rdf4j.query.TupleQueryResult;
 import org.eclipse.rdf4j.repository.RepositoryResult;
 
+@Deprecated(forRemoval = true)
 public interface FedXApi {
 
 	TupleQueryResult evaluate(String query) throws QueryEvaluationException;
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java
@@ -61,8 +61,6 @@
 import org.eclipse.rdf4j.federated.evaluation.iterator.SingleBindingSetIteration;
 import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerBindJoin;
 import org.eclipse.rdf4j.federated.evaluation.join.ControlledWorkerJoin;
-import org.eclipse.rdf4j.federated.evaluation.join.SynchronousBoundJoin;
-import org.eclipse.rdf4j.federated.evaluation.join.SynchronousJoin;
 import org.eclipse.rdf4j.federated.evaluation.union.ControlledWorkerUnion;
 import org.eclipse.rdf4j.federated.evaluation.union.ParallelGetStatementsTask;
 import org.eclipse.rdf4j.federated.evaluation.union.ParallelPreparedAlgebraUnionTask;
@@ -889,8 +887,6 @@ public QueryEvaluationStep prepareNaryUnion(NUnion union, QueryEvaluationContext
 	 * Join executors are for instance:
 	 *
 	 * <ul>
-	 * <li>{@link SynchronousJoin}</li>
-	 * <li>{@link SynchronousBoundJoin}</li>
 	 * <li>{@link ControlledWorkerJoin}</li>
 	 * <li>{@link ControlledWorkerBindJoin}</li>
 	 * </ul>
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SailFederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SailFederationEvalStrategy.java
@@ -48,6 +48,7 @@
  * @author Andreas Schwarte
  *
  */
+@Deprecated(forRemoval = true) // will be replaced with single unified federation eval strategy
 public class SailFederationEvalStrategy extends FederationEvalStrategy {
 
 	public SailFederationEvalStrategy(FederationContext federationContext) {
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/SparqlFederationEvalStrategy.java
@@ -62,6 +62,7 @@
  * @author Andreas Schwarte
  *
  */
+@Deprecated(forRemoval = true) // will be replaced with single unified federation eval strategy
 public class SparqlFederationEvalStrategy extends FederationEvalStrategy {
 
 	public SparqlFederationEvalStrategy(FederationContext federationContext) {
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/CloseDependentConnectionIteration.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/CloseDependentConnectionIteration.java
@@ -14,8 +14,6 @@
 import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 import org.eclipse.rdf4j.query.QueryEvaluationException;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A wrapping iteration that attempts to close the dependent {@link RepositoryConnection} after consumption.
@@ -24,8 +22,6 @@
  */
 public class CloseDependentConnectionIteration<T> extends AbstractCloseableIteration<T> {
 
-	private static final Logger logger = LoggerFactory.getLogger(CloseDependentConnectionIteration.class);
-
 	protected final CloseableIteration<T> inner;
 	protected final RepositoryConnection dependentConn;
 
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/IndependentJoingroupBindingsIteration.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/IndependentJoingroupBindingsIteration.java
@@ -25,6 +25,7 @@
  *
  * @author Andreas Schwarte
  */
+@Deprecated(forRemoval = true)
 public class IndependentJoingroupBindingsIteration extends LookAheadIteration<BindingSet> {
 
 	protected final BindingSet bindings;
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/IndependentJoingroupBindingsIteration2.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/IndependentJoingroupBindingsIteration2.java
@@ -28,6 +28,7 @@
  *
  * @author Andreas Schwarte
  */
+@Deprecated(forRemoval = true)
 public class IndependentJoingroupBindingsIteration2 extends LookAheadIteration<BindingSet> {
 
 	// a pattern matcher for the binding resolver, pattern: myVar_%outerID%#bindingId, e.g. name_0#0
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/IndependentJoingroupBindingsIteration3.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/iterator/IndependentJoingroupBindingsIteration3.java
@@ -29,6 +29,7 @@
  *
  * @author Andreas Schwarte
  */
+@Deprecated(forRemoval = true)
 public class IndependentJoingroupBindingsIteration3 extends LookAheadIteration<BindingSet> {
 
 	// a pattern matcher for the binding resolver, pattern: myVar_%outerID%#bindingId, e.g. name_0#0
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/HashJoin.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/HashJoin.java
@@ -36,6 +36,7 @@
  * @author Andreas Schwarte
  * @since 6.0
  */
+@Deprecated(forRemoval = true)
 public class HashJoin extends JoinExecutorBase<BindingSet> {
 
 	private final QueryEvaluationStep rightPrepared;
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/SynchronousBoundJoin.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/SynchronousBoundJoin.java
@@ -31,6 +31,7 @@
  *
  * @author Andreas Schwarte
  */
+@Deprecated(forRemoval = true) // only support controlled worker bind join
 public class SynchronousBoundJoin extends SynchronousJoin {
 
 	private static final Logger log = LoggerFactory.getLogger(SynchronousBoundJoin.class);
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/SynchronousJoin.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/join/SynchronousJoin.java
@@ -22,6 +22,7 @@
  *
  * @author Andreas Schwarte
  */
+@Deprecated(forRemoval = true) // only support controlled worker bind join
 public class SynchronousJoin extends JoinExecutorBase<BindingSet> {
 
 	public SynchronousJoin(FederationEvalStrategy strategy,
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/util/Version.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/util/Version.java
@@ -24,6 +24,7 @@
  * @author Andreas Schwarte
  *
  */
+@Deprecated(forRemoval = true)
 public class Version {
 
 	protected static final Logger log = LoggerFactory.getLogger(Version.class);
diff --git a/tools/federation/src/test/java/demos/Demo.java b/tools/federation/src/test/java/demos/Demo.java
@@ -19,6 +19,7 @@
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
 
+@Deprecated(forRemoval = true)
 public class Demo {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/demos/Demo2.java b/tools/federation/src/test/java/demos/Demo2.java
@@ -19,6 +19,7 @@
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 
+@Deprecated(forRemoval = true)
 public class Demo2 {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/demos/Demo3.java b/tools/federation/src/test/java/demos/Demo3.java
@@ -20,6 +20,7 @@
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
 
+@Deprecated(forRemoval = true)
 public class Demo3 {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/demos/Demo4.java b/tools/federation/src/test/java/demos/Demo4.java
@@ -17,6 +17,7 @@
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
 
+@Deprecated(forRemoval = true)
 public class Demo4 {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/demos/Demo5.java b/tools/federation/src/test/java/demos/Demo5.java
@@ -17,6 +17,7 @@
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
 
+@Deprecated(forRemoval = true)
 public class Demo5 {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/demos/FedXWithRemoteRepositoryManager.java b/tools/federation/src/test/java/demos/FedXWithRemoteRepositoryManager.java
@@ -27,6 +27,7 @@
  * @author Andreas Schwarte
  *
  */
+@Deprecated(forRemoval = true)
 public class FedXWithRemoteRepositoryManager {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/demos/GettingStartedDemo.java b/tools/federation/src/test/java/demos/GettingStartedDemo.java
@@ -17,6 +17,7 @@
 import org.eclipse.rdf4j.query.TupleQueryResult;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 
+@Deprecated(forRemoval = true)
 public class GettingStartedDemo {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/demos/GettingStartedDemoMinimal.java b/tools/federation/src/test/java/demos/GettingStartedDemoMinimal.java
@@ -18,6 +18,7 @@
 import org.eclipse.rdf4j.query.QueryResults;
 import org.eclipse.rdf4j.repository.util.Repositories;
 
+@Deprecated(forRemoval = true)
 public class GettingStartedDemoMinimal {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/demos/MonitorRequestsDemo.java b/tools/federation/src/test/java/demos/MonitorRequestsDemo.java
@@ -19,6 +19,7 @@
 import org.eclipse.rdf4j.query.TupleQueryResult;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 
+@Deprecated(forRemoval = true)
 public class MonitorRequestsDemo {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/demos/QueryPlanLogDemo.java b/tools/federation/src/test/java/demos/QueryPlanLogDemo.java
@@ -19,6 +19,7 @@
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 
+@Deprecated(forRemoval = true)
 public class QueryPlanLogDemo {
 
 	public static void main(String[] args) {
diff --git a/tools/federation/src/test/java/org/eclipse/rdf4j/federated/evaluation/join/HashJoinTest.java b/tools/federation/src/test/java/org/eclipse/rdf4j/federated/evaluation/join/HashJoinTest.java
@@ -30,6 +30,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
+@Deprecated(forRemoval = true)
 public class HashJoinTest {
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`* @author Andreas Schwarte`
`49`	`49`	`*`
`50`	`50`	`*/`
	`51`	`+@Deprecated(forRemoval = true) // will be replaced with single unified federation eval strategy`
`51`	`52`	`public class SailFederationEvalStrategy extends FederationEvalStrategy {`
`52`	`53`
`53`	`54`	`public SailFederationEvalStrategy(FederationContext federationContext) {`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@`
`62`	`62`	`* @author Andreas Schwarte`
`63`	`63`	`*`
`64`	`64`	`*/`
	`65`	`+@Deprecated(forRemoval = true) // will be replaced with single unified federation eval strategy`
`65`	`66`	`public class SparqlFederationEvalStrategy extends FederationEvalStrategy {`
`66`	`67`
`67`	`68`	`public SparqlFederationEvalStrategy(FederationContext federationContext) {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`* @author Andreas Schwarte`
`27`	`27`	`*/`
	`28`	`+@Deprecated(forRemoval = true)`
`28`	`29`	`public class IndependentJoingroupBindingsIteration extends LookAheadIteration<BindingSet> {`
`29`	`30`
`30`	`31`	`protected final BindingSet bindings;`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* @author Andreas Schwarte`
`30`	`30`	`*/`
	`31`	`+@Deprecated(forRemoval = true)`
`31`	`32`	`public class IndependentJoingroupBindingsIteration2 extends LookAheadIteration<BindingSet> {`
`32`	`33`
`33`	`34`	`// a pattern matcher for the binding resolver, pattern: myVar_%outerID%#bindingId, e.g. name_0#0`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`*`
`30`	`30`	`* @author Andreas Schwarte`
`31`	`31`	`*/`
	`32`	`+@Deprecated(forRemoval = true)`
`32`	`33`	`public class IndependentJoingroupBindingsIteration3 extends LookAheadIteration<BindingSet> {`
`33`	`34`
`34`	`35`	`// a pattern matcher for the binding resolver, pattern: myVar_%outerID%#bindingId, e.g. name_0#0`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`*`
`32`	`32`	`* @author Andreas Schwarte`
`33`	`33`	`*/`
	`34`	`+@Deprecated(forRemoval = true) // only support controlled worker bind join`
`34`	`35`	`public class SynchronousBoundJoin extends SynchronousJoin {`
`35`	`36`
`36`	`37`	`private static final Logger log = LoggerFactory.getLogger(SynchronousBoundJoin.class);`