You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/04/25 17:52:22 UTC
[04/10] geode git commit: GEODE-236: Removed deprecated CacheEvent
methods
GEODE-236: Removed deprecated CacheEvent methods
Signed-off-by: adongre <ad...@apache.org>
GEODE-236: Spotless error fix.
This closes #463
Signed-off-by: adongre <ad...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b7b02e04
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b7b02e04
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b7b02e04
Branch: refs/heads/feature/GEODE-2632-6-1
Commit: b7b02e04b47a7b3b775ea9909a7029fc9f3eb1b4
Parents: 6415661
Author: adongre <ad...@apache.org>
Authored: Wed Apr 19 15:49:43 2017 +0530
Committer: adongre <ad...@apache.org>
Committed: Tue Apr 25 12:47:41 2017 +0530
----------------------------------------------------------------------
.../java/org/apache/geode/cache/CacheEvent.java | 22 ---
.../test/java/org/apache/geode/TXJUnitTest.java | 167 ++++++++++---------
.../geode/cache/CacheListenerJUnitTest.java | 4 +-
.../org/apache/geode/cache/ProxyJUnitTest.java | 4 +-
.../geode/cache30/CacheListenerTestCase.java | 4 +-
.../geode/cache30/MultiVMRegionTestCase.java | 2 +-
.../RegionMembershipListenerDUnitTest.java | 6 +-
7 files changed, 94 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/b7b02e04/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java b/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
index fc4cfc4..dffde6a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
@@ -90,26 +90,4 @@ public interface CacheEvent<K, V> {
*/
public DistributedMember getDistributedMember();
- /**
- * Answer true if this event resulted from expiration.
- *
- * @return true if this event resulted from expiration
- * @deprecated as of GemFire 5.0, use {@link Operation#isExpiration} instead.
- *
- */
- @Deprecated
- public boolean isExpiration();
-
- /**
- * Answers true if this event resulted from a distributed operation; false if a local operation.
- *
- * This is useful to distinguish between invalidate and localInvalidate, and destroy and
- * localDestroy.
- *
- * @return true if this event resulted from a distributed operation
- * @deprecated as of GemFire 5.0, use {@link Operation#isDistributed} instead.
- *
- */
- @Deprecated
- public boolean isDistributed();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/b7b02e04/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 54d9e50..49348bd 100644
--- a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
@@ -429,8 +429,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -497,8 +497,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
@@ -533,8 +533,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -569,8 +569,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
@@ -605,8 +605,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -642,9 +642,9 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
+ assertTrue(!ev.getOperation().isExpiration());
if (!isPR())
- assertTrue(!ev.isDistributed());
+ assertTrue(!ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -680,8 +680,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -717,9 +717,9 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
+ assertTrue(!ev.getOperation().isExpiration());
if (!isPR())
- assertTrue(!ev.isDistributed());
+ assertTrue(!ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -968,7 +968,7 @@ public class TXJUnitTest {
}
public void afterDestroy(EntryEvent e) {
- if (e.isDistributed()) {
+ if (e.getOperation().isDistributed()) {
++this.aDestroyCalls;
} else {
++this.aLocalDestroyCalls;
@@ -1100,8 +1100,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1145,8 +1145,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1216,8 +1216,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1271,8 +1271,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1406,8 +1406,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1451,8 +1451,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1504,8 +1504,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1550,8 +1550,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1595,8 +1595,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
@@ -1640,8 +1640,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(!ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(!ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1695,8 +1695,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1742,8 +1742,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(!ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(!ev.getOperation().isDistributed());
}
}
@@ -1787,8 +1787,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
@@ -1831,8 +1831,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(!ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(!ev.getOperation().isDistributed());
}
}
@@ -1903,8 +1903,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1949,8 +1949,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -1999,8 +1999,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2042,8 +2042,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
@@ -2085,8 +2085,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(!ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(!ev.getOperation().isDistributed());
}
}
@@ -2160,8 +2160,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2208,8 +2208,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2259,8 +2259,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2303,8 +2303,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
@@ -2346,8 +2346,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(!ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(!ev.getOperation().isDistributed());
}
}
@@ -2421,8 +2421,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2469,8 +2469,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2519,8 +2519,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
@@ -2567,8 +2567,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(!ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(!ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2612,8 +2612,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2657,8 +2657,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2702,8 +2702,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -2747,8 +2747,8 @@ public class TXJUnitTest {
assertEquals(null, ev.getCallbackArgument());
assertEquals(true, ev.isCallbackArgumentAvailable());
assertTrue(!ev.isOriginRemote());
- assertTrue(!ev.isExpiration());
- assertTrue(ev.isDistributed());
+ assertTrue(!ev.getOperation().isExpiration());
+ assertTrue(ev.getOperation().isDistributed());
}
}
reg1.localDestroy("key1");
@@ -3125,7 +3125,7 @@ public class TXJUnitTest {
this.passedValidation = false;
assertEquals("Expected Call Count Assertion!", this.expectedCallCount, cnt);
- assertTrue(!event.isExpiration());
+ assertTrue(!event.getOperation().isExpiration());
assertTrue(!event.isNetLoad());
assertEquals("isLoad Assertion!", this.isLoad(), event.isLoad());
assertEquals("isLocalLoad Assertion!", this.isLoad(), event.isLocalLoad());
@@ -3138,7 +3138,8 @@ public class TXJUnitTest {
// assertIndexDetailsEquals(event.getTransactionId(),
// event.getRegion().getCache().getCacheTransactionManager().getTransactionId(), );
if (!isPR())
- assertEquals("IsDistributed Assertion!", this.isDistributed(), event.isDistributed());
+ assertEquals("IsDistributed Assertion!", this.isDistributed(),
+ event.getOperation().isDistributed());
assertEquals(this.getKey(), event.getKey());
assertSame(this.getCallBackArg(), event.getCallbackArgument());
if (newValIdentCheck) {
http://git-wip-us.apache.org/repos/asf/geode/blob/b7b02e04/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
index 1fe6bb3..9353141 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
@@ -204,8 +204,8 @@ public class CacheListenerJUnitTest {
assertEquals(Operation.REGION_CREATE, e.getOperation());
assertEquals(false, ((RegionEvent) e).isReinitializing());
assertEquals(false, e.isOriginRemote());
- assertEquals(false, e.isExpiration());
- assertEquals(false, e.isDistributed());
+ assertEquals(false, e.getOperation().isExpiration());
+ assertEquals(false, e.getOperation().isDistributed());
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/b7b02e04/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 8cd68dc..4c118b3 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
@@ -144,8 +144,8 @@ public class ProxyJUnitTest {
assertEquals(getCallbackArgument(), other.getCallbackArgument());
assertEquals(isOriginRemote(), other.isOriginRemote());
assertEquals(getDistributedMember(), other.getDistributedMember());
- assertEquals(isExpiration(), other.isExpiration());
- assertEquals(isDistributed(), other.isDistributed());
+ assertEquals(isExpiration(), other.getOperation().isExpiration());
+ assertEquals(isDistributed(), other.getOperation().isDistributed());
}
public Region getRegion() {
http://git-wip-us.apache.org/repos/asf/geode/blob/b7b02e04/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 69cb0b5..03e8d24 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
@@ -348,7 +348,7 @@ public abstract class CacheListenerTestCase extends CacheLoaderTestCase {
assertEquals(name, event.getRegion().getName());
// this should be a distributed destroy unless the region
// is local scope
- assertFalse(event.isExpiration());
+ assertFalse(event.getOperation().isExpiration());
assertFalse(event.isOriginRemote());
this.destroyed = true;
@@ -403,7 +403,7 @@ public abstract class CacheListenerTestCase extends CacheLoaderTestCase {
public void afterRegionInvalidate2(RegionEvent event) {
assertEquals(name, event.getRegion().getName());
- assertFalse(event.isExpiration());
+ assertFalse(event.getOperation().isExpiration());
assertFalse(event.isOriginRemote());
this.invalidated = true;
http://git-wip-us.apache.org/repos/asf/geode/blob/b7b02e04/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
index e3fb897..ff996a2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
@@ -3650,7 +3650,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
@Override
public void afterDestroyBeforeAddEvent(EntryEvent event) {
- eventIsExpiration = event.isExpiration();
+ eventIsExpiration = event.getOperation().isExpiration();
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/b7b02e04/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
index 72ce6c6..9fda351 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
@@ -240,7 +240,7 @@ public class RegionMembershipListenerDUnitTest extends JUnit4CacheTestCase {
assertEquals(this.otherId, e.getDistributedMember());
assertEquals(Operation.REGION_CREATE, e.getOperation());
assertEquals(true, e.isOriginRemote());
- assertEquals(false, e.isDistributed());
+ assertEquals(false, e.getOperation().isDistributed());
assertEquals(this.r, e.getRegion());
// the test now uses a hook to get the member's DistributionAdvisor profile in the callback
// argument
@@ -253,7 +253,7 @@ public class RegionMembershipListenerDUnitTest extends JUnit4CacheTestCase {
assertEquals(this.otherId, e.getDistributedMember());
assertEquals(Operation.REGION_CREATE, e.getOperation());
assertEquals(true, e.isOriginRemote());
- assertEquals(false, e.isDistributed());
+ assertEquals(false, e.getOperation().isDistributed());
assertEquals(this.sr, e.getRegion());
// the test now uses a hook to get the member's DistributionAdvisor profile in the callback
// argument
@@ -300,7 +300,7 @@ public class RegionMembershipListenerDUnitTest extends JUnit4CacheTestCase {
assertEquals(em, e.getDistributedMember());
assertEquals(Operation.REGION_CLOSE, e.getOperation());
assertEquals(true, e.isOriginRemote());
- assertEquals(false, e.isDistributed());
+ assertEquals(false, e.getOperation().isDistributed());
assertEquals(er, e.getRegion());
assertEquals(null, e.getCallbackArgument());
}