geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [3/8] geode git commit: GEODE-728: Rename Execution.withArgs to Execution.setArguments
Date Thu, 20 Apr 2017 21:23:17 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index d85b810..3592ec0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -217,8 +217,8 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
                 origVals.add(val);
                 region.put(i.next(), val);
               }
-              ResultCollector rc =
-                  dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+              ResultCollector rc = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+                  .execute(function.getId());
               int resultSize = ((List) rc.getResult()).size();
               resultReceived_Aggregate += resultSize;
               resultReceived_TESTFUNCTION2 += resultSize;
@@ -227,7 +227,8 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
               noOfExecutionsCompleted_Aggregate++;
               noOfExecutionsCompleted_TESTFUNCTION2++;
 
-              rc = dataSet.withFilter(testKeysSet).withArgs(testKeysSet).execute(function.getId());
+              rc = dataSet.withFilter(testKeysSet).setArguments(testKeysSet)
+                  .execute(function.getId());
               resultSize = ((List) rc.getResult()).size();
               resultReceived_Aggregate += resultSize;
               resultReceived_TESTFUNCTION2 += resultSize;
@@ -238,7 +239,8 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
 
               function = new TestFunction(true, TestFunction.TEST_FUNCTION3);
               FunctionService.registerFunction(function);
-              rc = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+              rc = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+                  .execute(function.getId());
               resultSize = ((List) rc.getResult()).size();
               resultReceived_Aggregate += resultSize;
               resultReceived_TESTFUNCTION3 += resultSize;
@@ -548,7 +550,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
         Execution member = FunctionService.onServers(pool);
 
         try {
-          ResultCollector rs = member.withArgs(Boolean.TRUE).execute(function.getId());
+          ResultCollector rs = member.setArguments(Boolean.TRUE).execute(function.getId());
           int size = ((List) rs.getResult()).size();
           resultReceived_Aggregate += size;
           noOfExecutionCalls_Aggregate++;
@@ -568,7 +570,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
           for (int i = 0; i < 20; i++) {
             testKeysSet.add("execKey-" + i);
           }
-          ResultCollector rs = member.withArgs("Success").execute(function.getId());
+          ResultCollector rs = member.setArguments("Success").execute(function.getId());
           int size = ((List) rs.getResult()).size();
           resultReceived_Aggregate += size;
           noOfExecutionCalls_Aggregate++;
@@ -771,19 +773,19 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
         Function function = new TestFunction(true, TestFunction.TEST_FUNCTION2);
         FunctionService.registerFunction(function);
         Execution dataSet = FunctionService.onRegion(pr);
-        ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(function);
+        ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(function);
         int size = ((List) rc1.getResult()).size();
         resultReceived_Aggregate += size;
         resultReceived_TESTFUNCTION2 += size;
 
-        rc1 = dataSet.withArgs(testKeys).execute(function);
+        rc1 = dataSet.setArguments(testKeys).execute(function);
         size = ((List) rc1.getResult()).size();
         resultReceived_Aggregate += size;
         resultReceived_TESTFUNCTION2 += size;
 
         function = new TestFunction(true, TestFunction.TEST_FUNCTION3);
         FunctionService.registerFunction(function);
-        rc1 = dataSet.withArgs(Boolean.TRUE).execute(function);
+        rc1 = dataSet.setArguments(Boolean.TRUE).execute(function);
         size = ((List) rc1.getResult()).size();
         resultReceived_Aggregate += size;
         resultReceived_TESTFUNCTION3 += size;
@@ -942,7 +944,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
           public Object call() throws Exception {
             Region region = getCache().getRegion(rName);
             try {
-              List list = (List) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+              List list = (List) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
                   .execute(TestFunction.TEST_FUNCTION2).getResult();
               // this is the Distributed Region with Empty Data policy.
               // therefore no function execution takes place here. it only receives the results.
@@ -1057,7 +1059,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
         DistributedMember localmember = ds.getDistributedMember();
         memberExecution = FunctionService.onMember(ds, localmember);
 
-        memberExecution.withArgs("Key");
+        memberExecution.setArguments("Key");
         try {
           ResultCollector rc = memberExecution.execute(inlineFunction);
           int size = ((List) rc.getResult()).size();
@@ -1198,7 +1200,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
           Function function = new TestFunction(true, "TestFunctionException");
           FunctionService.registerFunction(function);
           Execution dataSet = FunctionService.onRegion(pr);
-          ResultCollector rc = dataSet.withArgs(Boolean.TRUE).execute(function.getId());
+          ResultCollector rc = dataSet.setArguments(Boolean.TRUE).execute(function.getId());
           // Wait Criterion is added to make sure that the function execution
           // happens on all nodes and all nodes get the FunctionException so that the stats will get
           // incremented,

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
index a0ed90d..5b6f065 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
@@ -143,7 +143,7 @@ public class LocalFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
       Function function1 = new TestFunction(true, TestFunction.TEST_FUNCTION_EXCEPTION);
       FunctionService.registerFunction(function1);
       ResultCollector rc =
-          FunctionService.onRegion(region).withArgs(Boolean.TRUE).execute(function1.getId());
+          FunctionService.onRegion(region).setArguments(Boolean.TRUE).execute(function1.getId());
       rc.getResult();
       Assert.fail("Exception should occur", new Exception("Test Failed"));
     } catch (Exception e) {
@@ -157,7 +157,7 @@ public class LocalFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
       FunctionService.registerFunction(function1);
       DistributedMember localmember = getSystemStatic().getDistributedMember();
       ResultCollector rc = FunctionService.onMember(getSystemStatic(), localmember)
-          .withArgs(Boolean.TRUE).execute(function1.getId());
+          .setArguments(Boolean.TRUE).execute(function1.getId());
       rc.getResult();
       Assert.fail("Exception should occur", new Exception("Test Failed"));
     } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 3fa944a..1bc00a8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -379,7 +379,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
     DistributedMember localmember = ds.getDistributedMember();
     Execution memberExcution = null;
     memberExcution = FunctionService.onMember(ds, localmember);
-    Execution executor = memberExcution.withArgs("Key");
+    Execution executor = memberExcution.setArguments("Key");
     try {
       ResultCollector rc = executor.execute(new FunctionAdapter() {
         @Override
@@ -492,7 +492,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
       memberExcution = (InternalExecution) FunctionService.onMembers(ds, memberSet);
     }
     try {
-      ResultCollector rc = memberExcution.withArgs(Boolean.TRUE).execute(function);
+      ResultCollector rc = memberExcution.setArguments(Boolean.TRUE).execute(function);
       List li = (ArrayList) rc.getResult();
       LogWriterUtils.getLogWriter()
           .info("MemberFunctionExecutionDUnitTest#excuteOnMembers: Result : " + li);
@@ -569,7 +569,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
       memberSet.remove(localVM);
       memberExcution = FunctionService.onMembers(ds, memberSet);
     }
-    Execution executor = memberExcution.withArgs("Key");
+    Execution executor = memberExcution.setArguments("Key");
     try {
       ResultCollector rc = executor.execute(new FunctionAdapter() {
         @Override
@@ -612,7 +612,7 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
     assertNotNull(ds);
     Function function = new TestFunction(false, TEST_FUNCTION6);
     Execution memberExcution = FunctionService.onMembers(ds);
-    Execution executor = memberExcution.withArgs("Key");
+    Execution executor = memberExcution.setArguments("Key");
     try {
       ResultCollector rc = executor.execute(function.getId());
       rc.getResult();

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index 1d85c58..6be9980 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -237,7 +237,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         Execution e = FunctionService.onMembers("gm");
         ArrayList<String> args = new ArrayList<String>();
         args.add("gm");
-        e = e.withArgs(args);
+        e = e.setArguments(args);
         if (registerFunction) {
           e.execute(OnGroupsFunction.Id).getResult();
         } else {
@@ -258,7 +258,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         Execution e = FunctionService.onMembers("g0");
         ArrayList<String> args = new ArrayList<String>();
         args.add("g0");
-        e = e.withArgs(args);
+        e = e.setArguments(args);
         if (registerFunction) {
           e.execute(OnGroupsFunction.Id).getResult();
         } else {
@@ -278,7 +278,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         Execution e = FunctionService.onMembers("g1");
         ArrayList<String> args = new ArrayList<String>();
         args.add("g1");
-        e = e.withArgs(args);
+        e = e.setArguments(args);
         if (registerFunction) {
           e.execute(OnGroupsFunction.Id).getResult();
         } else {
@@ -300,7 +300,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         ArrayList<String> args = new ArrayList<String>();
         args.add("g0");
         args.add("g1");
-        e = e.withArgs(args);
+        e = e.setArguments(args);
         if (registerFunction) {
           e.execute(OnGroupsFunction.Id).getResult();
         } else {
@@ -511,7 +511,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         Execution e = FunctionService.onMembers("mg");
         ArrayList<String> args = new ArrayList<String>();
         args.add("runtime");
-        e = e.withArgs(args);
+        e = e.setArguments(args);
         try {
           e.execute(new OnGroupsExceptionFunction()).getResult();
           fail("expected exception not thrown");
@@ -520,7 +520,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         }
 
         Execution e1 = FunctionService.onMembers("g1");
-        e1 = e1.withArgs(args);
+        e1 = e1.setArguments(args);
         try {
           e1.execute(new OnGroupsExceptionFunction()).getResult();
           fail("expected exception not thrown");
@@ -531,7 +531,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         // fail on only one member
         Execution e2 = FunctionService.onMembers("g1");
         args.add("g2");
-        e2 = e2.withArgs(args);
+        e2 = e2.setArguments(args);
         try {
           e2.execute(new OnGroupsExceptionFunction()).getResult();
           fail("expected exception not thrown");
@@ -562,7 +562,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         Execution e1 = FunctionService.onMembers("g1");
         ArrayList<String> args = new ArrayList<String>();
         args.add("shutdown");
-        e1 = e1.withArgs(args);
+        e1 = e1.setArguments(args);
         try {
           e1.execute(new OnGroupsExceptionFunction()).getResult();
           fail("expected exception not thrown");
@@ -594,7 +594,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         ArrayList<String> args = new ArrayList<String>();
         args.add("shutdown");
         args.add("g2");
-        e1 = e1.withArgs(args);
+        e1 = e1.setArguments(args);
         try {
           e1.execute(new OnGroupsExceptionFunction()).getResult();
           fail("expected exception not thrown");
@@ -626,7 +626,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         ArrayList<String> args = new ArrayList<String>();
         args.add("shutdown");
         args.add("g2");
-        e1 = e1.withArgs(args);
+        e1 = e1.setArguments(args);
         ((AbstractExecution) e1).setIgnoreDepartedMembers(true);
         ArrayList l = (ArrayList) e1.execute(new OnGroupsExceptionFunction()).getResult();
         assertEquals(2, l.size());
@@ -705,7 +705,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         if (withArgs) {
           ArrayList<String> args = new ArrayList<String>();
           args.add("g0");
-          e = e.withArgs(args);
+          e = e.setArguments(args);
         }
         if (register) {
           e.execute(OnGroupsFunction.Id).getResult();
@@ -728,7 +728,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         if (withArgs) {
           ArrayList<String> args = new ArrayList<String>();
           args.add("mg");
-          e = e.withArgs(args);
+          e = e.setArguments(args);
         }
         if (register) {
           e.execute(OnGroupsFunction.Id).getResult();
@@ -752,7 +752,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
           ArrayList<String> args = new ArrayList<String>();
           args.add("g0");
           args.add("g1");
-          e = e.withArgs(args);
+          e = e.setArguments(args);
         }
         if (register) {
           e.execute(OnGroupsFunction.Id).getResult();
@@ -977,7 +977,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         Execution e = InternalFunctionService.onServers(c, "mg");
         ArrayList<String> args = new ArrayList<String>();
         args.add("runtime");
-        e = e.withArgs(args);
+        e = e.setArguments(args);
         try {
           e.execute(new OnGroupsExceptionFunction()).getResult();
           fail("expected exception not thrown");
@@ -986,7 +986,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         }
 
         Execution e1 = InternalFunctionService.onServers(c, "g1");
-        e1 = e1.withArgs(args);
+        e1 = e1.setArguments(args);
         try {
           e1.execute(new OnGroupsExceptionFunction()).getResult();
           fail("expected exception not thrown");
@@ -997,7 +997,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         // only one member
         Execution e2 = InternalFunctionService.onServers(c, "g1");
         args.add("g2");
-        e2 = e2.withArgs(args);
+        e2 = e2.setArguments(args);
         try {
           e2.execute(new OnGroupsExceptionFunction()).getResult();
           fail("expected exception not thrown");
@@ -1045,7 +1045,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         Execution e = InternalFunctionService.onServers(c, "g1");
         ArrayList<String> args = new ArrayList<String>();
         args.add("disconnect");
-        e = e.withArgs(args);
+        e = e.setArguments(args);
 
         IgnoredException.addIgnoredException("FunctionInvocationTargetException");
         try {
@@ -1096,7 +1096,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         ArrayList<String> args = new ArrayList<String>();
         args.add("disconnect");
         args.add("g2");
-        e = e.withArgs(args);
+        e = e.setArguments(args);
         IgnoredException.addIgnoredException("FunctionInvocationTargetException");
         try {
           e.execute(new OnGroupsExceptionFunction()).getResult();
@@ -1146,7 +1146,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCas
         ArrayList<String> args = new ArrayList<String>();
         args.add("disconnect");
         args.add("g2");
-        e = e.withArgs(args);
+        e = e.setArguments(args);
         ((AbstractExecution) e).setIgnoreDepartedMembers(true);
         ArrayList l = (ArrayList) e.execute(new OnGroupsExceptionFunction()).getResult();
         LogWriterUtils.getLogWriter().info("SWAP:result:" + l);

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/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 e5464bb..4aa36a4 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
@@ -235,19 +235,19 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe
     if (isByName.booleanValue()) {// by name
       if (toRegister.booleanValue()) {
         LogWriterUtils.getLogWriter().info("The function name to execute : " + function.getId());
-        Execution me = member.withArgs(args);
+        Execution me = member.setArguments(args);
         LogWriterUtils.getLogWriter().info("The args passed  : " + args);
         return me.execute(function.getId());
       } else {
         LogWriterUtils.getLogWriter()
             .info("The function name to execute : (without Register) " + function.getId());
-        Execution me = member.withArgs(args);
+        Execution me = member.setArguments(args);
         LogWriterUtils.getLogWriter().info("The args passed  : " + args);
         return me.execute(function.getId(), function.hasResult(), function.isHA(),
             function.optimizeForWrite());
       }
     } else { // By Instance
-      return member.withArgs(args).execute(function);
+      return member.setArguments(args).execute(function);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index e4a85b0..3d18067 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -606,7 +606,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
       Integer val = new Integer(j++);
       region.put(i.next(), val);
     }
-    List list = (List) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+    List list = (List) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
         .execute(new FunctionAdapter() {
           @Override
           public void execute(FunctionContext context) {
@@ -672,7 +672,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
     Execution dataSet = FunctionService.onRegion(region);
     try {
       ResultCollector rc1 =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
       List l = ((List) rc1.getResult());
       LogWriterUtils.getLogWriter().info("Result size : " + l.size());
       assertEquals(3, l.size());
@@ -696,7 +696,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
     FunctionService.registerFunction(function);
     Execution dataSet = FunctionService.onRegion(region);
     ResultCollector rc1 =
-        dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+        dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
     List l = ((List) rc1.getResult());
     LogWriterUtils.getLogWriter().info("Result size : " + l.size());
     return l;
@@ -993,7 +993,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
       }
       List l = null;
       ResultCollector rc1 =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
             @Override
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
@@ -1045,28 +1045,29 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
     }
     ResultCollector rc1 = null;
     try {
-      rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
-        @Override
-        public void execute(FunctionContext context) {
-          if (((RegionFunctionContext) context).isPossibleDuplicate()) {
-            context.getResultSender().lastResult(new Integer(retryCount));
-            return;
-          }
-          if (context.getArguments() instanceof Boolean) {
-            throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
-          }
-        }
+      rc1 =
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
+            @Override
+            public void execute(FunctionContext context) {
+              if (((RegionFunctionContext) context).isPossibleDuplicate()) {
+                context.getResultSender().lastResult(new Integer(retryCount));
+                return;
+              }
+              if (context.getArguments() instanceof Boolean) {
+                throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
+              }
+            }
 
-        @Override
-        public String getId() {
-          return getClass().getName();
-        }
+            @Override
+            public String getId() {
+              return getClass().getName();
+            }
 
-        @Override
-        public boolean hasResult() {
-          return true;
-        }
-      });
+            @Override
+            public boolean hasResult() {
+              return true;
+            }
+          });
 
       List list = (ArrayList) rc1.getResult();
       assertEquals(list.get(0), 0);
@@ -1120,7 +1121,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
     }
     Function function = new TestFunction(false, TEST_FUNCTION2);
     Execution dataSet = FunctionService.onRegion(region);
-    dataSet.withArgs(Boolean.TRUE).execute(function);
+    dataSet.setArguments(Boolean.TRUE).execute(function);
     region.put(new Integer(2), "KB_2");
     assertEquals("KB_2", region.get(new Integer(2)));
   }
@@ -1130,7 +1131,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
     assertNotNull(region);
     Function function = new TestFunction(false, TEST_FUNCTION2);
     Execution dataSet = FunctionService.onServer(pool);
-    dataSet.withArgs(Boolean.TRUE).execute(function);
+    dataSet.setArguments(Boolean.TRUE).execute(function);
     region.put(new Integer(1), "KB_1");
     assertEquals("KB_1", region.get(new Integer(1)));
   }
@@ -1190,14 +1191,14 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
     Execution dataSet = FunctionService.onRegion(region);
     region.put(testKey, new Integer(1));
     ((AbstractExecution) dataSet).removeFunctionAttributes(TestFunction.TEST_FUNCTION2);
-    ResultCollector rs =
-        dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(TestFunction.TEST_FUNCTION2);
+    ResultCollector rs = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+        .execute(TestFunction.TEST_FUNCTION2);
     assertEquals(Boolean.TRUE, ((List) rs.getResult()).get(0));
     byte[] functionAttributes =
         ((AbstractExecution) dataSet).getFunctionAttributes(TestFunction.TEST_FUNCTION2);
     assertNotNull(functionAttributes);
 
-    rs = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE)
+    rs = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
         .execute(TestFunction.TEST_FUNCTION2);
     assertEquals(Boolean.TRUE, ((List) rs.getResult()).get(0));
     assertNotNull(functionAttributes);
@@ -1371,7 +1372,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
           .info("<ExpectedException action=add>" + "No target node found for KEY = "
               + "|Server could not send the reply" + "|Unexpected exception during"
               + "</ExpectedException>");
-      dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+      dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
         @Override
         public void execute(FunctionContext context) {
           if (context.getArguments() instanceof String) {
@@ -1406,7 +1407,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
     region.put(testKey, new Integer(1));
 
     ResultCollector rs =
-        dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+        dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
           @Override
           public void execute(FunctionContext context) {
             if (context.getArguments() instanceof String) {
@@ -1429,7 +1430,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
     assertEquals("Failure", ((List) rs.getResult()).get(0));
 
     ResultCollector rs2 =
-        dataSet.withFilter(testKeysSet).withArgs(testKey).execute(new FunctionAdapter() {
+        dataSet.withFilter(testKeysSet).setArguments(testKey).execute(new FunctionAdapter() {
           @Override
           public void execute(FunctionContext context) {
             if (context.getArguments() instanceof String) {
@@ -1483,7 +1484,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
           .info("<ExpectedException action=add>"
               + "Could not create an instance of  org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"
               + "</ExpectedException>");
-      dataSet.withFilter(testKeysSet).withArgs(new UnDeserializable())
+      dataSet.withFilter(testKeysSet).setArguments(new UnDeserializable())
           .execute(new FunctionAdapter() {
             @Override
             public void execute(FunctionContext context) {
@@ -1519,9 +1520,9 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
   private static ResultCollector execute(Execution dataSet, Set testKeysSet, Serializable args,
       Function function, Boolean isByName) throws Exception {
     if (isByName.booleanValue()) {// by name
-      return dataSet.withFilter(testKeysSet).withArgs(args).execute(function.getId());
+      return dataSet.withFilter(testKeysSet).setArguments(args).execute(function.getId());
     } else { // By Instance
-      return dataSet.withFilter(testKeysSet).withArgs(args).execute(function);
+      return dataSet.withFilter(testKeysSet).setArguments(args).execute(function);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index bc7e061..e61ce84 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -483,7 +483,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRCl
 
   public static Object executeFunction() {
     Execution execute = FunctionService.onRegion(region);
-    ResultCollector rc = execute.withArgs(Boolean.TRUE)
+    ResultCollector rc = execute.setArguments(Boolean.TRUE)
         .execute(new TestFunction(true, TestFunction.TEST_FUNCTION_LASTRESULT));
     LogWriterUtils.getLogWriter().info("Exeuction Result :" + rc.getResult());
     List l = ((List) rc.getResult());

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 0925bc5..ff4ca42 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -436,7 +436,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
       Integer val = new Integer(j++);
       region.put(i.next(), val);
     }
-    HashMap resultMap = (HashMap) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+    HashMap resultMap = (HashMap) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
         .execute(new FunctionAdapter() {
           public void execute(FunctionContext context) {
             if (context.getArguments() instanceof String) {
@@ -511,7 +511,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
     Execution dataSet = FunctionService.onRegion(region);
     try {
       ResultCollector rc1 =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
 
       HashMap resultMap = ((HashMap) rc1.getResult());
       assertEquals(3, resultMap.size());
@@ -549,7 +549,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
     FunctionService.registerFunction(function);
     Execution dataSet = FunctionService.onRegion(region);
     ResultCollector rc1 =
-        dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+        dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
     List l = ((List) rc1.getResult());
     LogWriterUtils.getLogWriter().info("Result size : " + l.size());
     return l;
@@ -880,7 +880,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
       }
       List l = null;
       ResultCollector rc1 =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
                 context.getResultSender().lastResult("Success");
@@ -929,25 +929,26 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
     }
     ResultCollector rc1 = null;
     try {
-      rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
-        public void execute(FunctionContext context) {
-          if (((RegionFunctionContext) context).isPossibleDuplicate()) {
-            context.getResultSender().lastResult(new Integer(retryCount));
-            return;
-          }
-          if (context.getArguments() instanceof Boolean) {
-            throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
-          }
-        }
+      rc1 =
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
+            public void execute(FunctionContext context) {
+              if (((RegionFunctionContext) context).isPossibleDuplicate()) {
+                context.getResultSender().lastResult(new Integer(retryCount));
+                return;
+              }
+              if (context.getArguments() instanceof Boolean) {
+                throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
+              }
+            }
 
-        public String getId() {
-          return getClass().getName();
-        }
+            public String getId() {
+              return getClass().getName();
+            }
 
-        public boolean hasResult() {
-          return true;
-        }
-      });
+            public boolean hasResult() {
+              return true;
+            }
+          });
 
       List list = (ArrayList) rc1.getResult();
       assertEquals(list.get(0), 0);
@@ -1078,7 +1079,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
           .info("<ExpectedException action=add>" + "No target node found for KEY = "
               + "|Server could not send the reply" + "|Unexpected exception during"
               + "</ExpectedException>");
-      dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+      dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
         public void execute(FunctionContext context) {
           if (context.getArguments() instanceof String) {
             context.getResultSender().lastResult("Success");
@@ -1109,7 +1110,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
     region.put(testKey, new Integer(1));
     try {
       ResultCollector rs =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
                 context.getResultSender().lastResult("Success");
@@ -1129,7 +1130,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
       assertEquals("Failure", ((List) rs.getResult()).get(0));
 
       ResultCollector rs2 =
-          dataSet.withFilter(testKeysSet).withArgs(testKey).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(testKey).execute(new FunctionAdapter() {
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
                 context.getResultSender().lastResult("Success");
@@ -1158,18 +1159,18 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
   private static ResultCollector execute(Execution dataSet, Set testKeysSet, Serializable args,
       Function function, Boolean isByName) throws Exception {
     if (isByName.booleanValue()) {// by name
-      return dataSet.withFilter(testKeysSet).withArgs(args).execute(function.getId());
+      return dataSet.withFilter(testKeysSet).setArguments(args).execute(function.getId());
     } else { // By Instance
-      return dataSet.withFilter(testKeysSet).withArgs(args).execute(function);
+      return dataSet.withFilter(testKeysSet).setArguments(args).execute(function);
     }
   }
 
   private static ResultCollector executeOnAll(Execution dataSet, Serializable args,
       Function function, Boolean isByName) throws Exception {
     if (isByName.booleanValue()) {// by name
-      return dataSet.withArgs(args).execute(function.getId());
+      return dataSet.setArguments(args).execute(function.getId());
     } else { // By Instance
-      return dataSet.withArgs(args).execute(function);
+      return dataSet.setArguments(args).execute(function);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index 43540a8..a06d7e6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -414,7 +414,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
       Integer val = new Integer(j++);
       region.put(i.next(), val);
     }
-    HashMap resultMap = (HashMap) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+    HashMap resultMap = (HashMap) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
         .execute(new FunctionAdapter() {
           public void execute(FunctionContext context) {
             if (context.getArguments() instanceof String) {
@@ -489,7 +489,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
     Execution dataSet = FunctionService.onRegion(region);
     try {
       ResultCollector rc1 =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
 
       HashMap resultMap = ((HashMap) rc1.getResult());
       assertEquals(3, resultMap.size());
@@ -527,7 +527,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
     FunctionService.registerFunction(function);
     Execution dataSet = FunctionService.onRegion(region);
     ResultCollector rc1 =
-        dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+        dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
     List l = ((List) rc1.getResult());
     LogWriterUtils.getLogWriter().info("Result size : " + l.size());
     return l;
@@ -851,7 +851,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
       }
       List l = null;
       ResultCollector rc1 =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
                 context.getResultSender().lastResult("Success");
@@ -900,25 +900,26 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
     }
     ResultCollector rc1 = null;
     try {
-      rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
-        public void execute(FunctionContext context) {
-          if (((RegionFunctionContext) context).isPossibleDuplicate()) {
-            context.getResultSender().lastResult(new Integer(retryCount));
-            return;
-          }
-          if (context.getArguments() instanceof Boolean) {
-            throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
-          }
-        }
+      rc1 =
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
+            public void execute(FunctionContext context) {
+              if (((RegionFunctionContext) context).isPossibleDuplicate()) {
+                context.getResultSender().lastResult(new Integer(retryCount));
+                return;
+              }
+              if (context.getArguments() instanceof Boolean) {
+                throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
+              }
+            }
 
-        public String getId() {
-          return getClass().getName();
-        }
+            public String getId() {
+              return getClass().getName();
+            }
 
-        public boolean hasResult() {
-          return true;
-        }
-      });
+            public boolean hasResult() {
+              return true;
+            }
+          });
 
       List list = (ArrayList) rc1.getResult();
       assertEquals(list.get(0), 0);
@@ -1049,7 +1050,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
           .info("<ExpectedException action=add>" + "No target node found for KEY = "
               + "|Server could not send the reply" + "|Unexpected exception during"
               + "</ExpectedException>");
-      dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+      dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
         public void execute(FunctionContext context) {
           if (context.getArguments() instanceof String) {
             context.getResultSender().lastResult("Success");
@@ -1080,7 +1081,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
     region.put(testKey, new Integer(1));
     try {
       ResultCollector rs =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
                 context.getResultSender().lastResult("Success");
@@ -1100,7 +1101,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
       assertEquals("Failure", ((List) rs.getResult()).get(0));
 
       ResultCollector rs2 =
-          dataSet.withFilter(testKeysSet).withArgs(testKey).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(testKey).execute(new FunctionAdapter() {
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
                 context.getResultSender().lastResult("Success");
@@ -1129,18 +1130,18 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
   private static ResultCollector execute(Execution dataSet, Set testKeysSet, Serializable args,
       Function function, Boolean isByName) throws Exception {
     if (isByName.booleanValue()) {// by name
-      return dataSet.withFilter(testKeysSet).withArgs(args).execute(function.getId());
+      return dataSet.withFilter(testKeysSet).setArguments(args).execute(function.getId());
     } else { // By Instance
-      return dataSet.withFilter(testKeysSet).withArgs(args).execute(function);
+      return dataSet.withFilter(testKeysSet).setArguments(args).execute(function);
     }
   }
 
   private static ResultCollector executeOnAll(Execution dataSet, Serializable args,
       Function function, Boolean isByName) throws Exception {
     if (isByName.booleanValue()) {// by name
-      return dataSet.withArgs(args).execute(function.getId());
+      return dataSet.setArguments(args).execute(function.getId());
     } else { // By Instance
-      return dataSet.withArgs(args).execute(function);
+      return dataSet.setArguments(args).execute(function);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index d5d3d64..40b653c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -449,7 +449,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
       Integer val = new Integer(j++);
       region.put(i.next(), val);
     }
-    HashMap resultMap = (HashMap) FunctionService.onRegion(region).withArgs(Boolean.TRUE)
+    HashMap resultMap = (HashMap) FunctionService.onRegion(region).setArguments(Boolean.TRUE)
         .execute(new FunctionAdapter() {
           @Override
           public void execute(FunctionContext context) {
@@ -525,7 +525,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
     Execution dataSet = FunctionService.onRegion(region);
     try {
       ResultCollector rc1 =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
 
       HashMap resultMap = ((HashMap) rc1.getResult());
       assertEquals(3, resultMap.size());
@@ -561,7 +561,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
     FunctionService.registerFunction(function);
     Execution dataSet = FunctionService.onRegion(region);
     ResultCollector rc1 =
-        dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+        dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
     List l = ((List) rc1.getResult());
     LogWriterUtils.getLogWriter().info("Result size : " + l.size());
     return l;
@@ -889,7 +889,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
       }
       List l = null;
       ResultCollector rc1 =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
             @Override
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
@@ -941,28 +941,29 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
     }
     ResultCollector rc1 = null;
     try {
-      rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
-        @Override
-        public void execute(FunctionContext context) {
-          if (((RegionFunctionContext) context).isPossibleDuplicate()) {
-            context.getResultSender().lastResult(new Integer(retryCount));
-            return;
-          }
-          if (context.getArguments() instanceof Boolean) {
-            throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
-          }
-        }
+      rc1 =
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
+            @Override
+            public void execute(FunctionContext context) {
+              if (((RegionFunctionContext) context).isPossibleDuplicate()) {
+                context.getResultSender().lastResult(new Integer(retryCount));
+                return;
+              }
+              if (context.getArguments() instanceof Boolean) {
+                throw new FunctionInvocationTargetException("I have been thrown from TestFunction");
+              }
+            }
 
-        @Override
-        public String getId() {
-          return getClass().getName();
-        }
+            @Override
+            public String getId() {
+              return getClass().getName();
+            }
 
-        @Override
-        public boolean hasResult() {
-          return true;
-        }
-      });
+            @Override
+            public boolean hasResult() {
+              return true;
+            }
+          });
 
       List list = (ArrayList) rc1.getResult();
       assertEquals(list.get(0), 0);
@@ -1093,7 +1094,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
           .info("<ExpectedException action=add>" + "No target node found for KEY = "
               + "|Server could not send the reply" + "|Unexpected exception during"
               + "</ExpectedException>");
-      dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+      dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
         @Override
         public void execute(FunctionContext context) {
           if (context.getArguments() instanceof String) {
@@ -1127,7 +1128,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
     region.put(testKey, new Integer(1));
     try {
       ResultCollector rs =
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
             @Override
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
@@ -1150,7 +1151,7 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
       assertEquals("Failure", ((List) rs.getResult()).get(0));
 
       ResultCollector rs2 =
-          dataSet.withFilter(testKeysSet).withArgs(testKey).execute(new FunctionAdapter() {
+          dataSet.withFilter(testKeysSet).setArguments(testKey).execute(new FunctionAdapter() {
             @Override
             public void execute(FunctionContext context) {
               if (context.getArguments() instanceof String) {
@@ -1182,18 +1183,18 @@ public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
   private static ResultCollector execute(Execution dataSet, Set testKeysSet, Serializable args,
       Function function, Boolean isByName) throws Exception {
     if (isByName.booleanValue()) {// by name
-      return dataSet.withFilter(testKeysSet).withArgs(args).execute(function.getId());
+      return dataSet.withFilter(testKeysSet).setArguments(args).execute(function.getId());
     } else { // By Instance
-      return dataSet.withFilter(testKeysSet).withArgs(args).execute(function);
+      return dataSet.withFilter(testKeysSet).setArguments(args).execute(function);
     }
   }
 
   private static ResultCollector executeOnAll(Execution dataSet, Serializable args,
       Function function, Boolean isByName) throws Exception {
     if (isByName.booleanValue()) {// by name
-      return dataSet.withArgs(args).execute(function.getId());
+      return dataSet.setArguments(args).execute(function.getId());
     } else { // By Instance
-      return dataSet.withArgs(args).execute(function);
+      return dataSet.setArguments(args).execute(function);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/aaef124e/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index 9576330..b9674dd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -139,7 +139,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
 
         Execution dataSet = FunctionService.onRegion(pr);
         ResultCollector result =
-            dataSet.withArgs(Boolean.TRUE).withFilter(testKeysSet).execute(function);
+            dataSet.setArguments(Boolean.TRUE).withFilter(testKeysSet).execute(function);
         System.out.println("KBKBKB : Result I got : " + result.getResult());
         return Boolean.TRUE;
       }
@@ -179,7 +179,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
 
         try {
           Execution dataSet = FunctionService.onRegion(pr);
-          dataSet.withFilter(testKeysSet).withArgs(testKey).execute(function);
+          dataSet.withFilter(testKeysSet).setArguments(testKey).execute(function);
           fail("It should have failed with Function attributes don't match");
         } catch (Exception expected) {
           expected.printStackTrace();
@@ -239,24 +239,24 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         FunctionService.registerFunction(function);
         Execution dataSet = FunctionService.onRegion(pr);
         try {
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
         } catch (Exception expected) {
           // No data should cause exec to throw
           assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey));
         }
         pr.put(testKey, new Integer(1));
         ResultCollector rs1 =
-            dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+            dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
         assertEquals(Boolean.TRUE, ((List) rs1.getResult()).get(0));
         ResultCollector rs2 =
-            dataSet.withFilter(testKeysSet).withArgs(testKey).execute(function.getId());
+            dataSet.withFilter(testKeysSet).setArguments(testKey).execute(function.getId());
         assertEquals(new Integer(1), ((List) rs2.getResult()).get(0));
 
         HashMap putData = new HashMap();
         putData.put(testKey + "1", new Integer(2));
         putData.put(testKey + "2", new Integer(3));
         ResultCollector rs3 =
-            dataSet.withFilter(testKeysSet).withArgs(putData).execute(function.getId());
+            dataSet.withFilter(testKeysSet).setArguments(putData).execute(function.getId());
         assertEquals(Boolean.TRUE, ((List) rs3.getResult()).get(0));
 
         assertEquals(new Integer(2), pr.get(testKey + "1"));
@@ -299,7 +299,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         pr.put(testKey, new Integer(1));
         try {
           ResultCollector rs1 =
-              dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+              dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
           List list = (ArrayList) rs1.getResult();
           assertEquals(list.get(0), 5);
         } catch (Throwable e) {
@@ -364,7 +364,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         pr.put(testKey, new Integer(1));
         try {
           ResultCollector rs1 =
-              dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+              dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
           List list = (ArrayList) rs1.getResult();
           assertEquals(list.get(0), 5);
         } catch (Throwable e) {
@@ -425,7 +425,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         Execution dataSet = FunctionService.onRegion(pr); // withCollector(rs);
 
         try {
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
 
         } catch (Exception expected) {
           // No data should cause exec to throw
@@ -434,15 +434,17 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
 
         pr.put(testKey, new Integer(1));
         ResultCollector rs1 =
-            dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+            dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
         assertEquals(Boolean.TRUE, ((List) rs1.getResult()).get(0));
-        ResultCollector rs2 = dataSet.withFilter(testKeysSet).withArgs(testKey).execute(function);
+        ResultCollector rs2 =
+            dataSet.withFilter(testKeysSet).setArguments(testKey).execute(function);
         assertEquals(new Integer(1), ((List) rs2.getResult()).get(0));
 
         HashMap putData = new HashMap();
         putData.put(testKey + "1", new Integer(2));
         putData.put(testKey + "2", new Integer(3));
-        ResultCollector rs3 = dataSet.withFilter(testKeysSet).withArgs(putData).execute(function);
+        ResultCollector rs3 =
+            dataSet.withFilter(testKeysSet).setArguments(putData).execute(function);
         assertEquals(Boolean.TRUE, ((List) rs3.getResult()).get(0));
 
         assertEquals(new Integer(2), pr.get(testKey + "1"));
@@ -496,8 +498,8 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         DistributedSystem.setThreadsSocketPolicy(false);
         Execution dataSet = FunctionService.onRegion(pr);
         pr.put(testKey, new Integer(1));
-        ResultCollector rs1 =
-            dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+        ResultCollector rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+            .execute(new FunctionAdapter() {
               @Override
               public void execute(FunctionContext context) {
                 if (context.getArguments() instanceof String) {
@@ -577,7 +579,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         Execution dataSet = FunctionService.onRegion(pr);
 
         try {
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
         } catch (Exception expected) {
           assertTrue(expected.getMessage(),
               expected.getMessage().contains("No target node found for KEY"));
@@ -591,7 +593,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
           pr.put(i.next(), val);
         }
         ResultCollector rs =
-            dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+            dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
         List l = ((List) rs.getResult());
         assertEquals(3, l.size());
 
@@ -601,7 +603,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
 
         // DefaultResultCollector rc2 = new DefaultResultCollector();
         ResultCollector rc2 =
-            dataSet.withFilter(testKeysSet).withArgs(testKeysSet).execute(function.getId());
+            dataSet.withFilter(testKeysSet).setArguments(testKeysSet).execute(function.getId());
         List l2 = ((List) rc2.getResult());
         assertEquals(3, l2.size());
         HashSet foundVals = new HashSet();
@@ -688,7 +690,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_LASTRESULT);
         FunctionService.registerFunction(function);
         Execution dataSet = FunctionService.onRegion(pr);
-        ResultCollector rc2 = dataSet.withArgs(Boolean.TRUE).execute(function.getId());
+        ResultCollector rc2 = dataSet.setArguments(Boolean.TRUE).execute(function.getId());
         List l = ((List) rc2.getResult());
         return l;
       }
@@ -749,7 +751,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_LASTRESULT);
         FunctionService.registerFunction(function);
         Execution dataSet = FunctionService.onRegion(pr);
-        ResultCollector rc2 = dataSet.withArgs(Boolean.TRUE).execute(function.getId());
+        ResultCollector rc2 = dataSet.setArguments(Boolean.TRUE).execute(function.getId());
         List l = ((List) rc2.getResult());
         return l;
       }
@@ -825,7 +827,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         }
         try {
           ResultCollector rs =
-              dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+              dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
           List list = (ArrayList) rs.getResult();
           assertEquals(list.get(0), 5);
         } catch (Throwable e) {
@@ -1036,7 +1038,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
     FunctionService.registerFunction(function);
     Execution dataSet = FunctionService.onRegion(pr);
     ResultCollector rs =
-        dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+        dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
     List l = ((List) rs.getResult());
     return l;
   }
@@ -1095,8 +1097,8 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
           origVals.add(val);
           pr.put(i.next(), val);
         }
-        ResultCollector rs =
-            dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+        ResultCollector rs = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE)
+            .execute(new FunctionAdapter() {
               @Override
               public void execute(FunctionContext context) {
                 if (context.getArguments() instanceof String) {
@@ -1184,7 +1186,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
           pr.put(i.next(), val);
         }
         ResultCollector rs =
-            dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+            dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
         List l = ((List) rs.getResult());
         assertEquals(3, l.size());
 
@@ -1256,7 +1258,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         }
         ResultCollector rs;
         try {
-          rs = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+          rs = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
           rs.getResult();
         } catch (Exception expected) {
           expected.printStackTrace();
@@ -1332,8 +1334,8 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
           pr.put(i.next(), val);
         }
         // long startTime = System.currentTimeMillis();
-        ResultCollector rs =
-            dataSet.withFilter(testKeysSet).withArgs("TestingTimeOut").execute(function.getId());
+        ResultCollector rs = dataSet.withFilter(testKeysSet).setArguments("TestingTimeOut")
+            .execute(function.getId());
         // long endTime = System.currentTimeMillis();
         List l = ((List) rs.getResult(10000, TimeUnit.MILLISECONDS));
         assertEquals(3, l.size()); // this test may fail..but rarely
@@ -1404,7 +1406,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         }
         ResultCollector rs;
         try {
-          rs = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+          rs = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
           rs.getResult();
         } catch (Exception expected) {
           assertTrue(expected.getMessage()
@@ -1470,7 +1472,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         FunctionService.registerFunction(function);
         Execution dataSet = FunctionService.onRegion(pr);
         try {
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
         } catch (Exception expected) {
           // No data should cause exec to throw
           LogWriterUtils.getLogWriter().warning("Exception Occured : " + expected.getMessage());
@@ -1488,7 +1490,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         }
         // DefaultResultCollector rc1 = new DefaultResultCollector();
         ResultCollector rc1 =
-            dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+            dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
         List l = ((List) rc1.getResult());
         assertEquals(3, l.size());
 
@@ -1498,7 +1500,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
 
         // DefaultResultCollector rc2 = new DefaultResultCollector();
         ResultCollector rc2 =
-            dataSet.withFilter(testKeysSet).withArgs(testKeysSet).execute(function);
+            dataSet.withFilter(testKeysSet).setArguments(testKeysSet).execute(function);
         List l2 = ((List) rc2.getResult());
         // assertIndexDetailsEquals(pr.getTotalNumberOfBuckets(), l2.size());
         assertEquals(3, l2.size());
@@ -1753,7 +1755,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         final HashSet testKeysSet = new HashSet();
         testKeysSet.add(testKey);
         try {
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function.getId());
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function.getId());
         } catch (Exception expected) {
           // No data should cause exec to throw
           assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey));
@@ -1773,7 +1775,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         }
 
         ResultCollector rc1 =
-            dataSet.withFilter(testKeys).withArgs(Boolean.TRUE).execute(function.getId());
+            dataSet.withFilter(testKeys).setArguments(Boolean.TRUE).execute(function.getId());
         List l = ((List) rc1.getResult());
         // assertIndexDetailsEquals(pr.getTotalNumberOfBuckets(), l.size());
         assertEquals(1, l.size());
@@ -1783,7 +1785,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
 
         // DefaultResultCollector rc2 = new DefaultResultCollector();
         ResultCollector rc2 =
-            dataSet.withFilter(testKeys).withArgs(testKeys).execute(function.getId());
+            dataSet.withFilter(testKeys).setArguments(testKeys).execute(function.getId());
         List l2 = ((List) rc2.getResult());
         assertEquals(1, l2.size());
 
@@ -1829,7 +1831,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         final HashSet testKeysSet = new HashSet();
         testKeysSet.add(testKey);
         try {
-          dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function);
+          dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function);
         } catch (Exception expected) {
           // No data should cause exec to throw
           assertTrue(expected.getMessage().contains("No target node found for KEY = " + testKey));
@@ -1849,7 +1851,8 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         }
 
         // DefaultResultCollector rc1 = new DefaultResultCollector();
-        ResultCollector rc1 = dataSet.withFilter(testKeys).withArgs(Boolean.TRUE).execute(function);
+        ResultCollector rc1 =
+            dataSet.withFilter(testKeys).setArguments(Boolean.TRUE).execute(function);
         List l = ((List) rc1.getResult());
         assertEquals(1, l.size());
         for (Iterator i = l.iterator(); i.hasNext();) {
@@ -1857,7 +1860,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         }
 
         // DefaultResultCollector rc2 = new DefaultResultCollector();
-        ResultCollector rc2 = dataSet.withFilter(testKeys).withArgs(testKeys).execute(function);
+        ResultCollector rc2 = dataSet.withFilter(testKeys).setArguments(testKeys).execute(function);
         List l2 = ((List) rc2.getResult());
         assertEquals(1, l2.size());
 
@@ -1932,14 +1935,14 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
           FunctionService.registerFunction(function);
           Execution dataSet = FunctionService.onRegion(pr);
           ResultCollector rc1 =
-              dataSet.withFilter(singleKeySet).withArgs(Boolean.TRUE).execute(function.getId());
+              dataSet.withFilter(singleKeySet).setArguments(Boolean.TRUE).execute(function.getId());
           List l = ((List) rc1.getResult());
           assertEquals(1, l.size());
           assertEquals(Boolean.TRUE, l.iterator().next());
 
           // DefaultResultCollector rc2 = new DefaultResultCollector();
-          ResultCollector rc2 = dataSet.withFilter(singleKeySet).withArgs(new HashSet(singleKeySet))
-              .execute(function.getId());
+          ResultCollector rc2 = dataSet.withFilter(singleKeySet)
+              .setArguments(new HashSet(singleKeySet)).execute(function.getId());
           List l2 = ((List) rc2.getResult());
 
           assertEquals(1, l2.size());
@@ -2009,14 +2012,14 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
           FunctionService.registerFunction(function);
           Execution dataSet = FunctionService.onRegion(pr);
           ResultCollector rc1 =
-              dataSet.withFilter(singleKeySet).withArgs(Boolean.TRUE).execute(function);
+              dataSet.withFilter(singleKeySet).setArguments(Boolean.TRUE).execute(function);
           List l = ((List) rc1.getResult());
           assertEquals(1, l.size());
           assertEquals(Boolean.TRUE, l.iterator().next());
 
           // DefaultResultCollector rc2 = new DefaultResultCollector();
-          ResultCollector rc2 = dataSet.withFilter(singleKeySet).withArgs(new HashSet(singleKeySet))
-              .execute(function);
+          ResultCollector rc2 = dataSet.withFilter(singleKeySet)
+              .setArguments(new HashSet(singleKeySet)).execute(function);
           List l2 = ((List) rc2.getResult());
 
           assertEquals(1, l2.size());
@@ -2083,7 +2086,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         Function function = new TestFunction(true, TestFunction.TEST_FUNCTION2);
         FunctionService.registerFunction(function);
         Execution dataSet = FunctionService.onRegion(pr);
-        ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(function.getId());
+        ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(function.getId());
         List l = ((List) rc1.getResult());
         LogWriterUtils.getLogWriter()
             .info("PRFunctionExecutionDUnitTest#testExecutionOnAllNodes_byName : Result size :"
@@ -2166,7 +2169,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         Function function = new TestFunction(true, TestFunction.TEST_FUNCTION2);
         FunctionService.registerFunction(function);
         Execution dataSet = FunctionService.onRegion(pr);
-        ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(function);
+        ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(function);
 
         List l = ((List) rc1.getResult());
         assertEquals(3, l.size());
@@ -2228,7 +2231,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
           assertTrue(pr.getBucketKeys(bid).size() > 0);
         }
         Execution dataSet = FunctionService.onRegion(pr);
-        ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+        ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
           @Override
           public void execute(FunctionContext context) {
             if (context.getArguments() instanceof String) {
@@ -2328,7 +2331,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
           assertTrue(pr.getBucketKeys(bid).size() > 0);
         }
         Execution dataSet = FunctionService.onRegion(pr);
-        ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute(new FunctionAdapter() {
+        ResultCollector rc1 = dataSet.setArguments(Boolean.TRUE).execute(new FunctionAdapter() {
           @Override
           public void execute(FunctionContext context) {
             if (context.getArguments() instanceof String) {
@@ -2425,7 +2428,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
         Function function = new TestFunction(true, TestFunction.TEST_FUNCTION3);
         FunctionService.registerFunction(function);
         Execution dataSet = FunctionService.onRegion(pr);
-        ResultCollector rc1 = dataSet.withArgs(testKeys).execute(function.getId());
+        ResultCollector rc1 = dataSet.setArguments(testKeys).execute(function.getId());
 
         List l = ((List) rc1.getResult());
         assertEquals(4, l.size());
@@ -2824,7 +2827,7 @@ public class PRFunctionExecutionDUnitTest extends PartitionedRegionDUnitTestCase
     keysForGet.add("KEY_7");
     try {
       Execution execution =
-          FunctionService.onRegion(region).withFilter(keysForGet).withArgs(Boolean.TRUE);
+          FunctionService.onRegion(region).withFilter(keysForGet).setArguments(Boolean.TRUE);
       ResultCollector rc = execution.execute(new FunctionAdapter() {
         @Override
         public void execute(FunctionContext fc) {


Mime
View raw message