Repository: geode Updated Branches: refs/heads/develop dc198bd3d -> 0c5011ec7
GEODE-237: Removed deprecated API from EntryEvent This closes #496 Signed-off-by: adongre <adon...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/0c5011ec Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/0c5011ec Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/0c5011ec Branch: refs/heads/develop Commit: 0c5011ec7f6adb7ecbf0f6aac5f01d52c810f3a6 Parents: dc198bd Author: adongre <adon...@apache.org> Authored: Sat May 6 14:13:13 2017 +0530 Committer: adongre <adon...@apache.org> Committed: Fri May 12 07:04:36 2017 +0530 ---------------------------------------------------------------------- .../geode/cache/DynamicRegionFactory.java | 2 +- .../java/org/apache/geode/cache/EntryEvent.java | 57 ----- .../test/java/org/apache/geode/TXJUnitTest.java | 216 +++++-------------- .../org/apache/geode/cache/ProxyJUnitTest.java | 8 +- .../geode/cache30/CacheListenerTestCase.java | 33 ++- .../geode/cache30/CacheLoaderTestCase.java | 32 +-- 6 files changed, 85 insertions(+), 263 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/0c5011ec/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java index 57a1a46..c65e223 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java +++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java @@ -826,7 +826,7 @@ public abstract class DynamicRegionFactory { // Ignore the callback if it originated in this process (because the region // will already have been created) and the event is not a client event - if (!event.isOriginRemote() && !event.isBridgeEvent()) + if (!event.isOriginRemote() && !event.hasClientOrigin()) return; // DynamicRegionAttributes dra = (DynamicRegionAttributes) event.getNewValue(); http://git-wip-us.apache.org/repos/asf/geode/blob/0c5011ec/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java b/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java index 10f0916..88c292d 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java +++ b/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java @@ -90,53 +90,6 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> { */ public SerializedCacheValue<V> getSerializedNewValue(); - // Flag query methods - - /** - * Returns true if this event resulted from a loader running in this cache. Note that this will be - * true even if the local loader called <code>netSearch</code>. - * - * If this event is for a Partitioned Region, then true will be returned if the loader ran in the - * same VM as where the data is hosted. If true is returned, and {@link CacheEvent#isOriginRemote} - * is true, it means the data is not hosted locally, but the loader was run local to the data. - * - * @return true if this event resulted from local loader execution - * @deprecated as of GemFire 5.0, use {@link Operation#isLocalLoad} instead. - */ - @Deprecated - public boolean isLocalLoad(); - - /** - * Returns true if this event resulted from a loader running that was remote from the cache that - * requested it, i.e., a netLoad. Note that the cache that requested the netLoad may not be this - * cache in which case <code>isOriginRemote</code> will also return true. - * - * @return true if this event resulted from a netLoad - * @deprecated as of GemFire 5.0, use {@link Operation#isNetLoad} instead. - */ - @Deprecated - public boolean isNetLoad(); - - /** - * Returns true if this event resulted from a loader. - * - * @return true if isLocalLoad or isNetLoad - * @deprecated as of GemFire 5.0, use {@link Operation#isLoad} instead. - */ - @Deprecated - public boolean isLoad(); - - /** - * Returns true if this event resulted from a <code>netSearch</code>. If the - * <code>netSearch</code> was invoked by a loader however, this will return false and - * <code>isLocalLoad()</code> or <code>isNetLoad()</code> will return true instead. - * - * @return true if this event resulted from a netSearch - * @deprecated as of GemFire 5.0, use {@link Operation#isNetSearch} instead. - */ - @Deprecated - public boolean isNetSearch(); - /** * Gets the TransactionId for this EntryEvent. * @@ -149,16 +102,6 @@ public interface EntryEvent<K, V> extends CacheEvent<K, V> { /** * Returns true if this event originated on a client. * - * @since GemFire 5.1 - * @return true if this event originated on a client. - * @deprecated as of 5.7 use {@link #hasClientOrigin} instead. - */ - @Deprecated - public boolean isBridgeEvent(); - - /** - * Returns true if this event originated on a client. - * * @since GemFire 5.7 * @return true if this event originated on a client. */ http://git-wip-us.apache.org/repos/asf/geode/blob/0c5011ec/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java index 6ecb8ca..5a72cf9 100644 --- a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java @@ -485,10 +485,7 @@ public class TXJUnitTest { assertEquals("value2", ev.getNewValue()); } assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -555,10 +552,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value1", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -590,10 +584,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value1", ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -625,10 +616,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value0", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -660,10 +648,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -696,10 +681,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -733,10 +715,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -769,10 +748,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1179,10 +1155,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value2", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1223,10 +1196,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1292,10 +1262,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1346,10 +1313,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value2", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1477,10 +1441,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value3", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1521,10 +1482,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value3", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1573,10 +1531,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value3", ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1618,10 +1573,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1662,10 +1614,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1706,10 +1655,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1760,10 +1706,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value2", ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1806,10 +1749,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1850,10 +1790,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1893,10 +1830,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -1964,10 +1898,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value3", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2009,10 +1940,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value3", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2058,10 +1986,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value2", ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2100,10 +2025,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2142,10 +2064,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2216,10 +2135,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value3", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2263,10 +2179,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value3", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2313,10 +2226,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value2", ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2356,10 +2266,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2398,10 +2305,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals(null, ev.getNewValue()); assertEquals("value0", ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2472,10 +2376,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value3", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2519,10 +2420,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value3", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2568,10 +2466,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertNull(ev.getNewValue()); assertNull(ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2615,10 +2510,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertNull(ev.getNewValue()); assertNull(ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2659,10 +2551,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value1", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2703,10 +2592,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value1", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2747,10 +2633,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value1", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -2791,10 +2674,7 @@ public class TXJUnitTest { assertEquals("key1", ev.getKey()); assertEquals("value1", ev.getNewValue()); assertEquals(null, ev.getOldValue()); - assertTrue(!ev.isLocalLoad()); - assertTrue(!ev.isNetLoad()); - assertTrue(!ev.isLoad()); - assertTrue(!ev.isNetSearch()); + verifyEventProps(ev); assertEquals(null, ev.getCallbackArgument()); assertEquals(true, ev.isCallbackArgumentAvailable()); assertTrue(!ev.isOriginRemote()); @@ -3197,10 +3077,10 @@ public class TXJUnitTest { assertEquals("Expected Call Count Assertion!", this.expectedCallCount, cnt); assertTrue(!event.getOperation().isExpiration()); - assertTrue(!event.isNetLoad()); - assertEquals("isLoad Assertion!", this.isLoad(), event.isLoad()); - assertEquals("isLocalLoad Assertion!", this.isLoad(), event.isLocalLoad()); - assertTrue(!event.isNetSearch()); + assertTrue(!event.getOperation().isNetLoad()); + assertEquals("isLoad Assertion!", this.isLoad(), event.getOperation().isLoad()); + assertEquals("isLocalLoad Assertion!", this.isLoad(), event.getOperation().isLocalLoad()); + assertTrue(!event.getOperation().isNetSearch()); assertTrue(!event.isOriginRemote()); assertNotNull(event.getRegion()); assertNotNull(event.getRegion().getCache()); @@ -7166,4 +7046,12 @@ public class TXJUnitTest { } } } + + private void verifyEventProps(EntryEvent ev) { + assertTrue(!ev.getOperation().isLocalLoad()); + assertTrue(!ev.getOperation().isNetLoad()); + assertTrue(!ev.getOperation().isLoad()); + assertTrue(!ev.getOperation().isNetSearch()); + } + } http://git-wip-us.apache.org/repos/asf/geode/blob/0c5011ec/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java index 29a5e2f..695bdc2 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java @@ -189,10 +189,10 @@ public class ProxyJUnitTest { assertEquals(getKey(), other.getKey()); assertEquals(getOldValue(), other.getOldValue()); assertEquals(getNewValue(), other.getNewValue()); - assertEquals(isLocalLoad(), other.isLocalLoad()); - assertEquals(isNetLoad(), other.isNetLoad()); - assertEquals(isLoad(), other.isLoad()); - assertEquals(isNetSearch(), other.isNetSearch()); + assertEquals(isLocalLoad(), other.getOperation().isLocalLoad()); + assertEquals(isNetLoad(), other.getOperation().isNetLoad()); + assertEquals(isLoad(), other.getOperation().isLoad()); + assertEquals(isNetSearch(), other.getOperation().isNetSearch()); assertEquals(getTransactionId(), other.getTransactionId()); } http://git-wip-us.apache.org/repos/asf/geode/blob/0c5011ec/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java index 03e8d24..27057d9 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java @@ -67,10 +67,7 @@ public abstract class CacheListenerTestCase extends CacheLoaderTestCase { assertEquals(key, event.getKey()); assertEquals(value, event.getNewValue()); assertNull(event.getOldValue()); - assertFalse(event.isLoad()); - assertFalse(event.isLocalLoad()); - assertFalse(event.isNetLoad()); - assertFalse(event.isNetSearch()); + verifyEventProps(event); } public void afterDestroy2(EntryEvent event) { @@ -128,10 +125,7 @@ public abstract class CacheListenerTestCase extends CacheLoaderTestCase { assertEquals(key, event.getKey()); assertEquals(newValue, event.getNewValue()); assertEquals(oldValue, event.getOldValue()); - assertFalse(event.isLoad()); - assertFalse(event.isLocalLoad()); - assertFalse(event.isNetLoad()); - assertFalse(event.isNetSearch()); + verifyEventProps(event); } }; @@ -189,10 +183,7 @@ public abstract class CacheListenerTestCase extends CacheLoaderTestCase { assertEquals(key, event.getKey()); assertEquals(value, event.getOldValue()); assertNull(event.getNewValue()); - assertFalse(event.isLoad()); - assertFalse(event.isLocalLoad()); - assertFalse(event.isNetLoad()); - assertFalse(event.isNetSearch()); + verifyEventProps(event); } }; @@ -231,10 +222,7 @@ public abstract class CacheListenerTestCase extends CacheLoaderTestCase { assertEquals(key, event.getKey()); assertEquals(value, event.getOldValue()); assertNull(event.getNewValue()); - assertFalse(event.isLoad()); - assertFalse(event.isLocalLoad()); - assertFalse(event.isNetLoad()); - assertFalse(event.isNetSearch()); + verifyEventProps(event); } }; @@ -284,10 +272,7 @@ public abstract class CacheListenerTestCase extends CacheLoaderTestCase { assertNull(event.getOldValue()); } assertNull(event.getNewValue()); - assertFalse(event.isLoad()); - assertFalse(event.isLocalLoad()); - assertFalse(event.isNetLoad()); - assertFalse(event.isNetSearch()); + verifyEventProps(event); } }; @@ -315,7 +300,6 @@ public abstract class CacheListenerTestCase extends CacheLoaderTestCase { } } - /** * Tests that the <code>CacheListener</code> is called after a region is destroyed. * @@ -422,4 +406,11 @@ public abstract class CacheListenerTestCase extends CacheLoaderTestCase { assertEquals(0, region.values().size()); } + private void verifyEventProps(EntryEvent event) { + assertFalse(event.getOperation().isLoad()); + assertFalse(event.getOperation().isLocalLoad()); + assertFalse(event.getOperation().isNetLoad()); + assertFalse(event.getOperation().isNetSearch()); + } + } http://git-wip-us.apache.org/repos/asf/geode/blob/0c5011ec/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java index 6822c89..e596b95 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java @@ -225,10 +225,10 @@ public abstract class CacheLoaderTestCase extends CacheWriterTestCase { public void beforeCreate2(EntryEvent event) throws CacheWriterException { assertEquals(oldValue, event.getNewValue()); - assertTrue(event.isLoad()); - assertTrue(event.isLocalLoad()); - assertFalse(event.isNetLoad()); - assertFalse(event.isNetSearch()); + assertTrue(event.getOperation().isLoad()); + assertTrue(event.getOperation().isLocalLoad()); + assertFalse(event.getOperation().isNetLoad()); + assertFalse(event.getOperation().isNetSearch()); } }; @@ -247,10 +247,10 @@ public abstract class CacheLoaderTestCase extends CacheWriterTestCase { assertEquals(oldValue, event.getOldValue()); assertEquals(newValue, event.getNewValue()); - assertFalse(event.isLoad()); - assertFalse(event.isLocalLoad()); - assertFalse(event.isNetLoad()); - assertFalse(event.isNetSearch()); + assertFalse(event.getOperation().isLoad()); + assertFalse(event.getOperation().isLocalLoad()); + assertFalse(event.getOperation().isNetLoad()); + assertFalse(event.getOperation().isNetSearch()); } }; @@ -281,10 +281,10 @@ public abstract class CacheLoaderTestCase extends CacheWriterTestCase { TestCacheListener listener = new TestCacheListener() { public void afterCreate2(EntryEvent event) { assertEquals(oldValue, event.getNewValue()); - assertTrue(event.isLoad()); - assertTrue(event.isLocalLoad()); - assertFalse(event.isNetLoad()); - assertFalse(event.isNetSearch()); + assertTrue(event.getOperation().isLoad()); + assertTrue(event.getOperation().isLocalLoad()); + assertFalse(event.getOperation().isNetLoad()); + assertFalse(event.getOperation().isNetSearch()); } }; @@ -303,10 +303,10 @@ public abstract class CacheLoaderTestCase extends CacheWriterTestCase { public void afterUpdate2(EntryEvent event) { assertEquals(oldValue, event.getOldValue()); assertEquals(newValue, event.getNewValue()); - assertFalse(event.isLoad()); - assertFalse(event.isLocalLoad()); - assertFalse(event.isNetLoad()); - assertFalse(event.isNetSearch()); + assertFalse(event.getOperation().isLoad()); + assertFalse(event.getOperation().isLocalLoad()); + assertFalse(event.getOperation().isNetLoad()); + assertFalse(event.getOperation().isNetSearch()); } };
