GEODE-265 : Reverting removal deprecation of withArgs from Execution interface.
This closes #509 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3110bd04 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3110bd04 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3110bd04 Branch: refs/heads/develop Commit: 3110bd04c6d486e5d406eab9fed6f84cc4d5f790 Parents: 05b7364 Author: Deepak Dixit <deepakdixit2...@gmail.com> Authored: Thu May 11 20:12:16 2017 +0530 Committer: nabarun <n...@pivotal.io> Committed: Mon Jun 5 11:18:54 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/geode/cache/execute/Execution.java | 13 +++++++++++++ .../execute/DistributedRegionFunctionExecutor.java | 4 ++++ .../internal/cache/execute/MemberFunctionExecutor.java | 5 +++++ .../cache/execute/MultiRegionFunctionExecutor.java | 4 ++++ .../execute/PartitionedRegionFunctionExecutor.java | 4 ++++ .../internal/cache/execute/ServerFunctionExecutor.java | 4 ++++ .../cache/execute/ServerRegionFunctionExecutor.java | 4 ++++ .../cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 4 ++-- 8 files changed, 40 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/3110bd04/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 94beb0a..5b97da9 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java +++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java @@ -66,6 +66,19 @@ public interface Execution<IN, OUT, AGG> { public Execution<IN, OUT, AGG> setArguments(IN args); /** + * Specifies the user data passed to the function when it is executed. The function can retrieve + * these arguments using {@link FunctionContext#getArguments()} + * + * @param args user data passed to the function execution + * @return an Execution with args + * @throws IllegalArgumentException if the input parameter is null + * @since GemFire 6.0 + * @deprecated use {@link #setArguments(Object)} instead + * + */ + public Execution<IN, OUT, AGG> withArgs(IN args); + + /** * Specifies the {@link ResultCollector} that will receive the results after the function has been * executed. Collector will receive results as they are sent from the * {@link Function#execute(FunctionContext)} using {@link ResultSender}. http://git-wip-us.apache.org/repos/asf/geode/blob/3110bd04/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 f065700..aa10f60 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 @@ -250,6 +250,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/3110bd04/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 0961bd0..ab6794b 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 @@ -213,6 +213,11 @@ public class MemberFunctionExecutor extends AbstractExecution { } // Changing the object!! + public Execution withArgs(Object args) { + return setArguments(args); + } + + // Changing the object!! public Execution withCollector(ResultCollector rs) { if (rs == null) { throw new IllegalArgumentException( http://git-wip-us.apache.org/repos/asf/geode/blob/3110bd04/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 c27649a..27542f5 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 @@ -148,6 +148,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/3110bd04/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 c6d8b62..6e13ebc 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 @@ -282,6 +282,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/3110bd04/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 781f3b9..1e692cf 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 @@ -260,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/3110bd04/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 cb3eebc..7779678 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 @@ -317,6 +317,10 @@ public class ServerRegionFunctionExecutor extends AbstractExecution { return new ServerRegionFunctionExecutor(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/3110bd04/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java index 043bdb1..beb3a9a 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java @@ -1161,7 +1161,7 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { DistributedMember... members) { Set<DistributedMember> membersSet = new HashSet<>(); Collections.addAll(membersSet, members); - Execution execution = FunctionService.onMembers(membersSet); + Execution execution = FunctionService.onMembers(membersSet).withArgs(dsClassName); ResultCollector rc = execution.execute(functionId); List result = (List) rc.getResult(); assertEquals(membersSet.size(), result.size()); @@ -1914,10 +1914,10 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { } public static class GetDataSerializableFunction implements Function { - String dsClassName = "org.apache.geode.management.internal.configuration.domain.XmlEntity"; @Override public void execute(FunctionContext context) { + String dsClassName = (String) context.getArguments(); try { Class aClass = Thread.currentThread().getContextClassLoader().loadClass(dsClassName); Constructor constructor = aClass.getConstructor(new Class[0]);