GEODE-3091: remove empty method This closes #585
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/cf7274e6 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/cf7274e6 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/cf7274e6 Branch: refs/heads/feature/GEODE-2804 Commit: cf7274e6c38b156cdc9bbf433475807116150a93 Parents: b18571a Author: Nick Reich <nre...@pivotal.io> Authored: Thu Jun 15 15:59:50 2017 -0700 Committer: Hitesh Khamesra <hkhame...@pivotal.io> Committed: Mon Jun 19 16:39:30 2017 -0700 ---------------------------------------------------------------------- .../geode/internal/cache/DistributedRegion.java | 1 - .../org/apache/geode/internal/cache/LocalRegion.java | 15 --------------- .../geode/internal/cache/PartitionedRegion.java | 1 - 3 files changed, 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/cf7274e6/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java index 9df64d0..21f911d 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java @@ -935,7 +935,6 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA public void invalidate(Object key, Object aCallbackArgument) throws TimeoutException, EntryNotFoundException { validateKey(key); - validateCallbackArg(aCallbackArgument); checkReadiness(); checkForLimitedOrNoAccess(); Lock dlock = this.getDistributedLockIfGlobal(key); http://git-wip-us.apache.org/repos/asf/geode/blob/cf7274e6/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java index 2b45a54..02625ee 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java @@ -1120,7 +1120,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, @Retained EntryEventImpl newDestroyEntryEvent(Object key, Object aCallbackArgument) { validateKey(key); - validateCallbackArg(aCallbackArgument); checkReadiness(); checkForLimitedOrNoAccess(); @@ -1349,7 +1348,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, boolean retainResult) throws TimeoutException, CacheLoaderException { assert !retainResult || preferCD; validateKey(key); - validateCallbackArg(aCallbackArgument); checkReadiness(); checkForNoAccess(); discoverJTA(); @@ -1563,7 +1561,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, @Override public void invalidateRegion(Object aCallbackArgument) throws TimeoutException { getDataView().checkSupportsRegionInvalidate(); - validateCallbackArg(aCallbackArgument); checkReadiness(); checkForLimitedOrNoAccess(); RegionEventImpl event = new RegionEventImpl(this, Operation.REGION_INVALIDATE, @@ -3118,8 +3115,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, protected void validateArguments(Object key, Object value, Object aCallbackArgument) { validateKey(key); validateValue(value); - validateCallbackArg(aCallbackArgument); - } void validateKey(Object key) { @@ -3142,15 +3137,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, } /** - * Starting in 3.5, we don't check to see if the callback argument is {@code Serializable}. We - * instead rely on the actual serialization (which happens in-thread with the put) to tell us if - * there are any problems. TODO: delete method validateCallbackArg - */ - void validateCallbackArg(Object aCallbackArgument) { - // do nothing - } - - /** * @since GemFire 5.0.2 */ private final boolean doExpensiveValidations = @@ -11633,7 +11619,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, public boolean remove(Object key, Object value, Object callbackArg) { checkIfConcurrentMapOpsAllowed(); validateKey(key); - validateCallbackArg(callbackArg); checkReadiness(); checkForLimitedOrNoAccess(); http://git-wip-us.apache.org/repos/asf/geode/blob/cf7274e6/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 288f4a9..cf3ca76 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 @@ -3082,7 +3082,6 @@ public class PartitionedRegion extends LocalRegion EntryEventImpl clientEvent, boolean returnTombstones) throws TimeoutException, CacheLoaderException { validateKey(key); - validateCallbackArg(aCallbackArgument); checkReadiness(); checkForNoAccess(); discoverJTA();