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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-05-14 08:32:29 -0400 (Thu, 14 May 2009)
New Revision: 296

Modified:
   trunk/core/src/main/java/org/infinispan/commands/LockControlCommand.java
   trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
   trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java
   trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
   trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java
Log:
Trimmed unnecessarily verbose toString()

Modified: trunk/core/src/main/java/org/infinispan/commands/LockControlCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/LockControlCommand.java	2009-05-14 12:28:20 UTC (rev 295)
+++ trunk/core/src/main/java/org/infinispan/commands/LockControlCommand.java	2009-05-14 12:32:29 UTC (rev 296)
@@ -21,16 +21,14 @@
  */
 package org.infinispan.commands;
 
-import java.util.Collection;
-
 import org.infinispan.commands.tx.AbstractTransactionBoundaryCommand;
 import org.infinispan.commands.write.WriteCommand;
 import org.infinispan.context.InvocationContext;
 import org.infinispan.transaction.xa.GlobalTransaction;
 
+import java.util.Collection;
+
 /**
- * 
- * 
  * @author Vladimir Blagojevic (<a href="mailto:vblagoje at redhat.com">vblagoje at redhat.com</a>)
  * @param
  * @since 4.0
@@ -40,7 +38,7 @@
    private Collection keys;
    private boolean lock;
 
-   
+
    public LockControlCommand() {
    }
 
@@ -49,8 +47,8 @@
       this.keys = keys;
       this.lock = lock;
    }
-   
-   public void attachGlobalTransaction (GlobalTransaction gtx){
+
+   public void attachGlobalTransaction(GlobalTransaction gtx) {
       globalTx = gtx;
    }
 
@@ -65,17 +63,17 @@
    public boolean isUnlock() {
       return !isLock();
    }
-   
+
    @Override
    public Object perform(InvocationContext ignored) throws Throwable {
       if (ignored != null)
          throw new IllegalStateException("Expected null context!");
 
       boolean remoteTxinitiated = txTable.getRemoteTransaction(globalTx) != null ? true : false;
-      if (!remoteTxinitiated) {         
+      if (!remoteTxinitiated) {
          //create bogus modifications (we do not know modifications ahead of time)
-         txTable.createRemoteTransaction(globalTx, new WriteCommand[] {});
-      } 
+         txTable.createRemoteTransaction(globalTx, new WriteCommand[]{});
+      }
       return super.perform(ignored);
    }
 
@@ -86,9 +84,9 @@
    public byte getCommandId() {
       return COMMAND_ID;
    }
-   
+
    public Object[] getParameters() {
-      return new Object[]{globalTx, cacheName,keys,lock};
+      return new Object[]{globalTx, cacheName, keys, lock};
    }
 
    public void setParameters(int commandId, Object[] args) {
@@ -99,7 +97,7 @@
       keys = (Collection) args[2];
       lock = (Boolean) args[3];
    }
-   
+
    public boolean equals(Object o) {
       if (this == o)
          return true;
@@ -121,11 +119,10 @@
 
    @Override
    public String toString() {
-      return "LockControlCommand{" + 
-         "globalTx=" + globalTx + 
-         ", cacheName='" + cacheName+ 
-         ", invoker=" + invoker + 
-         ", lock=" + lock + 
-         ", keys=" + keys + '}';
+      return "LockControlCommand{" +
+            "gtx=" + globalTx +
+            ", cacheName='" + cacheName +
+            ", lock=" + lock +
+            ", keys=" + keys + '}';
    }
 }

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java	2009-05-14 12:28:20 UTC (rev 295)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java	2009-05-14 12:32:29 UTC (rev 296)
@@ -108,8 +108,8 @@
 
    @Override
    public String toString() {
-      return "AbstractTransactionBoundaryCommand{" +
-            "globalTx=" + globalTx +
+      return getClass().getSimpleName() + "{" +
+            "gtx=" + globalTx +
             ", cacheName='" + cacheName + '\'' +
             '}';
    }

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java	2009-05-14 12:28:20 UTC (rev 295)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java	2009-05-14 12:32:29 UTC (rev 296)
@@ -43,16 +43,10 @@
    }
 
    public Object acceptVisitor(InvocationContext ctx, Visitor visitor) throws Throwable {
-      return visitor.visitCommitCommand((TxInvocationContext)ctx, this);
+      return visitor.visitCommitCommand((TxInvocationContext) ctx, this);
    }
 
    public byte getCommandId() {
       return COMMAND_ID;
    }
-
-   public String toString() {
-      return "CommitCommand {" +
-            "gtx=" + globalTx +
-            '}';
-   }
 }

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java	2009-05-14 12:28:20 UTC (rev 295)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java	2009-05-14 12:32:29 UTC (rev 296)
@@ -148,7 +148,8 @@
    @Override
    public String toString() {
       return "PrepareCommand{" +
-            "modifications=" + (modifications == null ? null : Arrays.asList(modifications)) +
+            "gtx=" + globalTx +
+            ", modifications=" + (modifications == null ? null : Arrays.asList(modifications)) +
             ", onePhaseCommit=" + onePhaseCommit +
             "} " + super.toString();
    }

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java	2009-05-14 12:28:20 UTC (rev 295)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java	2009-05-14 12:32:29 UTC (rev 296)
@@ -43,16 +43,10 @@
    }
 
    public Object acceptVisitor(InvocationContext ctx, Visitor visitor) throws Throwable {
-      return visitor.visitRollbackCommand((TxInvocationContext)ctx, this);
+      return visitor.visitRollbackCommand((TxInvocationContext) ctx, this);
    }
 
    public byte getCommandId() {
       return COMMAND_ID;
    }
-
-   public String toString() {
-      return "RollbackCommand{" +
-            "gtx=" + globalTx +
-            '}';
-   }
 }