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 2019/02/01 17:43:30 UTC
[geode] branch develop updated: GEODE-6339: Revert TransactionEvent
Generification
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 657458c GEODE-6339: Revert TransactionEvent Generification
657458c is described below
commit 657458c6078aa874bff0e969b8d59663f60744c4
Author: Dale Emery <de...@pivotal.io>
AuthorDate: Thu Jan 31 12:04:01 2019 -0800
GEODE-6339: Revert TransactionEvent Generification
---
.../internal/cache/RemoteTransactionDUnitTest.java | 8 +-
.../java/org/apache/geode/TXJUnitTest.java | 80 +++++------
.../org/apache/geode/cache/TransactionEvent.java | 4 +-
.../apache/geode/cache/TransactionListener.java | 8 +-
.../cache/RemoteCQTransactionDUnitTest.java | 3 +-
.../geode/cache30/MultiVMRegionTestCase.java | 158 ++++++++++-----------
.../apache/geode/cache/util/TxEventTestUtil.java | 22 +--
7 files changed, 141 insertions(+), 142 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
index f8ee048..74bda5d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
@@ -1774,8 +1774,8 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
protected boolean isAccessor;
protected Exception ex = null;
- protected void verify(TransactionEvent<Object, Object> txEvent) {
- for (CacheEvent<Object, Object> e : txEvent.getEvents()) {
+ protected void verify(TransactionEvent txEvent) {
+ for (CacheEvent<?, ?> e : txEvent.getEvents()) {
verifyOrigin(e);
verifyPutAll(e);
}
@@ -1789,11 +1789,11 @@ public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
}
}
- private void verifyPutAll(CacheEvent<Object, Object> p_event) {
+ private void verifyPutAll(CacheEvent<?, ?> p_event) {
if (!(p_event instanceof EntryEvent)) {
return;
}
- EntryEvent<Object, Object> event = (EntryEvent<Object, Object>) p_event;
+ EntryEvent<?, ?> event = (EntryEvent<?, ?>) p_event;
CustId knownCustId = new CustId(1);
OrderId knownOrderId = new OrderId(2, knownCustId);
if (event.getKey().equals(knownOrderId)) {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
index 1effd8d..585cb36 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
@@ -488,7 +488,7 @@ public class TXJUnitTest {
assertEquals("value2", reg2.get("key2"));
assertEquals(txCommitChanges + 2, stats.getTxCommitChanges());
{
- List<EntryEvent<String, String>> creates =
+ List<EntryEvent<?, ?>> creates =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(2, creates.size());
@@ -561,7 +561,7 @@ public class TXJUnitTest {
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<String, String>> creates =
+ List<EntryEvent<?, ?>> creates =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -594,7 +594,7 @@ public class TXJUnitTest {
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<String, String>> creates = TxEventTestUtil.getPutEvents(this.te.getEvents());
+ List<EntryEvent<?, ?>> creates = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -626,7 +626,7 @@ public class TXJUnitTest {
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<String, String>> creates =
+ List<EntryEvent<?, ?>> creates =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -659,7 +659,7 @@ public class TXJUnitTest {
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<String, String>> creates =
+ List<EntryEvent<?, ?>> creates =
TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -693,7 +693,7 @@ public class TXJUnitTest {
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<String, String>> creates =
+ List<EntryEvent<?, ?>> creates =
TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -728,7 +728,7 @@ public class TXJUnitTest {
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<String, String>> creates =
+ List<EntryEvent<?, ?>> creates =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -762,7 +762,7 @@ public class TXJUnitTest {
{
Cache teCache = this.te.getCache();
assertEquals(teCache, this.cache);
- List<EntryEvent<String, String>> creates =
+ List<EntryEvent<?, ?>> creates =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, creates.size());
@@ -1170,7 +1170,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1212,7 +1212,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1279,7 +1279,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1331,7 +1331,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1460,7 +1460,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1502,7 +1502,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1552,7 +1552,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1594,7 +1594,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1636,7 +1636,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1678,7 +1678,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1730,7 +1730,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1773,7 +1773,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1815,7 +1815,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1856,7 +1856,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1925,7 +1925,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -1968,7 +1968,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2015,7 +2015,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2054,7 +2054,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2094,7 +2094,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2166,7 +2166,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2211,7 +2211,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2259,7 +2259,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
+ List<EntryEvent<?, ?>> events = TxEventTestUtil.getPutEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2299,7 +2299,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2339,7 +2339,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getInvalidateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2411,7 +2411,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2456,7 +2456,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2503,7 +2503,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2548,7 +2548,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getCreateEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getInvalidateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2590,7 +2590,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2632,7 +2632,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2674,7 +2674,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
@@ -2716,7 +2716,7 @@ public class TXJUnitTest {
assertEquals(0, TxEventTestUtil.getDestroyEvents(this.te.getEvents()).size());
assertEquals(1, this.te.getEvents().size());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(this.te.getEvents());
assertEquals(myTxId, this.te.getTransactionId());
assertEquals(1, events.size());
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
index ad02a84..f594ec3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionEvent.java
@@ -47,7 +47,7 @@ import java.util.List;
* @see EntryEvent
* @since GemFire 4.0
*/
-public interface TransactionEvent<K, V> {
+public interface TransactionEvent {
/**
* Gets the <code>TransactionId</code> associated this TransactionEvent.
@@ -63,7 +63,7 @@ public interface TransactionEvent<K, V> {
* operation performed by this transaction.
* @since GemFire 5.0
*/
- List<CacheEvent<K, V>> getEvents();
+ List<CacheEvent<?, ?>> getEvents();
/**
* Gets the Cache for this transaction event
diff --git a/geode-core/src/main/java/org/apache/geode/cache/TransactionListener.java b/geode-core/src/main/java/org/apache/geode/cache/TransactionListener.java
index ec77e49..58a91ed 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/TransactionListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/TransactionListener.java
@@ -39,7 +39,7 @@ package org.apache.geode.cache;
* @see CacheTransactionManager#getListener
* @since GemFire 4.0
*/
-public interface TransactionListener<K, V> extends CacheCallback {
+public interface TransactionListener extends CacheCallback {
/**
* Called after a successful commit of a transaction.
@@ -47,7 +47,7 @@ public interface TransactionListener<K, V> extends CacheCallback {
* @param event the TransactionEvent
* @see CacheTransactionManager#commit
*/
- void afterCommit(TransactionEvent<K, V> event);
+ void afterCommit(TransactionEvent event);
/**
* Called after an unsuccessful commit operation.
@@ -55,7 +55,7 @@ public interface TransactionListener<K, V> extends CacheCallback {
* @param event the TransactionEvent
* @see CacheTransactionManager#commit
*/
- void afterFailedCommit(TransactionEvent<K, V> event);
+ void afterFailedCommit(TransactionEvent event);
/**
* Called after an explicit rollback of a transaction.
@@ -64,5 +64,5 @@ public interface TransactionListener<K, V> extends CacheCallback {
* @see CacheTransactionManager#rollback
* @see CacheTransactionManager#commit
*/
- void afterRollback(TransactionEvent<K, V> event);
+ void afterRollback(TransactionEvent event);
}
diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
index f35f6c7..f551bb6 100755
--- a/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.fail;
import java.util.Collections;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import org.junit.Test;
@@ -513,7 +512,7 @@ public class RemoteCQTransactionDUnitTest extends JUnit4CacheTestCase {
protected Exception ex = null;
protected void verify(TransactionEvent txEvent) {
- for (CacheEvent e : (List<CacheEvent>) txEvent.getEvents()) {
+ for (CacheEvent<?, ?> e : txEvent.getEvents()) {
verifyOrigin(e);
verifyPutAll(e);
}
diff --git a/geode-dunit/src/main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-dunit/src/main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
index b2f5bc89..de400e0 100644
--- a/geode-dunit/src/main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
+++ b/geode-dunit/src/main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
@@ -5476,28 +5476,28 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
}
- private static class MyTransactionListener<K, V> implements TransactionListener<K, V> {
+ private static class MyTransactionListener implements TransactionListener {
private volatile TransactionId expectedTxId;
- private volatile TransactionEvent<K, V> lastEvent;
+ private volatile TransactionEvent lastEvent;
private volatile int afterCommitCount;
private volatile int afterFailedCommitCount;
private volatile int afterRollbackCount;
private volatile int closeCount;
@Override
- public synchronized void afterCommit(TransactionEvent<K, V> event) {
+ public synchronized void afterCommit(TransactionEvent event) {
this.lastEvent = event;
this.afterCommitCount++;
}
@Override
- public synchronized void afterFailedCommit(TransactionEvent<K, V> event) {
+ public synchronized void afterFailedCommit(TransactionEvent event) {
this.lastEvent = event;
this.afterFailedCommitCount++;
}
@Override
- public synchronized void afterRollback(TransactionEvent<K, V> event) {
+ public synchronized void afterRollback(TransactionEvent event) {
this.lastEvent = event;
this.afterRollbackCount++;
}
@@ -5604,7 +5604,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
private void assertCacheCallbackEvents(String regionName, TransactionId txId, Object key,
Object oldValue, Object newValue) {
Region<Object, Object> re = getCache().getRegion("root").getSubregion(regionName);
- MyTransactionListener<Object, Object> tl =
+ MyTransactionListener tl =
firstTransactionListenerFrom(getCache().getCacheTransactionManager());
tl.expectedTxId = txId;
assertThat(re).describedAs("Cannot assert TX Callout Events with a null Region: " + regionName)
@@ -5664,7 +5664,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
@Override
public void run() {
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<Object, Object> tl = new MyTransactionListener<>();
+ MyTransactionListener tl = new MyTransactionListener();
setTxListener(txMgr2, tl);
assertThat(tl.lastEvent).isNull();
assertThat(tl.afterCommitCount).isEqualTo(0);
@@ -5749,7 +5749,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
.isNotNull();
assertThat(rgn1.getEntry("key").getValue()).isEqualTo("value");
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl =
+ MyTransactionListener tl =
firstTransactionListenerFrom(txMgr2);
tl.checkAfterCommitCount(1);
assertThat(tl.afterFailedCommitCount).isEqualTo(0);
@@ -5757,7 +5757,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(tl.closeCount).isEqualTo(0);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn1.getRegionService());
{
- Collection<EntryEvent<String, String>> events;
+ Collection<EntryEvent<?, ?>> events;
RegionAttributes<String, String> attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication()
|| attr.getConcurrencyChecksEnabled()) {
@@ -5811,14 +5811,14 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
.isNotNull();
assertThat(rgn1.getEntry("key").getValue()).isEqualTo("value2");
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.checkAfterCommitCount(2);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn1.getRegionService());
{
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(tl.expectedTxId);
assertThat(rgn1).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -5864,15 +5864,15 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn1.containsKey("key")).isTrue();
assertThat(rgn1.containsValueForKey("key")).isFalse();
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl =
+ MyTransactionListener tl =
firstTransactionListenerFrom(txMgr2);
tl.checkAfterCommitCount(3);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn1.getRegionService());
{
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getInvalidateEvents(tl.lastEvent.getEvents());
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.get(0);
+ EntryEvent<?, ?> ev = events.get(0);
assertThat(ev.getTransactionId()).isEqualTo(tl.expectedTxId);
assertThat(rgn1).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -5915,14 +5915,14 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
Region<String, String> rgn1 = getRootRegion().getSubregion(rgnName);
assertThat(rgn1.containsKey("key")).isFalse();
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.checkAfterCommitCount(4);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn1.getRegionService());
{
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(tl.lastEvent.getEvents());
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(tl.expectedTxId);
assertThat(rgn1).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -5982,7 +5982,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
@Override
public void run() {
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = new MyTransactionListener<>();
+ MyTransactionListener tl = new MyTransactionListener();
setTxListener(txMgr2, tl);
try {
Region<String, String> rgn = createRegion(rgnName);
@@ -6014,7 +6014,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
// GemFireVersion.waitForJavaDebugger(getLogWriter(), "CTRLR WAITING AFTER CREATE");
try {
- MyTransactionListener<String, String> tl = new MyTransactionListener<>();
+ MyTransactionListener tl = new MyTransactionListener();
setTxListener(txMgr, tl);
AttributesFactory<String, String> rgnAtts = new AttributesFactory<>(getRegionAttributes());
rgnAtts.setDataPolicy(DataPolicy.REPLICATE);
@@ -6040,10 +6040,10 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXUpdateLoadNoConflict: did commit");
assertThat(rgn.getEntry("key").getValue()).isEqualTo("txValue");
{
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(myTXId);
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -6090,10 +6090,10 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXUpdateLoadNoConflict: did commit");
assertThat(rgn.getEntry("key3").getValue()).isEqualTo("txValue3");
{
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(myTXId);
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key3");
@@ -6149,10 +6149,10 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXUpdateLoadNoConflict: did commit");
assertThat(rgn.getEntry("key").getValue()).isEqualTo("new txValue");
{
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(myTXId);
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -6220,7 +6220,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
@Override
public void run() {
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<Object, Object> tl = new MyTransactionListener<>();
+ MyTransactionListener tl = new MyTransactionListener();
setTxListener(txMgr2, tl);
try {
createRegion(rgnName1);
@@ -6247,7 +6247,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
@Override
public void run() {
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<Object, Object> tl = new MyTransactionListener<>();
+ MyTransactionListener tl = new MyTransactionListener();
setTxListener(txMgr2, tl);
try {
createRegion(rgnName2);
@@ -6275,7 +6275,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
@Override
public void run() {
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<Object, Object> tl = new MyTransactionListener<>();
+ MyTransactionListener tl = new MyTransactionListener();
setTxListener(txMgr2, tl);
try {
createRegion(rgnName3);
@@ -6315,14 +6315,14 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn3.getEntry("key").getValue()).isEqualTo("value3");
}
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.checkAfterCommitCount(1);
assertThat(tl.afterFailedCommitCount).isEqualTo(0);
assertThat(tl.afterRollbackCount).isEqualTo(0);
assertThat(tl.closeCount).isEqualTo(0);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn1.getRegionService());
{
- Collection<EntryEvent<String, String>> events;
+ Collection<EntryEvent<?, ?>> events;
RegionAttributes<String, String> attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
@@ -6330,7 +6330,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertThat(events.size()).isEqualTo(2);
- List<EntryEvent<String, String>> eventList = new ArrayList<>(events);
+ List<EntryEvent<?, ?>> eventList = new ArrayList<>(events);
eventList.sort((o1, o2) -> {
String s1 = o1.getRegion().getFullPath() + o1.getKey();
String s2 = o2.getRegion().getFullPath() + o2.getKey();
@@ -6359,14 +6359,14 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn3.getEntry("key").getValue()).isEqualTo("value3");
}
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.checkAfterCommitCount(1);
assertThat(tl.afterFailedCommitCount).isEqualTo(0);
assertThat(tl.afterRollbackCount).isEqualTo(0);
assertThat(tl.closeCount).isEqualTo(0);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn2.getRegionService());
{
- Collection<EntryEvent<String, String>> events;
+ Collection<EntryEvent<?, ?>> events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
@@ -6374,7 +6374,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertThat(events.size()).isEqualTo(2);
- List<EntryEvent<String, String>> eventList = new ArrayList<>(events);
+ List<EntryEvent<?, ?>> eventList = new ArrayList<>(events);
eventList.sort((o1, o2) -> {
String s1 = o1.getRegion().getFullPath() + o1.getKey();
String s2 = o2.getRegion().getFullPath() + o2.getKey();
@@ -6395,14 +6395,14 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn.getEntry("key")).describedAs("Could not find entry for 'key'").isNotNull();
assertThat(rgn.getEntry("key").getValue()).isEqualTo("value1");
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.checkAfterCommitCount(1);
assertThat(tl.afterFailedCommitCount).isEqualTo(0);
assertThat(tl.afterRollbackCount).isEqualTo(0);
assertThat(tl.closeCount).isEqualTo(0);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn.getRegionService());
{
- Collection<EntryEvent<String, String>> events;
+ Collection<EntryEvent<?, ?>> events;
RegionAttributes<String, String> attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
@@ -6410,7 +6410,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
// assertIndexDetailsEquals(tl.expectedTxId, ev.getTransactionId());
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -6435,14 +6435,14 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn.getEntry("key")).describedAs("Could not find entry for 'key'").isNotNull();
assertThat(rgn.getEntry("key").getValue()).isEqualTo("value2");
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.checkAfterCommitCount(1);
assertThat(tl.afterFailedCommitCount).isEqualTo(0);
assertThat(tl.afterRollbackCount).isEqualTo(0);
assertThat(tl.closeCount).isEqualTo(0);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn.getRegionService());
{
- Collection<EntryEvent<String, String>> events;
+ Collection<EntryEvent<?, ?>> events;
RegionAttributes<String, String> attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
@@ -6450,7 +6450,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
assertThat(ev.getNewValue()).isEqualTo("value2");
@@ -6474,14 +6474,14 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn.getEntry("key")).describedAs("Could not find entry for 'key'").isNotNull();
assertThat(rgn.getEntry("key").getValue()).isEqualTo("value3");
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.checkAfterCommitCount(1);
assertThat(tl.afterFailedCommitCount).isEqualTo(0);
assertThat(tl.afterRollbackCount).isEqualTo(0);
assertThat(tl.closeCount).isEqualTo(0);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn.getRegionService());
{
- Collection<EntryEvent<String, String>> events;
+ Collection<EntryEvent<?, ?>> events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
@@ -6489,7 +6489,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
// assertIndexDetailsEquals(tl.expectedTxId, ev.getTransactionId());
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -6895,14 +6895,14 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
/**
* Clear all existing transaction listeners and install the given listener.
*/
- private static <K, V> void setTxListener(CacheTransactionManager manager,
- TransactionListener<K, V> listener) {
+ private static void setTxListener(CacheTransactionManager manager,
+ TransactionListener listener) {
Stream.of(manager.getListeners())
.forEach(manager::removeListener);
manager.addListener(listener);
}
- private void verifyMirrorRegionEventsMatch(EntryEvent<String, String> event, Region region,
+ private void verifyMirrorRegionEventsMatch(EntryEvent<?, ?> event, Region region,
String expectedValue) {
assertThat(event.getRegion()).isSameAs(region);
assertThat(event.getKey()).isEqualTo("key");
@@ -6935,7 +6935,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
@Override
public void run() {
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<Object, Object> tl = new MyTransactionListener<>();
+ MyTransactionListener tl = new MyTransactionListener();
setTxListener(txMgr2, tl);
try {
AttributesFactory<?, ?> rgnAtts = new AttributesFactory<>(getRegionAttributes());
@@ -6952,7 +6952,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
@Override
public void run() {
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<Object, Object> tl = new MyTransactionListener<>();
+ MyTransactionListener tl = new MyTransactionListener();
setTxListener(txMgr2, tl);
try {
AttributesFactory<?, ?> rgnAtts = new AttributesFactory<>(getRegionAttributes());
@@ -7001,13 +7001,13 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn.getEntry("key").getValue()).isEqualTo("value");
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.assertCounts(1, 0, 0, 0);
assertThat(tl.lastEvent.getCache()).isEqualTo(rgn.getRegionService());
- List<EntryEvent<String, String>> events =
+ List<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.get(0);
+ EntryEvent<?, ?> ev = events.get(0);
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
assertThat(ev.getNewValue()).isEqualTo("value");
@@ -7041,7 +7041,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
private void checkCommitAndNoData(Region<String, String> rgn) {
assertThat(rgn.getEntry("key")).isNull();
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.assertCounts(1, 0, 0, 0);
assertThat(TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents())).isEmpty();
assertThat(TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents())).isEmpty();
@@ -7062,7 +7062,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(getRegionAttributes().getScope().isDistributed()).isTrue();
CacheTransactionManager txMgr = this.getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> localTl = new MyTransactionListener<>();
+ MyTransactionListener localTl = new MyTransactionListener();
TransactionId myTXId;
setTxListener(txMgr, localTl);
assertThat(localTl.lastEvent).isNull();
@@ -7073,7 +7073,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
@Override
public void run() {
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, Object> tl = new MyTransactionListener<>();
+ MyTransactionListener tl = new MyTransactionListener();
setTxListener(txMgr2, tl);
assertThat(tl.lastEvent).isNull();
tl.assertCounts(0, 0, 0, 0);
@@ -7114,12 +7114,12 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
public void run2() {
Region<String, String> rgn1 = getRootRegion().getSubregion(rgnName);
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
assertThat(rgn1.getEntry("key").getValue()).isEqualTo("value2");
tl.assertCounts(1, 0, 0, 0);
{
- Collection<EntryEvent<String, String>> events;
+ Collection<EntryEvent<?, ?>> events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
@@ -7127,7 +7127,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(rgn1).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
assertThat(ev.getNewValue()).isEqualTo("value2");
@@ -7147,11 +7147,11 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn.getEntry("key").getValue()).isEqualTo("value2");
{
localTl.assertCounts(1, 0, 0, 0);
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(localTl.lastEvent.getEvents());
assertThat(localTl.lastEvent.getTransactionId()).isEqualTo(myTXId);
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(myTXId);
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -7191,13 +7191,13 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
public void run2() {
Region<String, Object> rgn1 = getRootRegion().getSubregion(rgnName);
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, Object> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
assertThat(rgn1.containsKey("key")).isTrue();
assertThat(rgn1.containsValueForKey("key")).isFalse();
tl.assertCounts(2, 0, 0, 0);
{
- Collection<EntryEvent<String, Object>> events;
+ Collection<EntryEvent<?, ?>> events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
@@ -7205,7 +7205,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, Object> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(rgn1).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
assertThat(ev.getNewValue()).isNull();
@@ -7226,11 +7226,11 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn.containsValueForKey("key")).isFalse();
localTl.assertCounts(2, 0, 0, 0);
{
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(localTl.lastEvent.getEvents());
assertThat(localTl.lastEvent.getTransactionId()).isEqualTo(myTXId);
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(myTXId);
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -7261,7 +7261,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
public void run2() {
Region rgn1 = getRootRegion().getSubregion(rgnName);
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
assertThat(rgn1.getEntry("key").getValue()).isEqualTo("value1");
tl.assertCounts(2, 0, 0, 0); // There should be no change in counts
@@ -7293,7 +7293,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
public void run2() {
Region rgn1 = getRootRegion().getSubregion(rgnName);
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
assertThat(rgn1.containsKey("key")).isTrue();
assertThat(rgn1.containsValueForKey("key")).isTrue();
assertThat(rgn1.getEntry("key").getValue()).isEqualTo("value1");
@@ -7305,10 +7305,10 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn.getEntry("key").getValue()).isNull();
localTl.assertCounts(3, 0, 0, 0);
{
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getInvalidateEvents(localTl.lastEvent.getEvents());
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(myTXId);
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -7343,16 +7343,16 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
public void run2() {
Region<String, Object> rgn1 = getRootRegion().getSubregion(rgnName);
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, Object> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
assertThat(rgn1.containsKey("key")).isFalse();
assertThat(rgn1.containsValueForKey("key")).isFalse();
tl.assertCounts(3, 0, 0, 0);
{
- Collection<EntryEvent<String, Object>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getDestroyEvents(tl.lastEvent.getEvents());
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, Object> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(rgn1).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isNull();
assertThat(ev.getNewValue()).isNull();
@@ -7401,12 +7401,12 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
public void run2() {
Region<String, String> rgn1 = getRootRegion().getSubregion(rgnName);
CacheTransactionManager txMgr2 = getCache().getCacheTransactionManager();
- MyTransactionListener<String, String> tl = firstTransactionListenerFrom(txMgr2);
+ MyTransactionListener tl = firstTransactionListenerFrom(txMgr2);
tl.assertCounts(4, 0, 0, 0);
assertThat(rgn1.containsKey("key")).isTrue();
assertThat(rgn1.getEntry("key").getValue()).isEqualTo("value1");
{
- Collection<EntryEvent<String, String>> events;
+ Collection<EntryEvent<?, ?>> events;
RegionAttributes attr = getRegionAttributes();
if (!attr.getDataPolicy().withReplication() || attr.getConcurrencyChecksEnabled()) {
events = TxEventTestUtil.getPutEvents(tl.lastEvent.getEvents());
@@ -7414,7 +7414,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
events = TxEventTestUtil.getCreateEvents(tl.lastEvent.getEvents());
}
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(rgn1).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
assertThat(ev.getNewValue()).isEqualTo("value1");
@@ -7435,11 +7435,11 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn.containsValueForKey("key")).isFalse();
localTl.assertCounts(4, 0, 0, 0);
{
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(localTl.lastEvent.getEvents());
assertThat(localTl.lastEvent.getTransactionId()).isEqualTo(myTXId);
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(myTXId);
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
@@ -7476,11 +7476,11 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertThat(rgn.getEntry("key").getValue()).isEqualTo("value2");
localTl.assertCounts(5, 0, 0, 0);
{
- Collection<EntryEvent<String, String>> events =
+ Collection<EntryEvent<?, ?>> events =
TxEventTestUtil.getCreateEvents(localTl.lastEvent.getEvents());
assertThat(localTl.lastEvent.getTransactionId()).isEqualTo(myTXId);
assertThat(events.size()).isEqualTo(1);
- EntryEvent<String, String> ev = events.iterator().next();
+ EntryEvent<?, ?> ev = events.iterator().next();
assertThat(ev.getTransactionId()).isEqualTo(myTXId);
assertThat(rgn).isSameAs(ev.getRegion());
assertThat(ev.getKey()).isEqualTo("key");
diff --git a/geode-junit/src/main/java/org/apache/geode/cache/util/TxEventTestUtil.java b/geode-junit/src/main/java/org/apache/geode/cache/util/TxEventTestUtil.java
index 1b30544..ffbdfb5 100644
--- a/geode-junit/src/main/java/org/apache/geode/cache/util/TxEventTestUtil.java
+++ b/geode-junit/src/main/java/org/apache/geode/cache/util/TxEventTestUtil.java
@@ -35,7 +35,7 @@ public class TxEventTestUtil {
*
* @return list of entry create events from the given cache events
*/
- public static <K, V> List<EntryEvent<K, V>> getCreateEvents(List<CacheEvent<K, V>> cacheEvents) {
+ public static List<EntryEvent<?, ?>> getCreateEvents(List<CacheEvent<?, ?>> cacheEvents) {
return getEntryEventsWithOperation(cacheEvents, Operation::isCreate);
}
@@ -44,7 +44,7 @@ public class TxEventTestUtil {
*
* @return list of entry update events from the given cache events
*/
- public static <K, V> List<EntryEvent<K, V>> getPutEvents(List<CacheEvent<K, V>> cacheEvents) {
+ public static List<EntryEvent<?, ?>> getPutEvents(List<CacheEvent<?, ?>> cacheEvents) {
return getEntryEventsWithOperation(cacheEvents, Operation::isUpdate);
}
@@ -53,8 +53,8 @@ public class TxEventTestUtil {
*
* @return list of entry invalidate events from the given cache events
*/
- public static <K, V> List<EntryEvent<K, V>> getInvalidateEvents(
- List<CacheEvent<K, V>> cacheEvents) {
+ public static List<EntryEvent<?, ?>> getInvalidateEvents(
+ List<CacheEvent<?, ?>> cacheEvents) {
return getEntryEventsWithOperation(cacheEvents, Operation::isInvalidate);
}
@@ -63,7 +63,7 @@ public class TxEventTestUtil {
*
* @return list of entry destroy events from the given cache events
*/
- public static <K, V> List<EntryEvent<K, V>> getDestroyEvents(List<CacheEvent<K, V>> cacheEvents) {
+ public static List<EntryEvent<?, ?>> getDestroyEvents(List<CacheEvent<?, ?>> cacheEvents) {
return getEntryEventsWithOperation(cacheEvents, Operation::isDestroy);
}
@@ -77,8 +77,8 @@ public class TxEventTestUtil {
* @throws ClassCastException if the predicate matches the operation of an event that is not an
* {@code EntryEvent}
*/
- public static <K, V> List<EntryEvent<K, V>> getEntryEventsWithOperation(
- List<CacheEvent<K, V>> cacheEvents,
+ public static List<EntryEvent<?, ?>> getEntryEventsWithOperation(
+ List<CacheEvent<?, ?>> cacheEvents,
Predicate<Operation> operationPredicate) {
return getEntryEventsMatching(cacheEvents, e -> operationPredicate.test(e.getOperation()));
}
@@ -91,15 +91,15 @@ public class TxEventTestUtil {
* @return list of entry events that match the predicate
* @throws ClassCastException if the predicate matches an event that is not an {@code EntryEvent}
*/
- public static <K, V> List<EntryEvent<K, V>> getEntryEventsMatching(
- List<CacheEvent<K, V>> cacheEvents,
- Predicate<? super EntryEvent<K, V>> predicate) {
+ public static List<EntryEvent<?, ?>> getEntryEventsMatching(
+ List<CacheEvent<?, ?>> cacheEvents,
+ Predicate<? super EntryEvent<?, ?>> predicate) {
if (isNull(cacheEvents)) {
return Collections.emptyList();
}
return cacheEvents.stream()
.filter(EntryEvent.class::isInstance)
- .map(cacheEvent -> (EntryEvent<K, V>) cacheEvent)
+ .map(cacheEvent -> (EntryEvent<?, ?>) cacheEvent)
.filter(predicate)
.collect(Collectors.toList());
}