From a334b9f0afb3ac518211a315ec6aefa023d94de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@zamarreno.com>
Date: Fri, 13 Apr 2012 18:07:31 +0200
Subject: [PATCH] HHH-7238 Remove unneeded cache listeners

---
 .../cache/infinispan/collection/CollectionRegionImpl.java      | 3 ---
 .../hibernate/cache/infinispan/entity/EntityRegionImpl.java    | 3 ---
 .../java/org/hibernate/cache/infinispan/impl/BaseRegion.java   | 1 -
 .../cache/infinispan/query/QueryResultsRegionImpl.java         | 3 ---
 .../cache/infinispan/timestamp/TimestampsRegionImpl.java       | 2 ++
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java
index 82ce84e0ab..c0be4dc9d5 100644
--- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java
+++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java
@@ -2,8 +2,6 @@
 
 import javax.transaction.TransactionManager;
 
-import org.infinispan.notifications.Listener;
-
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.infinispan.access.PutFromLoadValidator;
 import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion;
@@ -19,7 +17,6 @@
  * @author Galder Zamarreño
  * @since 3.5
  */
-@Listener
 public class CollectionRegionImpl extends BaseTransactionalDataRegion implements CollectionRegion {
 
    public CollectionRegionImpl(CacheAdapter cacheAdapter, String name, CacheDataDescription metadata, 
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java
index 391a8ada57..bed947b9d0 100644
--- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java
+++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java
@@ -2,8 +2,6 @@
 
 import javax.transaction.TransactionManager;
 
-import org.infinispan.notifications.Listener;
-
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.infinispan.access.PutFromLoadValidator;
 import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion;
@@ -19,7 +17,6 @@
  * @author Galder Zamarreño
  * @since 3.5
  */
-@Listener
 public class EntityRegionImpl extends BaseTransactionalDataRegion implements EntityRegion {
 
    public EntityRegionImpl(CacheAdapter cacheAdapter, String name, CacheDataDescription metadata, 
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java
index 7019c0008f..ac57c32597 100644
--- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java
+++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java
@@ -46,7 +46,6 @@ public BaseRegion(CacheAdapter cacheAdapter, String name, TransactionManager tra
       this.transactionManager = transactionManager;
       this.replication = cacheAdapter.isClusteredReplication();
       this.address = this.cacheAdapter.getAddress();
-      this.cacheAdapter.addListener(this);
       this.factory = factory;
    }
 
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java
index 3b0d2b2c84..88c48d3c67 100644
--- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java
+++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java
@@ -4,8 +4,6 @@
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
-import org.infinispan.notifications.Listener;
-
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion;
 import org.hibernate.cache.infinispan.util.CacheAdapter;
@@ -18,7 +16,6 @@
  * @author Galder Zamarreño
  * @since 3.5
  */
-@Listener
 public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implements QueryResultsRegion {
    private boolean localOnly;
 
diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java
index 35c61d759d..5e0ad496c1 100644
--- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java
+++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java
@@ -99,6 +99,7 @@ public void destroy() throws CacheException {
     * @param event
     */
    @CacheEntryModified
+   @SuppressWarnings("unused")
    public void nodeModified(CacheEntryModifiedEvent event) {
       if (!event.isPre())
          localCache.put(event.getKey(), event.getValue());
@@ -110,6 +111,7 @@ public void nodeModified(CacheEntryModifiedEvent event) {
     * @param event
     */
    @CacheEntryRemoved
+   @SuppressWarnings("unused")
    public void nodeRemoved(CacheEntryRemovedEvent event) {
       if (event.isPre()) return;
       localCache.remove(event.getKey());