[jbosscache-commits] JBoss Cache SVN: r6894 - in core/branches/flat/src/main/java/org/jboss/starobrno/commands: tx and 1 other directories.

Author: mircea.markus Date: 2008-10-09 05:31:22 -0400 (Thu, 09 Oct 2008) New Revision: 6894 Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/read/AbstractDataCommand.java core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/AbstractTransactionBoundaryCommand.java core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/CommitCommand.java core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/RollbackCommand.java core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/EvictCommand.java core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutKeyValueCommand.java core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutMapCommand.java core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/ReplaceCommand.java Log: added hash codes etc Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/read/AbstractDataCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/read/AbstractDataCommand.java 2008-10-09 09:27:58 UTC (rev 6893) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/read/AbstractDataCommand.java 2008-10-09 09:31:22 UTC (rev 6894) @@ -59,4 +59,21 @@ { return new Object[]{key}; } + + public boolean equals(Object o) + { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + AbstractDataCommand that = (AbstractDataCommand) o; + + if (key != null ? !key.equals(that.key) : that.key != null) return false; + + return true; + } + + public int hashCode() + { + return (key != null ? key.hashCode() : 0); + } } Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/AbstractTransactionBoundaryCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/AbstractTransactionBoundaryCommand.java 2008-10-09 09:27:58 UTC (rev 6893) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/AbstractTransactionBoundaryCommand.java 2008-10-09 09:31:22 UTC (rev 6894) @@ -45,13 +45,6 @@ this.gtx = gtx; } - /** - * This is a no-op. - * - * @param ctx - * @return - * @throws Throwable - */ public Object perform(InvocationContext ctx) throws Throwable { return null; @@ -66,4 +59,21 @@ { gtx = (GlobalTransaction) args[0]; } + + public boolean equals(Object o) + { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + AbstractTransactionBoundaryCommand that = (AbstractTransactionBoundaryCommand) o; + + if (gtx != null ? !gtx.equals(that.gtx) : that.gtx != null) return false; + + return true; + } + + public int hashCode() + { + return (gtx != null ? gtx.hashCode() : 0); + } } Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/CommitCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/CommitCommand.java 2008-10-09 09:27:58 UTC (rev 6893) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/CommitCommand.java 2008-10-09 09:31:22 UTC (rev 6894) @@ -54,4 +54,10 @@ return METHOD_ID; } + public String toString() + { + return "CommitCommand {" + + "gtx=" + gtx + + '}'; + } } Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/RollbackCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/RollbackCommand.java 2008-10-09 09:27:58 UTC (rev 6893) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/tx/RollbackCommand.java 2008-10-09 09:31:22 UTC (rev 6894) @@ -54,4 +54,10 @@ return METHOD_ID; } + public String toString() + { + return "RollbackCommand{" + + "gtx=" + gtx + + '}'; + } } Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/EvictCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/EvictCommand.java 2008-10-09 09:27:58 UTC (rev 6893) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/EvictCommand.java 2008-10-09 09:31:22 UTC (rev 6894) @@ -57,4 +57,12 @@ { return METHOD_ID; } + + + public String toString() + { + return "AbstractDataCommand{" + + "key=" + key + + '}'; + } } Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutKeyValueCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutKeyValueCommand.java 2008-10-09 09:27:58 UTC (rev 6893) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutKeyValueCommand.java 2008-10-09 09:31:22 UTC (rev 6894) @@ -87,4 +87,36 @@ { this.putIfAbsent = putIfAbsent; } + + public boolean equals(Object o) + { + if (this == o) return true; + if (!(o instanceof PutKeyValueCommand)) return false; + if (!super.equals(o)) return false; + + PutKeyValueCommand that = (PutKeyValueCommand) o; + + if (putIfAbsent != that.putIfAbsent) return false; + if (value != null ? !value.equals(that.value) : that.value != null) return false; + + return true; + } + + public int hashCode() + { + int result = super.hashCode(); + result = 31 * result + (value != null ? value.hashCode() : 0); + result = 31 * result + (putIfAbsent ? 1 : 0); + return result; + } + + + public String toString() + { + return "PutKeyValueCommand{" + + "key= " + key + + ", value=" + value + + ", putIfAbsent=" + putIfAbsent + + '}'; + } } \ No newline at end of file Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutMapCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutMapCommand.java 2008-10-09 09:27:58 UTC (rev 6893) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/PutMapCommand.java 2008-10-09 09:31:22 UTC (rev 6894) @@ -82,4 +82,29 @@ if (commandId != METHOD_ID) throw new IllegalStateException("Invalid method id"); map = (Map) parameters[0]; } + + public boolean equals(Object o) + { + if (this == o) return true; + if (!(o instanceof PutMapCommand)) return false; + + PutMapCommand that = (PutMapCommand) o; + + if (map != null ? !map.equals(that.map) : that.map != null) return false; + + return true; + } + + public int hashCode() + { + return (map != null ? map.hashCode() : 0); + } + + + public String toString() + { + return "PutMapCommand{" + + "map=" + map + + '}'; + } } Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java 2008-10-09 09:27:58 UTC (rev 6893) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/RemoveCommand.java 2008-10-09 09:31:22 UTC (rev 6894) @@ -64,4 +64,33 @@ { return METHOD_ID; } + + public boolean equals(Object o) + { + if (this == o) return true; + if (!(o instanceof RemoveCommand)) return false; + if (!super.equals(o)) return false; + + RemoveCommand that = (RemoveCommand) o; + + if (value != null ? !value.equals(that.value) : that.value != null) return false; + + return true; + } + + public int hashCode() + { + int result = super.hashCode(); + result = 31 * result + (value != null ? value.hashCode() : 0); + return result; + } + + + public String toString() + { + return "RemoveCommand{" + + "key=" + key + + ", value=" + value + + '}'; + } } Modified: core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/ReplaceCommand.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/ReplaceCommand.java 2008-10-09 09:27:58 UTC (rev 6893) +++ core/branches/flat/src/main/java/org/jboss/starobrno/commands/write/ReplaceCommand.java 2008-10-09 09:31:22 UTC (rev 6894) @@ -82,4 +82,35 @@ oldValue = parameters[1]; newValue = parameters[2]; } + + public boolean equals(Object o) + { + if (this == o) return true; + if (!(o instanceof ReplaceCommand)) return false; + if (!super.equals(o)) return false; + + ReplaceCommand that = (ReplaceCommand) o; + + if (newValue != null ? !newValue.equals(that.newValue) : that.newValue != null) return false; + if (oldValue != null ? !oldValue.equals(that.oldValue) : that.oldValue != null) return false; + + return true; + } + + public int hashCode() + { + int result = super.hashCode(); + result = 31 * result + (oldValue != null ? oldValue.hashCode() : 0); + result = 31 * result + (newValue != null ? newValue.hashCode() : 0); + return result; + } + + public String toString() + { + return "ReplaceCommand{" + + "key=" + key + + ", oldValue=" + oldValue + + ", newValue=" + newValue + + '}'; + } }