GH-3826 revert incompatible changes to interface

eclipse-rdf4j · Aug 6, 2022 · 8e7f2a1 · 8e7f2a1
1 parent c95e95a
commit 8e7f2a1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/...valuation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/Function.java b/...valuation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/Function.java
@@ -35,12 +35,11 @@ public interface Function {
  * @param args the function input arguments.
  * @return the function result value.
  * @throws ValueExprEvaluationException
- * @deprecated since 3.3.0. Use {@link #evaluate(TripleSource, Value...)} instead.
+ * @deprecated since 3.3.0. Use {@link #evaluate(TripleSource, Value...)} instead. A reference to a ValueFactory can
+ * be retrieved using {@link TripleSource#getValueFactory()} if needed.
  */
  @Deprecated
- default Value evaluate(ValueFactory valueFactory, Value... args) throws ValueExprEvaluationException {
- throw new UnsupportedOperationException("use evaluate(TripleSource, Value...) instead");
- }
+ Value evaluate(ValueFactory valueFactory, Value... args) throws ValueExprEvaluationException;
 
  /**
  * Evaluate the function over the supplied input arguments.

diff --git a/examples/src/main/java/org/eclipse/rdf4j/examples/function/ExistingPalindromeFunction.java b/examples/src/main/java/org/eclipse/rdf4j/examples/function/ExistingPalindromeFunction.java
@@ -79,4 +79,9 @@ public Value evaluate(TripleSource tripleSource, Value... args)
  // return a new boolean literal that is true if the input argument is a palindrome and exists as a label
  return tripleSource.getValueFactory().createLiteral(palindrome && existing);
  }
+
+ @Override
+ public Value evaluate(ValueFactory valueFactory, Value... args) throws ValueExprEvaluationException {
+ throw new UnsupportedOperationException();
+ }
 }
diff --git a/examples/src/main/java/org/eclipse/rdf4j/examples/function/PalindromeFunction.java b/examples/src/main/java/org/eclipse/rdf4j/examples/function/PalindromeFunction.java
@@ -14,6 +14,7 @@
 
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
 import org.eclipse.rdf4j.query.algebra.evaluation.TripleSource;
 import org.eclipse.rdf4j.query.algebra.evaluation.ValueExprEvaluationException;
 import org.eclipse.rdf4j.query.algebra.evaluation.function.Function;
@@ -74,4 +75,9 @@ public Value evaluate(TripleSource tripleSource, Value... args)
  // return our boolean result as a Literal
  return literal(palindrome);
  }
+
+ @Override
+ public Value evaluate(ValueFactory valueFactory, Value... args) throws ValueExprEvaluationException {
+ throw new UnsupportedOperationException();
+ }
 }