GEODE-728: Rename Execution.withArgs to Execution.setArguments * created setArguments * deprecated withArgs * implemented setArguments of all Execution implementations in Geode project * replaced all of withArgs with setArguments
This closes #457 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3261319c Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3261319c Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3261319c Branch: refs/heads/feature/GEODE-2681 Commit: 3261319c6eccdc25b0d5b42ae56b30d634590e9a Parents: ed3847a Author: Alyssa Kim <[email protected]> Authored: Sat Apr 15 17:48:00 2017 -0700 Committer: Ken Howe <[email protected]> Committed: Thu Apr 20 15:13:17 2017 -0700 ---------------------------------------------------------------------- .../common/ClientServerSessionCache.java | 2 +- .../catalina/ClientServerSessionCache.java | 4 +- .../catalina/PeerToPeerSessionCache.java | 2 +- .../apache/geode/cache/execute/Execution.java | 13 +++ .../geode/cache/execute/FunctionContext.java | 2 +- .../geode/cache/execute/ResultCollector.java | 2 +- .../org/apache/geode/cache/execute/package.html | 6 +- .../geode/internal/cache/PartitionedRegion.java | 12 +-- .../DistributedRegionFunctionExecutor.java | 9 +- .../cache/execute/FunctionContextImpl.java | 2 +- .../cache/execute/MemberFunctionExecutor.java | 13 ++- .../execute/MultiRegionFunctionExecutor.java | 7 +- .../PartitionedRegionFunctionExecutor.java | 7 +- .../cache/execute/ServerFunctionExecutor.java | 7 +- .../execute/ServerRegionFunctionExecutor.java | 11 +- .../internal/cache/snapshot/ClientExporter.java | 2 +- .../snapshot/RegionSnapshotServiceImpl.java | 2 +- .../cache/snapshot/WindowedExporter.java | 4 +- .../tier/sockets/command/ExecuteFunction70.java | 2 +- .../internal/MBeanProxyInvocationHandler.java | 2 +- .../internal/beans/QueryDataFunction.java | 8 +- .../geode/management/internal/cli/CliUtil.java | 4 +- .../internal/cli/commands/DataCommands.java | 5 +- .../cli/commands/DiskStoreCommands.java | 2 +- .../internal/cli/commands/FunctionCommands.java | 6 +- .../cli/commands/MiscellaneousCommands.java | 2 +- .../cli/functions/UserFunctionExecution.java | 2 +- .../management/MemoryThresholdsDUnitTest.java | 6 +- .../QueryUsingFunctionContextDUnitTest.java | 12 +-- ...artitionedRegionEquiJoinIntegrationTest.java | 4 +- .../PRColocatedEquiJoinDUnitTest.java | 4 +- .../query/partitioned/PRQueryDUnitHelper.java | 23 +++-- .../cache/ClientServerTransactionDUnitTest.java | 38 +++---- .../geode/internal/cache/CommitFunction.java | 5 +- ...eAndForgetFunctionOnAllServersDUnitTest.java | 6 +- .../cache/NestedTransactionFunction.java | 2 +- .../geode/internal/cache/RollbackFunction.java | 5 +- .../cache/execute/Bug51193DUnitTest.java | 6 +- .../ClientServerFunctionExecutionDUnitTest.java | 14 +-- ...ributedRegionFunctionExecutionDUnitTest.java | 20 ++-- .../FunctionExecution_ExceptionDUnitTest.java | 26 ++--- .../execute/FunctionServiceStatsDUnitTest.java | 26 ++--- .../LocalFunctionExecutionDUnitTest.java | 4 +- .../MemberFunctionExecutionDUnitTest.java | 8 +- .../OnGroupsFunctionExecutionDUnitTest.java | 38 +++---- ...ntServerFunctionExecutionNoAckDUnitTest.java | 6 +- ...tServerRegionFunctionExecutionDUnitTest.java | 71 ++++++------- ...egionFunctionExecutionFailoverDUnitTest.java | 2 +- ...onFunctionExecutionNoSingleHopDUnitTest.java | 57 ++++++----- ...onExecutionSelectorNoSingleHopDUnitTest.java | 57 ++++++----- ...gionFunctionExecutionSingleHopDUnitTest.java | 63 ++++++------ .../execute/PRFunctionExecutionDUnitTest.java | 101 ++++++++++--------- .../PRFunctionExecutionTimeOutDUnitTest.java | 52 +++++----- ...ctionExecutionWithResultSenderDUnitTest.java | 32 +++--- .../cache/execute/PRTransactionDUnitTest.java | 20 ++-- .../partitioned/PartitionResolverDUnitTest.java | 2 +- .../commands/DiskStoreCommandsJUnitTest.java | 8 +- .../ClientExecuteFunctionAuthDUnitTest.java | 8 +- ...lientExecuteRegionFunctionAuthDUnitTest.java | 7 +- .../function_execution.html.md.erb | 6 +- .../join_query_partitioned_regions.html.md.erb | 4 +- ...tioned_region_key_or_field_value.html.md.erb | 2 +- .../query_on_a_single_node.html.md.erb | 2 +- .../LuceneIndexForPartitionedRegion.java | 2 +- .../cache/lucene/internal/LuceneQueryImpl.java | 2 +- .../lucene/internal/LuceneServiceImpl.java | 2 +- .../internal/LuceneQueryImplJUnitTest.java | 4 +- .../internal/DefaultGeodeConnection.scala | 4 +- ...tewaySenderDistributedDeadlockDUnitTest.java | 2 +- .../controllers/FunctionAccessController.java | 4 +- 70 files changed, 482 insertions(+), 425 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java index a1ed5e7..51a2a6e 100644 --- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java +++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java @@ -132,7 +132,7 @@ public class ClientServerSessionCache extends AbstractSessionCache { RegionConfiguration configuration = createRegionConfiguration(); // Send it to the server tier - Execution execution = FunctionService.onServer(this.cache).withArgs(configuration); + Execution execution = FunctionService.onServer(this.cache).setArguments(configuration); ResultCollector collector = execution.execute(CreateRegionFunction.ID); // Verify the region was successfully created on the servers http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/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 2d4a8cd..af2a2a3 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 @@ -109,7 +109,7 @@ public class ClientServerSessionCache extends AbstractSessionCache { } else { // Execute the member touch function on all the server(s) Execution execution = FunctionService.onServers(getCache()) - .withArgs(new Object[] {this.sessionRegion.getFullPath(), sessionIds}); + .setArguments(new Object[] {this.sessionRegion.getFullPath(), sessionIds}); try { ResultCollector collector = execution.execute(TouchReplicatedRegionEntriesFunction.ID, true, false, false); @@ -202,7 +202,7 @@ public class ClientServerSessionCache extends AbstractSessionCache { RegionConfiguration configuration = createRegionConfiguration(); // Send it to the server tier - Execution execution = FunctionService.onServer(this.cache).withArgs(configuration); + Execution execution = FunctionService.onServer(this.cache).setArguments(configuration); ResultCollector collector = execution.execute(CreateRegionFunction.ID); // Verify the region was successfully created on the servers http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/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 0e1097b..69d6ec0 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 @@ -91,7 +91,7 @@ public class PeerToPeerSessionCache extends AbstractSessionCache { } else { // Execute the member touch function on all the server(s) Execution execution = FunctionService.onMembers(getCache().getDistributedSystem()) - .withArgs(new Object[] {this.sessionRegion.getFullPath(), sessionIds}); + .setArguments(new Object[] {this.sessionRegion.getFullPath(), sessionIds}); collector = execution.execute(TouchReplicatedRegionEntriesFunction.ID, true, false, false); } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/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 c3fdb6e..90ee1ec 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 @@ -60,7 +60,20 @@ public interface Execution<IN, OUT, AGG> { * @param args user data passed to the function execution * @return an Execution with args * @throws IllegalArgumentException if the input parameter is null + * @since Geode 1.2 + * + */ + 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); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java index 392eea9..74f05c5 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java +++ b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionContext.java @@ -35,7 +35,7 @@ package org.apache.geode.cache.execute; public interface FunctionContext<T1> { /** * Returns the arguments provided to this function execution. These are the arguments specified by - * the caller using {@link Execution#withArgs(Object)} + * the caller using {@link Execution#setArguments(Object)} * * @return the arguments or null if there are no arguments * @since GemFire 6.0 http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java index 9c9bdeb..605d4f1 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java +++ b/geode-core/src/main/java/org/apache/geode/cache/execute/ResultCollector.java @@ -37,7 +37,7 @@ import org.apache.geode.distributed.DistributedMember; * Function multiGetFunction ; * Object args ; * ResultCollector rc = FunctionService.onRegion(region) - * .withArgs(args) + * .setArguments(args) * .withFilter(keySet) * .withCollector(new MyCustomResultCollector()) * .execute(multiGetFunction.getId()); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/cache/execute/package.html ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/package.html b/geode-core/src/main/java/org/apache/geode/cache/execute/package.html index ce3046e..f1565e2 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/execute/package.html +++ b/geode-core/src/main/java/org/apache/geode/cache/execute/package.html @@ -73,7 +73,7 @@ limitations under the License. Function multiGetFunction; Object args; ResultCollector rc = FunctionService.onRegion(region) - .withArgs(args) + .setArguments(args) .withFilter(keySet) .withCollector(new MyCustomResultCollector()) .execute(multiGetFunction.getId()); @@ -96,7 +96,7 @@ limitations under the License. Function multiGetFunction; Object args; ResultCollector rc = FunctionService.onRegions(s) - .withArgs(args) + .setArguments(args) .withCollector(new MyCustomResultCollector()) .execute(multiGetFunction.getId()); // Application can get the handle of all the regions at the node it is executing on. @@ -114,7 +114,7 @@ limitations under the License. Function memberSetupFunction; Object args; ResultCollector rc = FunctionService.onMembers(ds) - .withArgs(args) + .setArguments(args) .execute(memberSetupFunction.getId()); //Application can do something else here before retrieving the result Object functionResult = rc.getResult(); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java index 774ad0c..e15eb2a 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java @@ -3349,20 +3349,20 @@ public class PartitionedRegion extends LocalRegion switch (execution.getFilter().size()) { case 0: if (logger.isDebugEnabled()) { - logger.debug("Executing Function: {} withArgs={} on all buckets.", function.getId(), + logger.debug("Executing Function: {} setArguments={} on all buckets.", function.getId(), execution.getArguments()); } return executeOnAllBuckets(function, execution, rc, false); case 1: if (logger.isDebugEnabled()) { - logger.debug("Executing Function: {} withArgs={} on single node.", function.getId(), + logger.debug("Executing Function: {} setArguments={} on single node.", function.getId(), execution.getArguments()); } return executeOnSingleNode(function, execution, rc, false, executeOnBucketSet); default: if (logger.isDebugEnabled()) { - logger.debug("Executing Function: {} withArgs={} on multiple nodes.", function.getId(), - execution.getArguments()); + logger.debug("Executing Function: {} setArguments={} on multiple nodes.", + function.getId(), execution.getArguments()); } return executeOnMultipleNodes(function, execution, rc, false, executeOnBucketSet); } @@ -3578,7 +3578,7 @@ public class PartitionedRegion extends LocalRegion } if (logger.isDebugEnabled()) { - logger.debug("Executing Function: {} withArgs={} on {}", function.getId(), + logger.debug("Executing Function: {} setArguments={} on {}", function.getId(), execution.getArguments(), targetNode); } while (!execution.getFailedNodes().isEmpty()) { @@ -6447,7 +6447,7 @@ public class PartitionedRegion extends LocalRegion ResultCollector rc = null; try { - rc = FunctionService.onRegion(this).withArgs((Serializable) value) + rc = FunctionService.onRegion(this).setArguments((Serializable) value) .execute(PRContainsValueFunction.class.getName()); List<Boolean> results = ((List<Boolean>) rc.getResult()); for (Boolean r : results) { http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java index 8a4b571..dcadab0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java @@ -344,7 +344,10 @@ public class DistributedRegionFunctionExecutor extends AbstractExecution { return this.sender; } - public Execution withArgs(Object args) { + + + @Override + public Execution setArguments(Object args) { if (args == null) { throw new IllegalArgumentException( LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL @@ -353,6 +356,10 @@ public class DistributedRegionFunctionExecutor extends AbstractExecution { return new DistributedRegionFunctionExecutor(this, args); } + public Execution withArgs(Object args) { + return setArguments(args); + } + public Execution withCollector(ResultCollector rs) { if (rs == null) { throw new IllegalArgumentException( http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java index e2185c4..c616cbd 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java @@ -59,7 +59,7 @@ public class FunctionContextImpl implements FunctionContext { /** * Returns the arguments provided to this function execution. These are the arguments specified by - * caller using {@link Execution#withArgs(Object)} + * caller using {@link Execution#setArguments(Object)} * * @return the arguments or null if there are no arguments */ http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java index 6bb00fb..74034e4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java @@ -207,14 +207,19 @@ public class MemberFunctionExecutor extends AbstractExecution { } } - // Changing the object!! - public Execution withArgs(Object arguments) { - if (arguments == null) { + @Override + public Execution setArguments(Object args) { + if (args == null) { throw new IllegalArgumentException( LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString("args")); } - return new MemberFunctionExecutor(this, arguments); + return new MemberFunctionExecutor(this, args); + } + + // Changing the object!! + public Execution withArgs(Object args) { + return setArguments(args); } // Changing the object!! http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java index c4c3a1a..a3ae2c0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java @@ -142,7 +142,8 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { return this.sender; } - public Execution withArgs(Object args) { + @Override + public Execution setArguments(Object args) { if (args == null) { throw new IllegalArgumentException( LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL @@ -151,6 +152,10 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { return new MultiRegionFunctionExecutor(this, args); } + public Execution withArgs(Object args) { + return setArguments(args); + } + public Execution withCollector(ResultCollector rc) { if (rc == null) { throw new IllegalArgumentException( http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java index 6e0840a..c7a7d36 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java @@ -278,7 +278,8 @@ public class PartitionedRegionFunctionExecutor extends AbstractExecution { return this.sender; } - public Execution withArgs(Object args) { + @Override + public Execution setArguments(Object args) { if (args == null) { throw new FunctionException( LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL @@ -287,6 +288,10 @@ public class PartitionedRegionFunctionExecutor extends AbstractExecution { return new PartitionedRegionFunctionExecutor(this, args); } + public Execution withArgs(Object args) { + return setArguments(args); + } + public Execution withCollector(ResultCollector rs) { if (rs == null) { throw new FunctionException( http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java index a310fa5..d11358e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java @@ -250,7 +250,8 @@ public class ServerFunctionExecutor extends AbstractExecution { .toLocalizedString("buckets as filter")); } - public Execution withArgs(Object args) { + @Override + public Execution setArguments(Object args) { if (args == null) { throw new FunctionException( LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL @@ -259,6 +260,10 @@ public class ServerFunctionExecutor extends AbstractExecution { return new ServerFunctionExecutor(this, args); } + public Execution withArgs(Object args) { + return setArguments(args); + } + public Execution withCollector(ResultCollector rs) { if (rs == null) { throw new FunctionException( http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java index 1d18fed..6543daf 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java @@ -308,13 +308,18 @@ public class ServerRegionFunctionExecutor extends AbstractExecution { .append("]").toString(); } - public Execution withArgs(Object params) { - if (params == null) { + @Override + public Execution setArguments(Object args) { + if (args == null) { throw new FunctionException( LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL .toLocalizedString("args")); } - return new ServerRegionFunctionExecutor(this, params); + return new ServerRegionFunctionExecutor(this, args); + } + + public Execution withArgs(Object params) { + return setArguments(args); } public Execution withCollector(ResultCollector rs) { http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java index c18dcd5..95bde41 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/ClientExporter.java @@ -69,7 +69,7 @@ public class ClientExporter<K, V> implements Exporter<K, V> { : FunctionService.onServer(pool); ResultCollector<?, ?> rc = - exec.withArgs(args).withCollector(results).execute(new ProxyExportFunction<K, V>()); + exec.setArguments(args).withCollector(results).execute(new ProxyExportFunction<K, V>()); // Our custom result collector is writing the data, but this will // check for errors. http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java index bfdef05..73b8ba9 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java @@ -180,7 +180,7 @@ public class RegionSnapshotServiceImpl<K, V> implements RegionSnapshotService<K, private void snapshotInParallel(ParallelArgs<K, V> args, Function fn) throws IOException { try { - ResultCollector rc = FunctionService.onRegion(region).withArgs(args).execute(fn); + ResultCollector rc = FunctionService.onRegion(region).setArguments(args).execute(fn); List result = (List) rc.getResult(); for (Object obj : result) { if (obj instanceof Exception) { http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java index c515c7a..6ba94a3 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/WindowedExporter.java @@ -77,8 +77,8 @@ public class WindowedExporter<K, V> implements Exporter<K, V> { // to keep the reference to the ResultsCollector returned from execute(). // Normally discarding the reference can cause issues if GC causes the // weak ref in ProcessorKeeper21 to be collected!! - InternalExecution exec = (InternalExecution) FunctionService.onRegion(region).withArgs(args) - .withCollector(results); + InternalExecution exec = (InternalExecution) FunctionService.onRegion(region) + .setArguments(args).withCollector(results); // Ensure that our collector gets all exceptions so we can shut down the // queue properly. http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java index d1fc2ab..957b423 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java @@ -124,7 +124,7 @@ public class ExecuteFunction70 extends ExecuteFunction66 { } Execution execution = new MemberFunctionExecutor(ds, members, resultSender); if (args != null) { - execution = execution.withArgs(args); + execution = execution.setArguments(args); } if (ignoreFailedMembers) { if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java index 15ce122..e8f2521 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInvocationHandler.java @@ -281,7 +281,7 @@ public class MBeanProxyInvocationHandler implements InvocationHandler { List<Object> result = null; try { - ResultCollector rc = FunctionService.onMember(member).withArgs(functionArgs) + ResultCollector rc = FunctionService.onMember(member).setArguments(functionArgs) .execute(ManagementConstants.MGMT_FUNCTION_ID); result = (List<Object>) rc.getResult(); // Exceptions of ManagementFunctions http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java index 56064d0..efd7436 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java @@ -174,8 +174,8 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity results = selectResults; } } else { - rcollector = FunctionService.onRegion(cache.getRegion(regionName)).withArgs(queryString) - .execute(loclQueryFunc); + rcollector = FunctionService.onRegion(cache.getRegion(regionName)) + .setArguments(queryString).execute(loclQueryFunc); results = rcollector.getResult(); } } @@ -250,7 +250,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity try { if (members.size() == 1) { DistributedMember member = members.iterator().next(); - ResultCollector collector = FunctionService.onMember(member).withArgs(functionArgs) + ResultCollector collector = FunctionService.onMember(member).setArguments(functionArgs) .execute(ManagementConstants.QUERY_DATA_FUNCTION); List list = (List) collector.getResult(); Object object = null; @@ -280,7 +280,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity } } else { // More than 1 Member - ResultCollector coll = FunctionService.onMembers(members).withArgs(functionArgs) + ResultCollector coll = FunctionService.onMembers(members).setArguments(functionArgs) .execute(ManagementConstants.QUERY_DATA_FUNCTION); List list = (List) coll.getResult(); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java index ad3f3df..d125e53 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java @@ -614,7 +614,7 @@ public class CliUtil { Execution execution = null; if (args != null) { - execution = FunctionService.onMembers(targetMembers).withArgs(args); + execution = FunctionService.onMembers(targetMembers).setArguments(args); } else { execution = FunctionService.onMembers(targetMembers); } @@ -637,7 +637,7 @@ public class CliUtil { Execution execution = null; if (args != null) { - execution = FunctionService.onMember(targetMember).withArgs(args); + execution = FunctionService.onMember(targetMember).setArguments(args); } else { execution = FunctionService.onMember(targetMember); } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java index 484bbf2..6324b5c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java @@ -1198,7 +1198,8 @@ public class DataCommands implements CommandMarker { if (members.size() == 1) { DistributedMember member = members.iterator().next(); - ResultCollector collector = FunctionService.onMember(member).withArgs(request).execute(putfn); + ResultCollector collector = + FunctionService.onMember(member).setArguments(request).execute(putfn); List list = (List) collector.getResult(); Object object = list.get(0); if (object instanceof Throwable) { @@ -1213,7 +1214,7 @@ public class DataCommands implements CommandMarker { return result; } else { ResultCollector collector = - FunctionService.onMembers(members).withArgs(request).execute(putfn); + FunctionService.onMembers(members).setArguments(request).execute(putfn); List list = (List) collector.getResult(); DataCommandResult result = null; for (int i = 0; i < list.size(); i++) { http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java index 9116ba3..9ad2060 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java @@ -911,7 +911,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport { // MemberNotFoundException final ResultCollector<?, ?> resultCollector = - getMembersFunctionExecutor(Collections.singleton(member)).withArgs(diskStoreName) + getMembersFunctionExecutor(Collections.singleton(member)).setArguments(diskStoreName) .execute(new DescribeDiskStoreFunction()); final Object result = ((List<?>) resultCollector.getResult()).get(0); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java index c2fb88f..752ca2a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java @@ -257,7 +257,7 @@ public class FunctionCommands implements CommandMarker { execution = execution.withFilter(filters); } if (arguments != null && arguments.length > 0) { - execution = execution.withArgs(arguments); + execution = execution.setArguments(arguments); } try { @@ -389,7 +389,7 @@ public class FunctionCommands implements CommandMarker { } args[4] = onRegion; - Execution execution = FunctionService.onMember(member).withArgs(args); + Execution execution = FunctionService.onMember(member).setArguments(args); if (execution != null) { List<Object> results = (List<Object>) execution.execute(function).getResult(); if (results != null) { @@ -522,7 +522,7 @@ public class FunctionCommands implements CommandMarker { Object[] obj = new Object[1]; obj[0] = functionId; - Execution execution = FunctionService.onMembers(DsMembers).withArgs(obj); + Execution execution = FunctionService.onMembers(DsMembers).setArguments(obj); if (execution == null) { cache.getLogger().error("executeUnregister execution is null"); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java index 2a356d8..22981e7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java @@ -1951,7 +1951,7 @@ public class MiscellaneousCommands implements CommandMarker { TabularResultData resultTable = section.addTable("ChangeLogLevel"); resultTable = resultTable.setHeader("Summary"); - Execution execution = FunctionService.onMembers(dsMembers).withArgs(functionArgs); + Execution execution = FunctionService.onMembers(dsMembers).setArguments(functionArgs); if (execution == null) { return ResultBuilder.createUserErrorResult(CliStrings.CHANGE_LOGLEVEL__MSG__CANNOT_EXECUTE); } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java index 855a329..630c2bc 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecution.java @@ -92,7 +92,7 @@ public class UserFunctionExecution implements Function, InternalEntity { } if (functionArgs != null && functionArgs.length > 0) { - execution = execution.withArgs(functionArgs); + execution = execution.setArguments(functionArgs); } if (filters != null && filters.size() > 0) { execution = execution.withFilter(filters); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java index 118fb4b..5db1559 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java @@ -1126,7 +1126,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase { Execution e = FunctionService.onRegion(pr); try { getCache().getLoggerI18n().fine(addExpectedFunctionExString); - e.withFilter(s).withArgs((Serializable) s).execute(function); + e.withFilter(s).setArguments((Serializable) s).execute(function); getCache().getLoggerI18n().fine(removeExpectedFunctionExString); fail("expected LowMemoryExcception was not thrown"); } catch (LowMemoryException ex) { @@ -1140,7 +1140,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase { s.add(sickKey2); Execution e = FunctionService.onRegion(pr); try { - e.withFilter(s).withArgs((Serializable) s).execute(function); + e.withFilter(s).setArguments((Serializable) s).execute(function); fail("expected LowMemoryExcception was not thrown"); } catch (LowMemoryException ex) { // expected @@ -1152,7 +1152,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase { Set s = new HashSet(); s.add(healthyKey); Execution e = FunctionService.onRegion(pr); - e.withFilter(s).withArgs((Serializable) s).execute(function); + e.withFilter(s).setArguments((Serializable) s).execute(function); } if (sickKey1 != null && sickKey2 != null && healthyKey != null) { break; http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java index 638a94d..b5b7c74 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java @@ -198,7 +198,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase { rcollector = FunctionService.onRegion(CacheFactory.getAnyInstance().getRegion(repRegionName)) - .withArgs(queriesForRR[i]).execute(function); + .setArguments(queriesForRR[i]).execute(function); // Should not come here, an exception is expected from above function call. fail("Function call did not fail for query with function context"); @@ -438,7 +438,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase { rcollector = FunctionService .onRegion(CacheFactory.getAnyInstance().getRegion(PartitionedRegionName1)) - .withArgs(queries[i]).withFilter(filter).execute(function); + .setArguments(queries[i]).withFilter(filter).execute(function); // Should not come here, an exception is expected from above function call. fail("Function call did not fail for query with function context"); @@ -509,7 +509,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase { rcollector = FunctionService .onRegion(CacheFactory.getAnyInstance().getRegion(PartitionedRegionName1)) - .withArgs(queries[i]).withFilter(filter).execute(function); + .setArguments(queries[i]).withFilter(filter).execute(function); // Should not come here, an exception is expected from above function call. fail("Function call did not fail for query with function context"); @@ -930,10 +930,10 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase { // Filter can not be set as null if withFilter() is called. if (filter != null) { rcollector = FunctionService.onRegion(CacheFactory.getAnyInstance().getRegion(regionName)) - .withArgs(query).withFilter(filter).execute(func); + .setArguments(query).withFilter(filter).execute(func); } else { rcollector = FunctionService.onRegion(CacheFactory.getAnyInstance().getRegion(regionName)) - .withArgs(query).execute(func); + .setArguments(query).execute(func); } Object result = rcollector.getResult(); assertTrue(result instanceof ArrayList); @@ -968,7 +968,7 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase { // Filter can not be set as null if withFilter() is called. rcollector = FunctionService.onServer(ClientCacheFactory.getAnyInstance()) - .withArgs(new Object[] {query, filter}).execute(func); + .setArguments(new Object[] {query, filter}).execute(func); Object result = rcollector.getResult(); assertTrue(result instanceof ArrayList); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java index 227d6ce..579bbb2 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java @@ -82,8 +82,8 @@ public class PartitionedRegionEquiJoinIntegrationTest extends EquiJoinIntegratio @Override protected Object[] executeQueries(String[] queries) { - ResultCollector collector = - FunctionService.onRegion(region1).withArgs(queries).execute(equijoinTestFunction.getId()); + ResultCollector collector = FunctionService.onRegion(region1).setArguments(queries) + .execute(equijoinTestFunction.getId()); Object result = collector.getResult(); return (Object[]) ((ArrayList) result).get(0); } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java index 4f1f68e..ae8da22 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java @@ -343,7 +343,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Object funcResult = FunctionService .onRegion((getCache().getRegion(name) instanceof PartitionedRegion) ? getCache().getRegion(name) : getCache().getRegion(coloName)) - .withArgs("Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + .setArguments("Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + " * from /" + name + " r1, /" + coloName + " r2 where " + queries[j]) .execute(func).getResult(); @@ -1603,7 +1603,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase Object funcResult = FunctionService .onRegion((getCache().getRegion(name) instanceof PartitionedRegion) ? getCache().getRegion(name) : getCache().getRegion(coloName)) - .withArgs("Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + .setArguments("Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + " * from /" + name + " r1, /" + coloName + " r2 where " + queries[j]) .execute(func).getResult(); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java index 0f63df5..827f2a7 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java @@ -2024,8 +2024,9 @@ public class PRQueryDUnitHelper implements Serializable { Object funcResult = FunctionService .onRegion((getCache().getRegion(name) instanceof PartitionedRegion) ? getCache().getRegion(name) : getCache().getRegion(coloName)) - .withArgs("<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") - + " * from /" + name + " r1, /" + coloName + " r2 where " + queries[j]) + .setArguments( + "<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + + " * from /" + name + " r1, /" + coloName + " r2 where " + queries[j]) .execute(func).getResult(); r[j][0] = ((ArrayList) funcResult).get(0); @@ -2138,9 +2139,9 @@ public class PRQueryDUnitHelper implements Serializable { Object funcResult = FunctionService .onRegion((getCache().getRegion(name) instanceof PartitionedRegion) ? getCache().getRegion(name) : getCache().getRegion(coloName)) - .withArgs("<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") - + " * from /" + name + " r1, /" + coloName - + " r2, r2.positions.values pos2 where " + queries[j]) + .setArguments("<trace> Select " + + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + " * from /" + name + + " r1, /" + coloName + " r2, r2.positions.values pos2 where " + queries[j]) .execute(func).getResult(); r[j][0] = ((ArrayList) funcResult).get(0); @@ -2251,9 +2252,9 @@ public class PRQueryDUnitHelper implements Serializable { Object funcResult = FunctionService .onRegion((getCache().getRegion(name) instanceof PartitionedRegion) ? getCache().getRegion(name) : getCache().getRegion(coloName)) - .withArgs("<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") - + " * from /" + name + " r1, /" + coloName - + " r2, r2.positions.values pos2 where " + queries[j]) + .setArguments("<trace> Select " + + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + " * from /" + name + + " r1, /" + coloName + " r2, r2.positions.values pos2 where " + queries[j]) .execute(func).getResult(); r[j][0] = ((ArrayList) funcResult).get(0); @@ -2365,9 +2366,9 @@ public class PRQueryDUnitHelper implements Serializable { Object funcResult = FunctionService .onRegion((getCache().getRegion(name) instanceof PartitionedRegion) ? getCache().getRegion(name) : getCache().getRegion(coloName)) - .withArgs("<trace> Select " + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") - + " * from /" + name + " r1, r1.positions.values pos1, /" + coloName - + " r2 where " + queries[j]) + .setArguments("<trace> Select " + + (queries[j].contains("ORDER BY") ? "DISTINCT" : "") + " * from /" + name + + " r1, r1.positions.values pos1, /" + coloName + " r2 where " + queries[j]) .execute(func).getResult(); r[j][0] = ((ArrayList) funcResult).get(0); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java index 95c09b6..ec4e179 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java @@ -3000,19 +3000,19 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest args.add(new CustId(0)); args.add(new Customer("name0", "address0")); args.add(null); - List result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction()) - .getResult(); + List result = (List) FunctionService.onRegion(cust).setArguments(args) + .execute(new TXFunction()).getResult(); TransactionId txId = (TransactionId) result.get(0); assertNotNull(txId); args = new ArrayList(); args.add(new CustId(1)); args.add(new Customer("name1", "address1")); args.add(txId); - result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction()) + result = (List) FunctionService.onRegion(cust).setArguments(args).execute(new TXFunction()) .getResult(); TransactionId txId2 = (TransactionId) result.get(0); assertEquals(txId, txId2); - result = (List) FunctionService.onServer(getCache()).withArgs(txId) + result = (List) FunctionService.onServer(getCache()).setArguments(txId) .execute(new CommitFunction()).getResult(); Boolean b = (Boolean) result.get(0); assertEquals(Boolean.TRUE, b); @@ -3088,7 +3088,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest args.add(new CustId(0)); args.add(new Customer("name0", "address0")); args.add(null); - List result = (List) FunctionService.onRegion(cust).withArgs(args) + List result = (List) FunctionService.onRegion(cust).setArguments(args) .execute(new TXFunction()).getResult(); TransactionId txId = (TransactionId) result.get(0); assertNotNull(txId); @@ -3096,17 +3096,17 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest args.add(new CustId(1)); args.add(new Customer("name1", "address1")); args.add(txId); - result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction()) - .getResult(); + result = (List) FunctionService.onRegion(cust).setArguments(args) + .execute(new TXFunction()).getResult(); TransactionId txId2 = (TransactionId) result.get(0); assertEquals(txId, txId2); // invoke ClientCommitFunction try { if (commit) { - FunctionService.onServer(getCache()).withArgs(new CustId(0)) + FunctionService.onServer(getCache()).setArguments(new CustId(0)) .execute(new CommitFunction()).getResult(); } else { - FunctionService.onServer(getCache()).withArgs(new CustId(0)) + FunctionService.onServer(getCache()).setArguments(new CustId(0)) .execute(new RollbackFunction()).getResult(); } fail("expected exception not thrown"); @@ -3115,10 +3115,10 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest } List list = null; if (commit) { - list = (List) FunctionService.onServer(getCache()).withArgs(txId) + list = (List) FunctionService.onServer(getCache()).setArguments(txId) .execute(new CommitFunction()).getResult(); } else { - list = (List) FunctionService.onServer(getCache()).withArgs(txId) + list = (List) FunctionService.onServer(getCache()).setArguments(txId) .execute(new RollbackFunction()).getResult(); } assertEquals(Boolean.TRUE, list.get(0)); @@ -3179,22 +3179,22 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest args.add(new CustId(0)); args.add(new Customer("name0", "address0")); args.add(null); - List result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction()) - .getResult(); + List result = (List) FunctionService.onRegion(cust).setArguments(args) + .execute(new TXFunction()).getResult(); TransactionId txId = (TransactionId) result.get(0); assertNotNull(txId); args = new ArrayList(); args.add(new CustId(1)); args.add(new Customer("name1", "address1")); args.add(txId); - result = (List) FunctionService.onRegion(cust).withArgs(args).execute(new TXFunction()) + result = (List) FunctionService.onRegion(cust).setArguments(args).execute(new TXFunction()) .getResult(); TransactionId txId2 = (TransactionId) result.get(0); assertEquals(txId, txId2); // invoke ClientCommitFunction try { - FunctionService.onServer(getCache()).withArgs(new CustId(0)).execute(new CommitFunction()) - .getResult(); + FunctionService.onServer(getCache()).setArguments(new CustId(0)) + .execute(new CommitFunction()).getResult(); fail("expected exception not thrown"); } catch (FunctionException e) { assertTrue(e.getCause() instanceof ClassCastException); @@ -3216,10 +3216,10 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest try { List list = null; if (commit) { - list = (List) FunctionService.onServer(getCache()).withArgs(txId) + list = (List) FunctionService.onServer(getCache()).setArguments(txId) .execute(new CommitFunction()).getResult(); } else { - list = (List) FunctionService.onServer(getCache()).withArgs(txId) + list = (List) FunctionService.onServer(getCache()).setArguments(txId) .execute(new RollbackFunction()).getResult(); } fail("expected exception not thrown"); @@ -3281,7 +3281,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest accessor.invoke(new SerializableCallable() { public Object call() throws Exception { - Execution exe = FunctionService.onMember(((TXId) txId).getMemberId()).withArgs(txId); + Execution exe = FunctionService.onMember(((TXId) txId).getMemberId()).setArguments(txId); List list = null; if (commit) { list = (List) exe.execute(new CommitFunction()).getResult(); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java index 2db03db..c66901a 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CommitFunction.java @@ -79,7 +79,7 @@ public class CommitFunction implements Function { txId = (TXId) context.getArguments(); } catch (ClassCastException e) { logger.info( - "CommitFunction should be invoked with a TransactionId as an argument i.e. withArgs(txId).execute(function)"); + "CommitFunction should be invoked with a TransactionId as an argument i.e. setArguments(txId).execute(function)"); throw e; } DistributedMember member = txId.getMemberId(); @@ -101,7 +101,8 @@ public class CommitFunction implements Function { ArrayList args = new ArrayList(); args.add(txId); args.add(NestedTransactionFunction.COMMIT); - Execution ex = FunctionService.onMember(cache.getDistributedSystem(), member).withArgs(args); + Execution ex = + FunctionService.onMember(cache.getDistributedSystem(), member).setArguments(args); if (isDebugEnabled) { logger.debug( "CommitFunction: for transaction: {} executing NestedTransactionFunction on member: {}", http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java index 33e312d..c52ead8 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java @@ -100,7 +100,7 @@ public class FireAndForgetFunctionOnAllServersDUnitTest extends LocatorTestBase String regionName = "R1"; Execution dataSet = FunctionService.onServers(pool1); - dataSet.withArgs(regionName).execute(function); + dataSet.setArguments(regionName).execute(function); // Using Awatility, if the condition is not met during the timeout, a // ConditionTimeoutException will be thrown. This makes analyzing the failure much simpler @@ -119,7 +119,7 @@ public class FireAndForgetFunctionOnAllServersDUnitTest extends LocatorTestBase await().atMost(60, SECONDS) .until(() -> Assert.assertEquals(1, pool.getCurrentServers().size())); dataSet = FunctionService.onServers(pool1); - dataSet.withArgs(regionName).execute(function); + dataSet.setArguments(regionName).execute(function); await().atMost(60, SECONDS) .until(() -> Assert.assertEquals(2, pool.getCurrentServers().size())); @@ -140,7 +140,7 @@ public class FireAndForgetFunctionOnAllServersDUnitTest extends LocatorTestBase // Step 9. Execute the same function to put DistributedMemberID into above created replicated // region. dataSet = FunctionService.onServers(pool1); - dataSet.withArgs(regionName).execute(function); + dataSet.setArguments(regionName).execute(function); await().atMost(60, SECONDS) .until(() -> Assert.assertEquals(1, pool.getCurrentServers().size())); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java index 3762302..4a208d4 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NestedTransactionFunction.java @@ -67,7 +67,7 @@ public class NestedTransactionFunction implements Function { action = (Integer) args.get(1); } catch (ClassCastException e) { logger.info( - "CommitFunction should be invoked with a TransactionId as an argument i.e. withArgs(txId).execute(function)"); + "CommitFunction should be invoked with a TransactionId as an argument i.e. setArguments(txId).execute(function)"); throw e; } CacheTransactionManager txMgr = cache.getCacheTransactionManager(); http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java index 00dbd2f..8ec7d2d 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RollbackFunction.java @@ -78,7 +78,7 @@ public class RollbackFunction implements Function { txId = (TXId) context.getArguments(); } catch (ClassCastException e) { logger.info( - "RollbackFunction should be invoked with a TransactionId as an argument i.e. withArgs(txId).execute(function)"); + "RollbackFunction should be invoked with a TransactionId as an argument i.e. setArguments(txId).execute(function)"); throw e; } DistributedMember member = txId.getMemberId(); @@ -100,7 +100,8 @@ public class RollbackFunction implements Function { ArrayList args = new ArrayList(); args.add(txId); args.add(NestedTransactionFunction.ROLLBACK); - Execution ex = FunctionService.onMember(cache.getDistributedSystem(), member).withArgs(args); + Execution ex = + FunctionService.onMember(cache.getDistributedSystem(), member).setArguments(args); if (isDebugEnabled) { logger.debug( "RollbackFunction: for transaction: {} executing NestedTransactionFunction on member: {}", http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java index a8c61ae..12b467c 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java @@ -145,11 +145,11 @@ public class Bug51193DUnitTest extends JUnit4DistributedTestCase { FunctionService.registerFunction(function); Execution dataSet = null; if ("region".equalsIgnoreCase(mode)) { - dataSet = FunctionService.onRegion(cache.getRegion(REGION_NAME)).withArgs(timeout); + dataSet = FunctionService.onRegion(cache.getRegion(REGION_NAME)).setArguments(timeout); } else if ("server".equalsIgnoreCase(mode)) { - dataSet = FunctionService.onServer(cache.getDefaultPool()).withArgs(timeout); + dataSet = FunctionService.onServer(cache.getDefaultPool()).setArguments(timeout); } else { - dataSet = FunctionService.onServers(cache).withArgs(timeout); + dataSet = FunctionService.onServers(cache).setArguments(timeout); } ResultCollector rs = dataSet.execute(function); assertTrue("Server did not read client_function_timeout from client.", http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java index 4d5dd7e..becc511 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java @@ -238,7 +238,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa DistributedSystem.setThreadsSocketPolicy(false); Execution member = FunctionService.onServers(pool); try { - ResultCollector rs = member.withArgs(Boolean.TRUE).execute(new FunctionAdapter() { + ResultCollector rs = member.setArguments(Boolean.TRUE).execute(new FunctionAdapter() { public void execute(FunctionContext context) { if (context.getArguments() instanceof String) { context.getResultSender().lastResult("Success"); @@ -465,7 +465,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa // remove any existing attributes ((AbstractExecution) member).removeFunctionAttributes(TestFunction.TEST_FUNCTION1); - ResultCollector rs = member.withArgs(Boolean.TRUE).execute(TestFunction.TEST_FUNCTION1); + ResultCollector rs = member.setArguments(Boolean.TRUE).execute(TestFunction.TEST_FUNCTION1); assertEquals(Boolean.TRUE, ((List) rs.getResult()).get(0)); byte[] functionAttributes = ((AbstractExecution) member).getFunctionAttributes(TestFunction.TEST_FUNCTION1); @@ -698,7 +698,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa Execution member = FunctionService.onServer(pool); try { - ResultCollector rs = member.withArgs(Boolean.TRUE).execute(new FunctionAdapter() { + ResultCollector rs = member.setArguments(Boolean.TRUE).execute(new FunctionAdapter() { public void execute(FunctionContext context) { if (context.getArguments() instanceof String) { context.getResultSender().lastResult("Success"); @@ -730,7 +730,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa Execution member = FunctionService.onServer(pool); try { - ResultCollector rs = member.withArgs(Boolean.TRUE).execute(new FunctionAdapter() { + ResultCollector rs = member.setArguments(Boolean.TRUE).execute(new FunctionAdapter() { public void execute(FunctionContext context) { if (context.getArguments() instanceof String) { context.getResultSender().lastResult("Success"); @@ -887,7 +887,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa DistributedSystem.setThreadsSocketPolicy(false); Execution member = FunctionService.onServers(pool); try { - ResultCollector rs = member.withArgs(Boolean.TRUE).execute(new FunctionAdapter() { + ResultCollector rs = member.setArguments(Boolean.TRUE).execute(new FunctionAdapter() { public void execute(FunctionContext context) { if (context.getArguments() instanceof String) { context.getResultSender().lastResult("Success"); @@ -920,11 +920,11 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa Boolean isByName) throws Exception { if (isByName.booleanValue()) {// by name 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 { // By Instance - return member.withArgs(args).execute(function); + return member.setArguments(args).execute(function); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/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 49d67d2..b00921d 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 @@ -960,7 +960,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut public static void executeInlineFunction() { - 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) { @@ -1067,12 +1067,12 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut for (int i = 100; i < 120; i++) { filter.add("execKey-" + i); } - ResultCollector rs = FunctionService.onRegion(region).withFilter(filter).withArgs(Boolean.TRUE) - .execute(function); + ResultCollector rs = FunctionService.onRegion(region).withFilter(filter) + .setArguments(Boolean.TRUE).execute(function); List list = (List) rs.getResult(); assertTrue(list.get(0) instanceof MyFunctionExecutionException); - rs = FunctionService.onRegion(region).withFilter(filter).withArgs((Serializable) filter) + rs = FunctionService.onRegion(region).withFilter(filter).setArguments((Serializable) filter) .execute(function); List resultList = (List) rs.getResult(); assertEquals((filter.size() + 1), resultList.size()); @@ -1115,7 +1115,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut public static void executeFunctionFunctionInvocationTargetException() { try { - ResultCollector rc1 = FunctionService.onRegion(region).withArgs(Boolean.TRUE) + ResultCollector rc1 = FunctionService.onRegion(region).setArguments(Boolean.TRUE) .execute("DistribuedRegionFunctionFunctionInvocationException"); List list = (ArrayList) rc1.getResult(); assertEquals(5, list.get(0)); @@ -1127,7 +1127,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut public static void executeFunctionFunctionInvocationTargetExceptionWithoutHA() { try { - ResultCollector rc1 = FunctionService.onRegion(region).withArgs(Boolean.TRUE) + ResultCollector rc1 = FunctionService.onRegion(region).setArguments(Boolean.TRUE) .execute("DistribuedRegionFunctionFunctionInvocationException", true, false); rc1.getResult(); fail("Function Invocation Target Exception should be thrown"); @@ -1141,7 +1141,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut public static void executeFunctionFunctionInvocationTargetException_ClientServer() { try { - List list = (ArrayList) FunctionService.onRegion(region).withArgs(Boolean.TRUE) + List list = (ArrayList) FunctionService.onRegion(region).setArguments(Boolean.TRUE) .execute("DistribuedRegionFunctionFunctionInvocationException").getResult(); assertEquals(1, list.size()); assertEquals(5, list.get(0)); @@ -1153,7 +1153,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut public static void executeFunctionFunctionInvocationTargetException_ClientServer_WithoutHA() { try { - FunctionService.onRegion(region).withArgs(Boolean.TRUE) + FunctionService.onRegion(region).setArguments(Boolean.TRUE) .execute("DistribuedRegionFunctionFunctionInvocationException", true, false).getResult(); fail("Function Invocation Target Exception should be thrown"); } catch (Exception e) { @@ -1185,8 +1185,8 @@ public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4Distribut } // dummy argument Boolean.TRUE indicates that cache should be closed // in the function body itself on the first try - List list = (List) FunctionService.onRegion(region).withFilter(filter).withArgs(Boolean.TRUE) - .execute(function).getResult(); + List list = (List) FunctionService.onRegion(region).withFilter(filter) + .setArguments(Boolean.TRUE).execute(function).getResult(); return list; } http://git-wip-us.apache.org/repos/asf/geode/blob/3261319c/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java index b5232a7..bdcbd07 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecution_ExceptionDUnitTest.java @@ -96,12 +96,12 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit pr.put(testKey, new Integer(1)); ResultCollector rs1 = null; - rs1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function); + rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function); ArrayList results = (ArrayList) rs1.getResult(); assertTrue(results.get(0) instanceof Exception); - rs1 = - dataSet.withFilter(testKeysSet).withArgs((Serializable) testKeysSet).execute(function); + rs1 = dataSet.withFilter(testKeysSet).setArguments((Serializable) testKeysSet) + .execute(function); results = (ArrayList) rs1.getResult(); assertEquals((testKeysSet.size() + 1), results.size()); Iterator resultIterator = results.iterator(); @@ -155,7 +155,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit pr.put(testKey, new Integer(1)); ResultCollector rs1 = null; - rs1 = dataSet.withFilter(testKeysSet).withArgs("Multiple").execute(function); + rs1 = dataSet.withFilter(testKeysSet).setArguments("Multiple").execute(function); ArrayList results = (ArrayList) rs1.getResult(); assertTrue(results.get(0) instanceof Exception); return Boolean.TRUE; @@ -200,7 +200,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit pr.put(testKey, new Integer(1)); ResultCollector rs1 = null; - rs1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function); + rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function); try { ArrayList results = (ArrayList) rs1.getResult(); fail("Expecting Exception"); @@ -261,13 +261,13 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit pr.put(testKey, new Integer(1)); ResultCollector rs1 = null; - // rs1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute( + // rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute( // function); // ArrayList results = (ArrayList)rs1.getResult(); // assertTrue(results.get(0) instanceof Exception); // - rs1 = - dataSet.withFilter(testKeysSet).withArgs((Serializable) testKeysSet).execute(function); + rs1 = dataSet.withFilter(testKeysSet).setArguments((Serializable) testKeysSet) + .execute(function); ArrayList results = (ArrayList) rs1.getResult(); assertEquals((testKeysSet.size() + 1), results.size()); Iterator resultIterator = results.iterator(); @@ -332,7 +332,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit pr.put(testKey, new Integer(1)); ResultCollector rs1 = null; - rs1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute(function); + rs1 = dataSet.withFilter(testKeysSet).setArguments(Boolean.TRUE).execute(function); try { ArrayList results = (ArrayList) rs1.getResult(); fail("Expecting Exception"); @@ -396,7 +396,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit pr.put(val, "MyValue_" + i); } ResultCollector rs1 = - dataSet.withFilter(origVals).withArgs((Serializable) origVals).execute(function); + dataSet.withFilter(origVals).setArguments((Serializable) origVals).execute(function); List results = (ArrayList) rs1.getResult(); assertEquals(((origVals.size() * 3) + 3), results.size()); Iterator resultIterator = results.iterator(); @@ -458,7 +458,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit } ResultCollector rc2 = null; ResultCollector rs1 = - dataSet.withFilter(origVals).withArgs((Serializable) origVals).execute(function); + dataSet.withFilter(origVals).setArguments((Serializable) origVals).execute(function); List results = (ArrayList) rs1.getResult(); assertEquals(((origVals.size() * 4) + 4), results.size()); Iterator resultIterator = results.iterator(); @@ -527,7 +527,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit pr.put(val, "MyValue_" + i); } ResultCollector rc2 = null; - rc2 = dataSet.withFilter(origVals).withArgs(origVals).execute(function.getId()); + rc2 = dataSet.withFilter(origVals).setArguments(origVals).execute(function.getId()); try { ArrayList results = (ArrayList) rc2.getResult(); fail("Expecting Exception"); @@ -585,7 +585,7 @@ public class FunctionExecution_ExceptionDUnitTest extends PartitionedRegionDUnit pr.put(val, "MyValue_" + i); } ResultCollector rc2 = null; - rc2 = dataSet.withFilter(origVals).withArgs(origVals).execute(function.getId()); + rc2 = dataSet.withFilter(origVals).setArguments(origVals).execute(function.getId()); try { ArrayList results = (ArrayList) rc2.getResult(); fail("Expecting Exception");
