[infinispan-commits] Infinispan SVN: r1135 - in trunk/core/src/main/java/org/infinispan/commands: write and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-11-11 08:45:10 -0500 (Wed, 11 Nov 2009)
New Revision: 1135

Modified:
   trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/AbstractDataWriteCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/WriteCommand.java
Log:
Return type of getAffectedKeys should be a Set.  Also added aggregating helper in PrepareCommand with the same name.

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java	2009-11-11 13:24:43 UTC (rev 1134)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java	2009-11-11 13:45:10 UTC (rev 1135)
@@ -37,7 +37,10 @@
 import org.infinispan.util.logging.LogFactory;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
 
 /**
  * Command corresponding to the 1st phase of 2PC.
@@ -191,4 +194,12 @@
    public boolean hasModifications() {
       return modifications != null && modifications.length > 0;
    }
+
+   public Set<Object> getAffectedKeys() {
+      if (modifications == null || modifications.length == 0) return Collections.emptySet();
+      if (modifications.length == 1) return modifications[0].getAffectedKeys();
+      Set<Object> keys = new HashSet<Object>();
+      for (WriteCommand wc: modifications) keys.addAll(wc.getAffectedKeys());
+      return keys;
+   }
 }

Modified: trunk/core/src/main/java/org/infinispan/commands/write/AbstractDataWriteCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/AbstractDataWriteCommand.java	2009-11-11 13:24:43 UTC (rev 1134)
+++ trunk/core/src/main/java/org/infinispan/commands/write/AbstractDataWriteCommand.java	2009-11-11 13:45:10 UTC (rev 1135)
@@ -2,8 +2,8 @@
 
 import org.infinispan.commands.read.AbstractDataCommand;
 
-import java.util.Collection;
 import java.util.Collections;
+import java.util.Set;
 
 /**
  * Stuff common to WriteCommands
@@ -20,7 +20,7 @@
       super(key);
    }
 
-   public Collection<Object> getAffectedKeys() {
+   public Set<Object> getAffectedKeys() {
       return Collections.singleton(key);
    }
 }

Modified: trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java	2009-11-11 13:24:43 UTC (rev 1134)
+++ trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java	2009-11-11 13:45:10 UTC (rev 1135)
@@ -30,8 +30,8 @@
 import org.infinispan.marshall.exts.ReplicableCommandExternalizer;
 import org.infinispan.notifications.cachelistener.CacheNotifier;
 
-import java.util.Collection;
 import java.util.Collections;
+import java.util.Set;
 
 /**
  * @author Mircea.Markus at jboss.com
@@ -97,7 +97,7 @@
       return false;
    }
 
-   public Collection<Object> getAffectedKeys() {
+   public Set<Object> getAffectedKeys() {
       return Collections.emptySet();
    }
 }

Modified: trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java	2009-11-11 13:24:43 UTC (rev 1134)
+++ trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java	2009-11-11 13:45:10 UTC (rev 1135)
@@ -30,8 +30,8 @@
 import org.infinispan.notifications.cachelistener.CacheNotifier;
 
 import java.util.Map;
-import java.util.Collection;
 import java.util.Map.Entry;
+import java.util.Set;
 
 /**
  * @author Mircea.Markus at jboss.com
@@ -140,7 +140,7 @@
       return false;
    }
 
-   public Collection<Object> getAffectedKeys() {
+   public Set<Object> getAffectedKeys() {
       return map.keySet();
    }
 

Modified: trunk/core/src/main/java/org/infinispan/commands/write/WriteCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/WriteCommand.java	2009-11-11 13:24:43 UTC (rev 1134)
+++ trunk/core/src/main/java/org/infinispan/commands/write/WriteCommand.java	2009-11-11 13:45:10 UTC (rev 1135)
@@ -2,7 +2,7 @@
 
 import org.infinispan.commands.VisitableCommand;
 
-import java.util.Collection;
+import java.util.Set;
 
 /**
  * A command that modifies the cache in some way
@@ -34,5 +34,5 @@
     * @return a collection of keys affected by this write command.  Some commands - such as ClearCommand - may return
     * an empty collection for this method.
     */
-   Collection<Object> getAffectedKeys();
+   Set<Object> getAffectedKeys();
 }