geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject [3/5] geode git commit: GEODE-265 : Removing deprecated API's from Execution interface. In addition to execute method variants removed withArgs method which is deprecated as well.
Date Mon, 05 Jun 2017 18:22:31 GMT
GEODE-265 : Removing deprecated API's from Execution interface.
In addition to execute method variants removed withArgs method which is deprecated as well.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/fe2f18d5
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/fe2f18d5
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/fe2f18d5

Branch: refs/heads/develop
Commit: fe2f18d55adb028525883d2ecf1c5ceeba751385
Parents: c870c99
Author: Deepak Dixit <deepakdixit2011@gmail.com>
Authored: Mon May 8 16:34:59 2017 +0530
Committer: nabarun <nnag@pivotal.io>
Committed: Mon Jun 5 11:14:16 2017 -0700

----------------------------------------------------------------------
 .../catalina/ClientServerSessionCache.java      |  8 +-
 .../catalina/PeerToPeerSessionCache.java        |  4 +-
 .../apache/geode/cache/execute/Execution.java   | 93 --------------------
 .../command/ExecuteRegionFunction65.java        | 12 +--
 .../command/ExecuteRegionFunction66.java        | 12 +--
 .../command/ExecuteRegionFunctionSingleHop.java | 12 +--
 ...ributedRegionFunctionExecutionDUnitTest.java |  4 +-
 .../cache/execute/LocalDataSetDUnitTest.java    | 21 ++---
 ...ntServerFunctionExecutionNoAckDUnitTest.java |  3 +-
 .../RollingUpgrade2DUnitTest.java               |  2 +-
 10 files changed, 36 insertions(+), 135 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
index af2a2a3..558eb61 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
@@ -99,8 +99,7 @@ public class ClientServerSessionCache extends AbstractSessionCache {
       // Execute the partitioned touch function on the primary server(s)
       Execution execution = FunctionService.onRegion(getSessionRegion()).withFilter(sessionIds);
       try {
-        ResultCollector collector =
-            execution.execute(TouchPartitionedRegionEntriesFunction.ID, true, false, true);
+        ResultCollector collector = execution.execute(TouchPartitionedRegionEntriesFunction.ID);
         collector.getResult();
       } catch (Exception e) {
         // If an exception occurs in the function, log it.
@@ -111,8 +110,7 @@ public class ClientServerSessionCache extends AbstractSessionCache {
       Execution execution = FunctionService.onServers(getCache())
           .setArguments(new Object[] {this.sessionRegion.getFullPath(), sessionIds});
       try {
-        ResultCollector collector =
-            execution.execute(TouchReplicatedRegionEntriesFunction.ID, true, false, false);
+        ResultCollector collector = execution.execute(TouchReplicatedRegionEntriesFunction.ID);
         collector.getResult();
       } catch (Exception e) {
         // If an exception occurs in the function, log it.
@@ -144,7 +142,7 @@ public class ClientServerSessionCache extends AbstractSessionCache {
 
     // Execute the function on the session region
     Execution execution = FunctionService.onRegion(getSessionRegion()).withFilter(filters);
-    ResultCollector collector = execution.execute(RegionSizeFunction.ID, true, true, true);
+    ResultCollector collector = execution.execute(RegionSizeFunction.ID);
     List<Integer> result = (List<Integer>) collector.getResult();
 
     // Return the first (and only) element

http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
index f1afca3..bbf8e39 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
@@ -87,12 +87,12 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
     if (regionAttributesID.startsWith("partition")) {
       // Execute the partitioned touch function on the primary server(s)
       Execution execution = FunctionService.onRegion(getSessionRegion()).withFilter(sessionIds);
-      collector = execution.execute(TouchPartitionedRegionEntriesFunction.ID, true, false,
true);
+      collector = execution.execute(TouchPartitionedRegionEntriesFunction.ID);
     } else {
       // Execute the member touch function on all the server(s)
       Execution execution = FunctionService.onMembers()
           .setArguments(new Object[] {this.sessionRegion.getFullPath(), sessionIds});
-      collector = execution.execute(TouchReplicatedRegionEntriesFunction.ID, true, false,
false);
+      collector = execution.execute(TouchReplicatedRegionEntriesFunction.ID);
     }
 
     // Get the result

http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
index 90ee1ec..94beb0a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java
@@ -66,19 +66,6 @@ public interface Execution<IN, OUT, AGG> {
   public Execution<IN, OUT, AGG> setArguments(IN args);
 
   /**
-   * Specifies the user data passed to the function when it is executed. The function can
retrieve
-   * these arguments using {@link FunctionContext#getArguments()}
-   * 
-   * @param args user data passed to the function execution
-   * @return an Execution with args
-   * @throws IllegalArgumentException if the input parameter is null
-   * @since GemFire 6.0
-   * @deprecated use {@link #setArguments(Object)} instead
-   * 
-   */
-  public Execution<IN, OUT, AGG> withArgs(IN args);
-
-  /**
    * Specifies the {@link ResultCollector} that will receive the results after the function
has been
    * executed. Collector will receive results as they are sent from the
    * {@link Function#execute(FunctionContext)} using {@link ResultSender}.
@@ -122,84 +109,4 @@ public interface Execution<IN, OUT, AGG> {
    * @since GemFire 6.0
    */
   public ResultCollector<OUT, AGG> execute(Function function) throws FunctionException;
-
-  /**
-   * Executes the function using its {@linkplain Function#getId() id}
-   * <p>
-   * {@link Function#execute(FunctionContext)} is called on the de-serialized instance on
the
-   * executing member. Function should be registered on the executing member using
-   * {@link FunctionService#registerFunction(Function)} method before calling this method.
-   * 
-   * As of 6.6, this is deprecated, since users can pass different value for the hasResult
parameter
-   * that than the boolean value returned from {@link Function#hasResult()}.
-   * 
-   * @param functionId the {@link Function#getId()} of the function
-   * @param hasResult Whether the function returns any result
-   * @throws LowMemoryException if the {@link Function#optimizeForWrite()} returns true and
there is
-   *         a low memory condition
-   * @return ResultCollector to retrieve the results received. This is different object than
the
-   *         ResultCollector provided in {@link Execution#withCollector(ResultCollector)}.
User has
-   *         to use this reference to retrieve results.
-   * 
-   * @since GemFire 6.5
-   * @deprecated as of 6.6, use {@link #execute(String)} instead
-   */
-  @Deprecated
-  public ResultCollector<?, ?> execute(String functionId, boolean hasResult)
-      throws FunctionException;
-
-  /**
-   * Executes the function using its {@linkplain Function#getId() id}
-   * <p>
-   * {@link Function#execute(FunctionContext)} is called on the de-serialized instance on
the
-   * executing member.Function should be registered on the executing member using
-   * {@link FunctionService#registerFunction(Function)} method before calling this method.
-   * 
-   * As of 6.6, this is deprecated, since users can pass different value for the hasResult,
isHA
-   * parameter that than the boolean values returned from {@link Function#hasResult()},
-   * {@link Function#isHA()}.
-   * 
-   * @param functionId the {@link Function#getId()} of the function
-   * @param hasResult Whether the function returns any result
-   * @param isHA Whether the given function is HA
-   * @throws LowMemoryException if the {@link Function#optimizeForWrite()} returns true and
there is
-   *         a low memory condition
-   * @return ResultCollector to retrieve the results received. This is different object than
the
-   *         ResultCollector provided in {@link Execution#withCollector(ResultCollector)}.
User has
-   *         to use this reference to retrieve results.
-   * 
-   * @since GemFire 6.5
-   * @deprecated as of 6.6, use {@link #execute(String)} instead
-   */
-  @Deprecated
-  public ResultCollector<?, ?> execute(String functionId, boolean hasResult, boolean
isHA)
-      throws FunctionException;
-
-  /**
-   * Executes the function using its {@linkplain Function#getId() id}
-   * <p>
-   * {@link Function#execute(FunctionContext)} is called on the de-serialized instance on
the
-   * executing member.Function should be registered on the executing member using
-   * {@link FunctionService#registerFunction(Function)} method before calling this method.
-   * 
-   * As of 6.6, this is deprecated, since users can pass different value for the hasResult,
isHA,
-   * optimizeForWrite parameters that than the boolean values returned from
-   * {@link Function#hasResult()}, {@link Function#isHA()}, {@link Function#optimizeForWrite()}.
-   * 
-   * @param functionId the {@link Function#getId()} of the function
-   * @param hasResult Whether the function returns any result
-   * @param isHA Whether the given function is HA
-   * @param optimizeForWrite Whether the function should be optmized for write operations
-   * @throws LowMemoryException if the {@link Function#optimizeForWrite()} returns true and
there is
-   *         a low memory condition
-   * @return ResultCollector to retrieve the results received. This is different object than
the
-   *         ResultCollector provided in {@link Execution#withCollector(ResultCollector)}.
User has
-   *         to use this reference to retrieve results.
-   * 
-   * @since GemFire 6.5
-   * @deprecated as of 6.6, use {@link #execute(String)} instead
-   */
-  @Deprecated
-  public ResultCollector<?, ?> execute(String functionId, boolean hasResult, boolean
isHA,
-      boolean optimizeForWrite) throws FunctionException;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
index 3be907b..7e015f8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
@@ -228,16 +228,16 @@ public class ExecuteRegionFunction65 extends BaseCommand {
         if (function instanceof String) {
           switch (functionState) {
             case AbstractExecution.NO_HA_HASRESULT_NO_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, false, false).getResult();
+              execution.execute((String) function).getResult();
               break;
             case AbstractExecution.HA_HASRESULT_NO_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, true, false).getResult();
+              execution.execute((String) function).getResult();
               break;
             case AbstractExecution.HA_HASRESULT_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, true, true).getResult();
+              execution.execute((String) function).getResult();
               break;
             case AbstractExecution.NO_HA_HASRESULT_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, false, true).getResult();
+              execution.execute((String) function).getResult();
               break;
           }
         } else {
@@ -247,10 +247,10 @@ public class ExecuteRegionFunction65 extends BaseCommand {
         if (function instanceof String) {
           switch (functionState) {
             case AbstractExecution.NO_HA_NO_HASRESULT_NO_OPTIMIZEFORWRITE:
-              execution.execute((String) function, false, false, false);
+              execution.execute((String) function);
               break;
             case AbstractExecution.NO_HA_NO_HASRESULT_OPTIMIZEFORWRITE:
-              execution.execute((String) function, false, false, true);
+              execution.execute((String) function);
               break;
           }
         } else {

http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
index 674082c..4fda244 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
@@ -249,16 +249,16 @@ public class ExecuteRegionFunction66 extends BaseCommand {
         if (function instanceof String) {
           switch (functionState) {
             case AbstractExecution.NO_HA_HASRESULT_NO_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, false, false).getResult();
+              execution.execute((String) function).getResult();
               break;
             case AbstractExecution.HA_HASRESULT_NO_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, true, false).getResult();
+              execution.execute((String) function).getResult();
               break;
             case AbstractExecution.HA_HASRESULT_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, true, true).getResult();
+              execution.execute((String) function).getResult();
               break;
             case AbstractExecution.NO_HA_HASRESULT_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, false, true).getResult();
+              execution.execute((String) function).getResult();
               break;
           }
         } else {
@@ -268,10 +268,10 @@ public class ExecuteRegionFunction66 extends BaseCommand {
         if (function instanceof String) {
           switch (functionState) {
             case AbstractExecution.NO_HA_NO_HASRESULT_NO_OPTIMIZEFORWRITE:
-              execution.execute((String) function, false, false, false);
+              execution.execute((String) function);
               break;
             case AbstractExecution.NO_HA_NO_HASRESULT_OPTIMIZEFORWRITE:
-              execution.execute((String) function, false, false, true);
+              execution.execute((String) function);
               break;
           }
         } else {

http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
index cf96137..d4edde9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
@@ -256,16 +256,16 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
         if (function instanceof String) {
           switch (functionState) {
             case AbstractExecution.NO_HA_HASRESULT_NO_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, false, false).getResult();
+              execution.execute((String) function).getResult();
               break;
             case AbstractExecution.HA_HASRESULT_NO_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, true, false).getResult();
+              execution.execute((String) function).getResult();
               break;
             case AbstractExecution.HA_HASRESULT_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, true, true).getResult();
+              execution.execute((String) function).getResult();
               break;
             case AbstractExecution.NO_HA_HASRESULT_OPTIMIZEFORWRITE:
-              execution.execute((String) function, true, false, true).getResult();
+              execution.execute((String) function).getResult();
               break;
           }
         } else {
@@ -275,10 +275,10 @@ public class ExecuteRegionFunctionSingleHop extends BaseCommand {
         if (function instanceof String) {
           switch (functionState) {
             case AbstractExecution.NO_HA_NO_HASRESULT_NO_OPTIMIZEFORWRITE:
-              execution.execute((String) function, false, false, false);
+              execution.execute((String) function);
               break;
             case AbstractExecution.NO_HA_NO_HASRESULT_OPTIMIZEFORWRITE:
-              execution.execute((String) function, false, false, true);
+              execution.execute((String) function);
               break;
           }
         } else {

http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index 9abc8f3..a04d658 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -1128,7 +1128,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
   public static void executeFunctionFunctionInvocationTargetExceptionWithoutHA() {
     try {
       ResultCollector rc1 = FunctionService.onRegion(region).setArguments(Boolean.TRUE)
-          .execute("DistribuedRegionFunctionFunctionInvocationException", true, false);
+          .execute("DistribuedRegionFunctionFunctionInvocationException");
       rc1.getResult();
       fail("Function Invocation Target Exception should be thrown");
     } catch (Exception e) {
@@ -1154,7 +1154,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut
   public static void executeFunctionFunctionInvocationTargetException_ClientServer_WithoutHA()
{
     try {
       FunctionService.onRegion(region).setArguments(Boolean.TRUE)
-          .execute("DistribuedRegionFunctionFunctionInvocationException", true, false).getResult();
+          .execute("DistribuedRegionFunctionFunctionInvocationException").getResult();
       fail("Function Invocation Target Exception should be thrown");
     } catch (Exception e) {
       e.printStackTrace();

http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
index ac4be9c..5f67499 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
@@ -112,8 +112,7 @@ public class LocalDataSetDUnitTest extends JUnit4CacheTestCase {
         Region region = basicGetCache().getRegion("CustomerPR");
         Set filter = new HashSet();
         filter.add("1");
-        FunctionService.onRegion(region).withFilter(filter)
-            .execute(IterateFunction.id, true, false, true).getResult();
+        FunctionService.onRegion(region).withFilter(filter).execute(IterateFunction.id).getResult();
         return null;
       }
     });
@@ -193,24 +192,22 @@ public class LocalDataSetDUnitTest extends JUnit4CacheTestCase {
 
   public static void executeFunction() {
     try {
-      FunctionService.onRegion(customerPR).execute("LocalDataSetFunction" + true, true, false,
true)
-          .getResult();
-      FunctionService.onRegion(customerPR)
-          .execute("LocalDataSetFunction" + false, true, false, false).getResult();
+      FunctionService.onRegion(customerPR).execute("LocalDataSetFunction" + true).getResult();
+      FunctionService.onRegion(customerPR).execute("LocalDataSetFunction" + false).getResult();
       Set<String> filter = new HashSet<String>();
       filter.add("YOYO-CUST-KEY-" + 0);
+      FunctionService.onRegion(customerPR).withFilter(filter).execute("LocalDataSetFunction"
+ true)
+          .getResult();
       FunctionService.onRegion(customerPR).withFilter(filter)
-          .execute("LocalDataSetFunction" + true, true, false, true).getResult();
-      FunctionService.onRegion(customerPR).withFilter(filter)
-          .execute("LocalDataSetFunction" + false, true, false, false).getResult();
+          .execute("LocalDataSetFunction" + false).getResult();
       filter.clear();
       for (int i = 0; i < 6; i++) {
         filter.add("YOYO-CUST-KEY-" + i);
       }
+      FunctionService.onRegion(customerPR).withFilter(filter).execute("LocalDataSetFunction"
+ true)
+          .getResult();
       FunctionService.onRegion(customerPR).withFilter(filter)
-          .execute("LocalDataSetFunction" + true, true, false, true).getResult();
-      FunctionService.onRegion(customerPR).withFilter(filter)
-          .execute("LocalDataSetFunction" + false, true, false, false).getResult();
+          .execute("LocalDataSetFunction" + false).getResult();
     } catch (Exception e) {
       e.printStackTrace();
       Assert.fail("Test failed due to ", e);

http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index 4aa36a4..812a550 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -243,8 +243,7 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe
             .info("The function name to execute : (without Register) " + function.getId());
         Execution me = member.setArguments(args);
         LogWriterUtils.getLogWriter().info("The args passed  : " + args);
-        return me.execute(function.getId(), function.hasResult(), function.isHA(),
-            function.optimizeForWrite());
+        return me.execute(function.getId());
       }
     } else { // By Instance
       return member.setArguments(args).execute(function);

http://git-wip-us.apache.org/repos/asf/geode/blob/fe2f18d5/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
index beb3a9a..c628fe1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
@@ -1161,7 +1161,7 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase
{
       DistributedMember... members) {
     Set<DistributedMember> membersSet = new HashSet<>();
     Collections.addAll(membersSet, members);
-    Execution execution = FunctionService.onMembers(membersSet).withArgs(dsClassName);
+    Execution execution = FunctionService.onMembers(membersSet).setArguments(dsClassName);
     ResultCollector rc = execution.execute(functionId);
     List result = (List) rc.getResult();
     assertEquals(membersSet.size(), result.size());


Mime
View raw message