[reactor] Remove unecessary additional interface function in preparation for de-composition of interfaces

Author: adamretter

exist-core/src/main/java/org/exist/dom/persistent/SortedNodeSet.java

@@ -274,7 +274,7 @@ private static final class IteratorItem extends OrderedLinkedList.Node {
         public IteratorItem(final NodeProxy proxy, final PathExpr expr) {
             this.proxy = proxy;
             try {
-                final Sequence seq = expr.eval(proxy);
+                final Sequence seq = expr.eval(proxy, null);
                 final StringBuilder buf = new StringBuilder();
                 final OrderedLinkedList strings = new OrderedLinkedList();
                 Item item;

exist-core/src/main/java/org/exist/http/urlrewrite/ModuleCall.java

@@ -95,12 +95,12 @@ public void doRewrite(final HttpServletRequest request, final HttpServletRespons
             final ContextItemDeclaration cid = call.getContext().getContextItemDeclartion();
             final Sequence contextSequence;
             if (cid != null) {
-                contextSequence = cid.eval(null);
+                contextSequence = cid.eval(null, null);
             } else {
                 contextSequence = null;
             }
 
-            final Sequence result = call.eval(contextSequence);
+            final Sequence result = call.eval(contextSequence, null);
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Found: {}", result.getItemCount());
             }

exist-core/src/main/java/org/exist/security/internal/SMEvents.java

@@ -125,13 +125,13 @@ protected void runScript(Subject subject, String scriptURI, String script, QName
 					final Sequence contextSequence;
 					final ContextItemDeclaration cid = context.getContextItemDeclartion();
 					if(cid != null) {
-						contextSequence = cid.eval(null);
+						contextSequence = cid.eval(null, null);
 					} else {
 						contextSequence = NodeSet.EMPTY_SET;
 					}
 
     	            call.analyze(new AnalyzeContextInfo());
-    	    		call.eval(contextSequence);
+    	    		call.eval(contextSequence, null);
         		}
             } catch(final XPathException e) {
             	//XXX: log

exist-core/src/main/java/org/exist/xquery/AbstractExpression.java

@@ -66,11 +66,6 @@ public int getContextId() {
         return contextId;
     }
 
-    @Override
-    public Sequence eval(Sequence contextSequence) throws XPathException {
-        return eval(contextSequence, null);
-    }
-
     @Override
     public void resetState(boolean postOptimization) {
         contextDocSet = null;

exist-core/src/main/java/org/exist/xquery/ArrowOperator.java

@@ -93,7 +93,7 @@ public Sequence eval(Sequence contextSequence, final Item contextItem) throws XP
         if (contextItem != null) {
             contextSequence = contextItem.toSequence();
         }
-        contextSequence = leftExpr.eval(contextSequence);
+        contextSequence = leftExpr.eval(contextSequence, null);
 
         final FunctionReference fref;
         if (fcall != null) {

exist-core/src/main/java/org/exist/xquery/CastExpression.java

@@ -217,7 +217,7 @@ public void setArguments(final List<Expression> arguments) throws XPathException
 
         @Override
         public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathException {
-            return castExpression.eval(contextSequence);
+            return castExpression.eval(contextSequence, null);
         }
     }
 }

exist-core/src/main/java/org/exist/xquery/CompiledXQuery.java

@@ -24,6 +24,7 @@
 import java.io.Writer;
 
 import org.exist.source.Source;
+import org.exist.xquery.value.Item;
 import org.exist.xquery.value.Sequence;
 import org.xmldb.api.base.CompiledExpression;
 
@@ -51,12 +52,14 @@ public interface CompiledXQuery extends CompiledExpression {
      * sequence as context.
      * 
      * @param contextSequence the context sequence
+     * @param contextItem a single item, taken from context. This defines the item,
+     * the expression should work on.
      *
      * @return the result.
      *
      * @throws XPathException if an error occurs during evaluation.
      */
-    public Sequence eval(Sequence contextSequence) throws XPathException;
+    public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathException;
 
     /**
      * Is the compiled expression still valid? Returns false if, for example,

exist-core/src/main/java/org/exist/xquery/DebuggableExpression.java

@@ -61,10 +61,6 @@ public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathExc
         }
     }
 
-    public Sequence eval(Sequence contextSequence) throws XPathException {
-        return eval(contextSequence, null);
-    }
-
     public void setPrimaryAxis(int axis) {
         expression.setPrimaryAxis(axis);
     }

exist-core/src/main/java/org/exist/xquery/Expression.java

@@ -28,6 +28,8 @@
 import org.exist.xquery.value.Item;
 import org.exist.xquery.value.Sequence;
 
+import javax.annotation.Nullable;
+
 /**
  * Base interface implemented by all classes which are part
  * of an XQuery/XPath expression. The main method is 
@@ -101,12 +103,12 @@ public interface Expression {
 
     /**
      * Statically analyze the expression and its subexpressions.
-     * 
+     *
      * During the static analysis phase, the query engine can detect
      * unknown variables and some type errors.
      *
      * @param contextInfo the context infomation.
-     * 
+     *
      * @throws XPathException if an error occurs during the analysis.
      */
     public void analyze(AnalyzeContextInfo contextInfo) throws XPathException;
@@ -134,29 +136,15 @@ public interface Expression {
      * The context sequence might be a node set, a sequence of atomic values or a single
      * node or atomic value.
      *
-     * @param contextSequence the current context sequence.
-     * @param contextItem a single item, taken from context. This defines the item,
-     * the expression should work on.
-     *
-     * @return the result sequence.
-     *
-     * @throws XPathException if an error occurs during evaluation.
-     */
-    public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathException;
-
-    /**
-     * Evaluate the expression represented by this object.
-     *
-     * An overloaded method which just passes the context sequence depending on the
-     * expression context.
-     *
-     * @param contextSequence the current context sequence.
+     * @param contextSequence the current context sequence, or null if there is no context sequence.
+     * @param contextItem a single item, taken from context, or null if there is no context item.
+     *                    This defines the item, the expression should work on.
      *
      * @return the result sequence.
      *
      * @throws XPathException if an error occurs during evaluation.
      */
-    public Sequence eval(Sequence contextSequence) throws XPathException;
+    public Sequence eval(@Nullable Sequence contextSequence, @Nullable Item contextItem) throws XPathException;
 
     public void setPrimaryAxis(int axis);
 

exist-core/src/main/java/org/exist/xquery/ExternalModuleImpl.java

@@ -237,7 +237,7 @@ public boolean isVarDeclared(QName qname) {
             }
             decl.analyze(declContextInfo);
 
-            decl.eval(getContext().getContextItem());
+            decl.eval(getContext().getContextItem(), null);
             var = mStaticVariables.get(qname);
         }
         if (var == null) {