fixes after merging

Author: hmottestad

core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/iterator/PathIteration.java

@@ -20,6 +20,7 @@
 import java.util.function.Predicate;
 
 import org.eclipse.rdf4j.collection.factory.api.CollectionFactory;
+import org.eclipse.rdf4j.common.annotation.InternalUseOnly;
 import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 import org.eclipse.rdf4j.common.iteration.LookAheadIteration;
 import org.eclipse.rdf4j.model.Value;
@@ -130,7 +131,8 @@ public PathIteration(EvaluationStrategy strategy, Scope scope, Var startVar,
 	 * @param s the name of the variable to see if it is in the bindingset
 	 * @return the value of the start or end or if asked for a different field a null.
 	 */
-	private static final BiConsumer<Value, MutableBindingSet> getSet(String s) {
+	@InternalUseOnly
+	public static final BiConsumer<Value, MutableBindingSet> getSet(String s) {
 		switch (s) {
 		case START:
 			return (v, vp) -> ((ValuePair) vp).startValue = v;
@@ -149,7 +151,7 @@ private static final BiConsumer<Value, MutableBindingSet> getSet(String s) {
 	 * @param s the name of the variable to see if it is in the bindingset
 	 * @return the value of the start or end, if asked for a different field throw an illegalstate exception
 	 */
-	private static final Function<BindingSet, Value> getGet(String s) {
+	public static final Function<BindingSet, Value> getGet(String s) {
 		switch (s) {
 		case START:
 			return (vp) -> ((ValuePair) vp).startValue;
@@ -168,7 +170,7 @@ private static final Function<BindingSet, Value> getGet(String s) {
 	 * @param s the name of the variable to see if it is in the bindingset
 	 * @return true if start or end is not null, if asked for a different field throw an illegalstate exception
 	 */
-	private static final Predicate<BindingSet> getHas(String s) {
+	public static final Predicate<BindingSet> getHas(String s) {
 		switch (s) {
 		case START:
 			return (vp) -> ((ValuePair) vp).startValue != null;
@@ -431,7 +433,7 @@ protected boolean isUnbound(Var var, BindingSet bindings) {
 	 * A specialized BingingSet that can only hold the start and end values of a Path. Minimizing unneeded memory use,
 	 * and allows specialization in the sets required to answer this part of a query.
 	 */
-	protected static class ValuePair implements MutableBindingSet {
+	public static class ValuePair implements MutableBindingSet {
 		private static final long serialVersionUID = 1L;
 
 		private Value startValue;

tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FedXZeroLengthPathEvaluationStep.java

@@ -62,7 +62,7 @@ public FedXZeroLengthPathEvaluationStep(Var subjectVar, Var objVar, Var contextV
 	}
 
 	@Override
-	public CloseableIteration<BindingSet, QueryEvaluationException> evaluate(BindingSet bindings) {
+	public CloseableIteration<BindingSet> evaluate(BindingSet bindings) {
 		Value subj = null;
 		try {
 			subj = subPrep.evaluate(bindings);

tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/FederationEvalStrategy.java

@@ -641,7 +641,7 @@ protected QueryEvaluationStep prepareNJoin(NJoin join, QueryEvaluationContext co
 
 	}
 
-	protected CloseableIteration<BindingSet, QueryEvaluationException> evaluateArbitrayLengthPath(
+	protected CloseableIteration<BindingSet> evaluateArbitrayLengthPath(
 			FedXArbitraryLengthPath alp, BindingSet bindings)
 			throws QueryEvaluationException {
 
@@ -655,7 +655,7 @@ protected QueryEvaluationStep prepare(FedXArbitraryLengthPath alp, QueryEvaluati
 				alp.getQueryInfo());
 	}
 
-	protected CloseableIteration<BindingSet, QueryEvaluationException> evaluateZeroLengthPath(FedXZeroLengthPath zlp,
+	protected CloseableIteration<BindingSet> evaluateZeroLengthPath(FedXZeroLengthPath zlp,
 			BindingSet bindings)
 			throws QueryEvaluationException {