fixes after merging

Author: hmottestad

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

@@ -616,7 +616,7 @@ public void meet(Var var) {
 				QueryModelNode parent = var.getParentNode();
 				parent.replaceChildNode(var, replacement.clone());
 			} else if (replaceAnons && var.isAnonymous() && !var.hasValue()) {
-				String varName = "anon-replace-" + var.getName() + index;
+				String varName = "anon_replace_" + var.getName() + index;
 				Var replacementVar = createAnonVar(varName, null, true);
 				QueryModelNode parent = var.getParentNode();
 				parent.replaceChildNode(var, replacementVar);

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

@@ -38,13 +38,13 @@ public class ZeroLengthPathIteration extends LookAheadIteration<BindingSet> {
 
 	private static final Literal SUBJECT = SimpleValueFactory.getInstance().createLiteral("subject");
 
-	public static final String ANON_SUBJECT_VAR = "zero-length-internal-start";
+	public static final String ANON_SUBJECT_VAR = "zero_length_internal_start";
 
-	public static final String ANON_PREDICATE_VAR = "zero-length-internal-pred";
+	public static final String ANON_PREDICATE_VAR = "zero_length_internal_pred";
 
-	public static final String ANON_OBJECT_VAR = "zero-length-internal-end";
+	public static final String ANON_OBJECT_VAR = "zero_length_internal_end";
 
-	public static final String ANON_SEQUENCE_VAR = "zero-length-internal-seq";
+	public static final String ANON_SEQUENCE_VAR = "zero_length_internal_seq";
 
 	private QueryBindingSet result;
 

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

@@ -1,17 +1,16 @@
-package org.eclipse.rdf4j.federated.evaluation.iterator;
-
-/**
- * ****************************************************************************
- *  Copyright (c) 2015 Eclipse RDF4J contributors, Aduna, and others.
+/*******************************************************************************
+ * Copyright (c) 2024 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.
+ * 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
- * *****************************************************************************
- */
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************/
+
+package org.eclipse.rdf4j.federated.evaluation.iterator;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -39,15 +38,29 @@
 import org.eclipse.rdf4j.query.algebra.StatementPattern.Scope;
 import org.eclipse.rdf4j.query.algebra.TupleExpr;
 import org.eclipse.rdf4j.query.algebra.Var;
-import org.eclipse.rdf4j.query.algebra.ZeroLengthPath;
 import org.eclipse.rdf4j.query.algebra.evaluation.EvaluationStrategy;
 import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet;
 import org.eclipse.rdf4j.query.algebra.evaluation.iterator.PathIteration;
 import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor;
 import org.eclipse.rdf4j.query.impl.SimpleBinding;
 
+/**
+ * A iteration to evaluate property path expressions.
+ *
+ * @see PathIteration
+ */
 public class FedXPathIteration extends LookAheadIteration<BindingSet> {
 
+	/*
+	 * IMPL NOTE:
+	 *
+	 * This is technically almost a 1:1 copy of org.eclipse.rdf4j.query.algebra.evaluation.iterator.PathIteration.
+	 * Reusing or extending PathIteration requires refactoring in its constructor initialization.
+	 *
+	 * The main difference is in keeping track of QueryInfo and creating a FedXZeroLengthPath in #createIteration for
+	 * zero length path expressions.
+	 */
+
 	// Should never be seen by code outside of this iterator
 	private static final String END = "$end_from_path_iteration";
 	private static final String START = "$start_from_path_iteration";