GH-5718: cleanup and evolve FedX codebase for 6.0 (#5734)

Author: aschwarte10

tools/federation/src/main/java/org/eclipse/rdf4j/federated/FedXConfig.java

@@ -12,7 +12,6 @@
 
 import java.util.Optional;
 
-import org.eclipse.rdf4j.collection.factory.api.CollectionFactory;
 import org.eclipse.rdf4j.federated.cache.SourceSelectionCache;
 import org.eclipse.rdf4j.federated.cache.SourceSelectionCacheFactory;
 import org.eclipse.rdf4j.federated.cache.SourceSelectionMemoryCache;
@@ -496,20 +495,4 @@ public FedXConfig withConsumingIterationMax(int max) {
 	public int getConsumingIterationMax() {
 		return consumingIterationMax;
 	}
-
-	/**
-	 * Set the CollectionFactory to be used by the federation
-	 *
-	 * <p>
-	 * Can only be set before federation initialization.
-	 * </p>
-	 *
-	 * @param cf
-	 * @return the current config
-	 * @deprecated unusedO
-	 */
-	@Deprecated(forRemoval = true)
-	public FedXConfig withCollectionFactory(CollectionFactory cf) {
-		return this;
-	}
 }

tools/federation/src/main/java/org/eclipse/rdf4j/federated/FedXConnection.java

@@ -22,8 +22,8 @@
 import org.eclipse.rdf4j.common.transaction.TransactionSetting;
 import org.eclipse.rdf4j.federated.algebra.PassThroughTupleExpr;
 import org.eclipse.rdf4j.federated.endpoint.Endpoint;
-import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
 import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStatistics;
+import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
 import org.eclipse.rdf4j.federated.evaluation.concurrent.ParallelExecutor;
 import org.eclipse.rdf4j.federated.evaluation.concurrent.ParallelTask;
 import org.eclipse.rdf4j.federated.evaluation.iterator.StopRemainingExecutionsOnCloseIteration;
@@ -61,8 +61,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * An implementation of RepositoryConnection that uses {@link FederationEvalStrategy} to evaluate provided queries.
- * Prior to evaluation various optimizations are performed, see
+ * An implementation of RepositoryConnection that uses {@link FederationEvaluationStrategy} to evaluate provided
+ * queries. Prior to evaluation various optimizations are performed, see
  * {@link org.eclipse.rdf4j.federated.optimizer.FedXOptimizer} for further details.
  * <p>
  * <p>
@@ -73,7 +73,7 @@
  * Implementation notes: - not all methods are implemented as of now
  *
  * @author Andreas Schwarte
- * @see FederationEvalStrategy
+ * @see FederationEvaluationStrategy
  * @see WriteStrategy
  */
 public class FedXConnection extends AbstractSailConnection {
@@ -105,7 +105,7 @@ protected CloseableIteration<? extends BindingSet> evaluateInternal(TupleExpr qu
 
 		final TupleExpr originalQuery = query;
 
-		FederationEvalStrategy strategy = federationContext.createStrategy(dataset);
+		FederationEvaluationStrategy strategy = federationContext.createStrategy(dataset);
 
 		long start = 0;
 		String queryString = getOriginalQueryString(bindings);
@@ -236,7 +236,7 @@ protected void commitInternal() throws SailException {
 	@Override
 	protected CloseableIteration<? extends Resource> getContextIDsInternal() throws SailException {
 
-		FederationEvalStrategy strategy = federationContext.createStrategy(new SimpleDataset());
+		FederationEvaluationStrategy strategy = federationContext.createStrategy(new SimpleDataset());
 		WorkerUnionBase<Resource> union = new SynchronousWorkerUnion<>(new QueryInfo("getContextIDsInternal", null,
 				QueryType.UNKNOWN, 0, federationContext.getConfig().getIncludeInferredDefault(), federationContext,
 				strategy, new SimpleDataset()));
@@ -307,7 +307,7 @@ protected CloseableIteration<? extends Statement> getStatementsInternal(Resource
 
 		try {
 			Dataset dataset = new SimpleDataset();
-			FederationEvalStrategy strategy = federationContext.createStrategy(dataset);
+			FederationEvaluationStrategy strategy = federationContext.createStrategy(dataset);
 			QueryInfo queryInfo = new QueryInfo(subj, pred, obj, 0, includeInferred, federationContext, strategy,
 					dataset);
 			federationContext.getMonitoringService().monitorQuery(queryInfo);
@@ -342,7 +342,7 @@ protected boolean hasStatementInternal(Resource subj, IRI pred, Value obj, boole
 			Resource[] contexts) {
 		try {
 			Dataset dataset = new SimpleDataset();
-			FederationEvalStrategy strategy = federationContext.createStrategy(dataset);
+			FederationEvaluationStrategy strategy = federationContext.createStrategy(dataset);
 			QueryInfo queryInfo = new QueryInfo(subj, pred, obj, 0, includeInferred, federationContext, strategy,
 					dataset);
 			federationContext.getMonitoringService().monitorQuery(queryInfo);

tools/federation/src/main/java/org/eclipse/rdf4j/federated/FederationContext.java

@@ -13,7 +13,7 @@
 import org.eclipse.rdf4j.federated.cache.SourceSelectionCache;
 import org.eclipse.rdf4j.federated.cache.SourceSelectionMemoryCache;
 import org.eclipse.rdf4j.federated.evaluation.DelegateFederatedServiceResolver;
-import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
+import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
 import org.eclipse.rdf4j.federated.monitoring.Monitoring;
 import org.eclipse.rdf4j.query.Dataset;
 import org.eclipse.rdf4j.query.algebra.evaluation.TripleSource;
@@ -87,9 +87,9 @@ public SourceSelectionCache getSourceSelectionCache() {
 	}
 
 	/**
-	 * Create a fresh {@link FederationEvalStrategy} using information from this federation context.
+	 * Create a fresh {@link FederationEvaluationStrategy} using information from this federation context.
 	 */
-	public FederationEvalStrategy createStrategy(Dataset dataset) {
+	public FederationEvaluationStrategy createStrategy(Dataset dataset) {
 		TripleSource tripleSource = null;
 		EvaluationStatistics evaluationStatistics = null;
 		return manager.getFederationEvaluationStrategyFactory()

tools/federation/src/main/java/org/eclipse/rdf4j/federated/FederationManager.java

@@ -21,8 +21,6 @@
 import org.eclipse.rdf4j.federated.endpoint.Endpoint;
 import org.eclipse.rdf4j.federated.endpoint.EndpointClassification;
 import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategyFactory;
-import org.eclipse.rdf4j.federated.evaluation.SailFederationEvalStrategy;
-import org.eclipse.rdf4j.federated.evaluation.SparqlFederationEvalStrategy;
 import org.eclipse.rdf4j.federated.evaluation.concurrent.ControlledWorkerScheduler;
 import org.eclipse.rdf4j.federated.evaluation.concurrent.NamingThreadFactory;
 import org.eclipse.rdf4j.federated.evaluation.concurrent.Scheduler;
@@ -107,7 +105,6 @@ public void init(FedX federation, FederationContext federationContext) {
 		FederationEvaluationStrategyFactory strategyFactory = federation.getFederationEvaluationStrategyFactory();
 		strategyFactory.setFederationType(federationType);
 		strategyFactory.setFederationContext(federationContext);
-		strategyFactory.setCollectionFactory(federation.getCollectionFactory());
 		return strategyFactory;
 	}
 

tools/federation/src/main/java/org/eclipse/rdf4j/federated/QueryManager.java

@@ -25,8 +25,8 @@
 import java.util.regex.MatchResult;
 import java.util.regex.Pattern;
 
-import org.eclipse.rdf4j.federated.evaluation.FederationEvalStrategy;
 import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStatistics;
+import org.eclipse.rdf4j.federated.evaluation.FederationEvaluationStrategy;
 import org.eclipse.rdf4j.federated.exception.FedXException;
 import org.eclipse.rdf4j.federated.exception.FedXRuntimeException;
 import org.eclipse.rdf4j.federated.repository.FedXRepository;
@@ -307,7 +307,7 @@ public String getQueryPlan(String queryString) throws MalformedQueryException, F
 			throw new MalformedQueryException("Not a ParsedQuery: " + query.getClass());
 		}
 		Dataset dataset = ((ParsedQuery) query).getDataset();
-		FederationEvalStrategy strategy = federationContext.createStrategy(dataset);
+		FederationEvaluationStrategy strategy = federationContext.createStrategy(dataset);
 		// we use a dummy query info object here
 		QueryInfo qInfo = new QueryInfo(queryString, null, QueryType.SELECT,
 				federationContext.getConfig().getEnforceMaxQueryTime(),

tools/federation/src/main/java/org/eclipse/rdf4j/federated/api/FedXApi.java

@@ -16,7 +16,7 @@
 
 /**
  * Stateful {@link EvaluationStatistics} providing information for evaluating a given query in
- * {@link FederationEvalStrategy#optimize(org.eclipse.rdf4j.query.algebra.TupleExpr, EvaluationStatistics, org.eclipse.rdf4j.query.BindingSet)}
+ * {@link FederationEvaluationStrategy#optimize(org.eclipse.rdf4j.query.algebra.TupleExpr, EvaluationStatistics, org.eclipse.rdf4j.query.BindingSet)}
  * <p>
  * The statistics are instantiated per query.
  * </p>