refactor: minor change of function call with method

orientechnologies · Dec 23, 2024 · e5de4be · e5de4be
1 parent 88038cf
commit e5de4be
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/functions/OSQLFunctionFiltered.java b/core/src/main/java/com/orientechnologies/orient/core/sql/functions/OSQLFunctionFiltered.java
@@ -22,6 +22,7 @@
 
 import com.orientechnologies.orient.core.command.OCommandContext;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
+import com.orientechnologies.orient.core.sql.executor.OResult;
 
 /** @author Luigi Dell'Aquila (l.dellaquila-(at)-orientdb.com) */
 public interface OSQLFunctionFiltered extends OSQLFunction {
@@ -30,7 +31,7 @@ public interface OSQLFunctionFiltered extends OSQLFunction {
    * Process a record.
    *
    * @param iThis
-   * @param iCurrentRecord : current record
+   * @param current : current record
    * @param iCurrentResult TODO
    * @param iParams : function parameters, number is ensured to be within minParams and maxParams.
    * @param iPossibleResults : a set of possible results (the function will return, as a result,
@@ -41,7 +42,7 @@ public interface OSQLFunctionFiltered extends OSQLFunction {
    */
   public Object execute(
       Object iThis,
-      OIdentifiable iCurrentRecord,
+      OResult current,
       Object iCurrentResult,
       Object[] iParams,
       Iterable<OIdentifiable> iPossibleResults,

diff --git a/.../java/com/orientechnologies/orient/core/sql/functions/graph/OSQLFunctionMoveFiltered.java b/.../java/com/orientechnologies/orient/core/sql/functions/graph/OSQLFunctionMoveFiltered.java
@@ -7,6 +7,7 @@
 import com.orientechnologies.orient.core.db.ODatabaseSession;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.sql.OSQLEngine;
+import com.orientechnologies.orient.core.sql.executor.OResult;
 import com.orientechnologies.orient.core.sql.functions.OSQLFunctionFiltered;
 
 /** Created by luigidellaquila on 03/01/17. */
@@ -26,7 +27,7 @@ public OSQLFunctionMoveFiltered(final String iName, final int iMin, final int iM
   @Override
   public Object execute(
       final Object iThis,
-      final OIdentifiable iCurrentRecord,
+      final OResult current,
       final Object iCurrentResult,
       final Object[] iParameters,
       final Iterable<OIdentifiable> iPossibleResults,

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OMethodCall.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OMethodCall.java
@@ -160,15 +160,8 @@ private static Object invokeGraphFunction(
       List<Object> paramValues) {
     if (graphFunction instanceof OSQLFunctionFiltered) {
       OResult current = ctx.getCurrent();
-      OIdentifiable currentR = ((OResult) current).getElement().orElse(null);
       return ((OSQLFunctionFiltered) graphFunction)
-          .execute(
-              targetObjects,
-              (OIdentifiable) currentR,
-              null,
-              paramValues.toArray(),
-              iPossibleResults,
-              ctx);
+          .execute(targetObjects, current, null, paramValues.toArray(), iPossibleResults, ctx);
     } else {
       OResult current = ctx.getCurrent();
       if (current != null) {