CLIENTS-1063: Added equals() and hashCode in StoreBucketProperties.

Author: christopherfrieler

src/main/java/com/basho/riak/client/api/commands/buckets/StoreBucketProperties.java

@@ -20,6 +20,7 @@
 import com.basho.riak.client.core.operations.StoreBucketPropsOperation;
 import com.basho.riak.client.core.query.Namespace;
 import com.basho.riak.client.core.query.functions.Function;
+import java.util.Objects;
 
 /**
  * Command used to store (modify) the properties of a bucket in Riak.
@@ -215,6 +216,48 @@ protected StoreBucketPropsOperation buildCoreOperation()
         return builder.build();
     }
 
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (!(other instanceof StoreBucketProperties)) {
+            return false;
+        }
+        StoreBucketProperties otherStoreBucketProperties = (StoreBucketProperties) other;
+        return Objects.equals(namespace, otherStoreBucketProperties.namespace) &&
+                Objects.equals(allowMulti, otherStoreBucketProperties.allowMulti) &&
+                Objects.equals(backend, otherStoreBucketProperties.backend) &&
+                Objects.equals(basicQuorum, otherStoreBucketProperties.basicQuorum) &&
+                Objects.equals(bigVClock, otherStoreBucketProperties.bigVClock) &&
+                Objects.equals(chashkeyFunction, otherStoreBucketProperties.chashkeyFunction) &&
+                Objects.equals(lastWriteWins, otherStoreBucketProperties.lastWriteWins) &&
+                Objects.equals(linkWalkFunction, otherStoreBucketProperties.linkWalkFunction) &&
+                Objects.equals(rw, otherStoreBucketProperties.rw) &&
+                Objects.equals(dw, otherStoreBucketProperties.dw) &&
+                Objects.equals(w, otherStoreBucketProperties.w) &&
+                Objects.equals(r, otherStoreBucketProperties.r) &&
+                Objects.equals(pr, otherStoreBucketProperties.pr) &&
+                Objects.equals(pw, otherStoreBucketProperties.pw) &&
+                Objects.equals(notFoundOk, otherStoreBucketProperties.notFoundOk) &&
+                Objects.equals(preCommitHook, otherStoreBucketProperties.preCommitHook) &&
+                Objects.equals(postCommitHook, otherStoreBucketProperties.postCommitHook) &&
+                Objects.equals(oldVClock, otherStoreBucketProperties.oldVClock) &&
+                Objects.equals(youngVClock, otherStoreBucketProperties.youngVClock) &&
+                Objects.equals(smallVClock, otherStoreBucketProperties.smallVClock) &&
+                Objects.equals(nval, otherStoreBucketProperties.nval) &&
+                Objects.equals(legacySearch, otherStoreBucketProperties.legacySearch) &&
+                Objects.equals(searchIndex, otherStoreBucketProperties.searchIndex) &&
+                Objects.equals(hllPrecision, otherStoreBucketProperties.hllPrecision);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(namespace, allowMulti, backend, basicQuorum, bigVClock, chashkeyFunction, lastWriteWins,
+                linkWalkFunction, rw, dw, w, r, pr, pw, notFoundOk, preCommitHook, postCommitHook, oldVClock,
+                youngVClock, smallVClock, nval, legacySearch, searchIndex, hllPrecision);
+    }
+
     public static class Builder
     {
         private final Namespace namespace;

src/test/java/com/basho/riak/client/api/commands/buckets/StoreBucketPropertiesTest.java

@@ -0,0 +1,52 @@
+package com.basho.riak.client.api.commands.buckets;
+
+import com.basho.riak.client.core.query.Namespace;
+import org.junit.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class StoreBucketPropertiesTest {
+	@Test
+	public void equalsReturnsTrueForEqualBucketProperties() {
+		StoreBucketProperties storeBucketProperties1 = new StoreBucketProperties.Builder(new Namespace("namespace"))
+				.withBackend("backend").withNotFoundOk(true).withHllPrecision(15)
+				.withNVal(3).withPr(1).withPw(2).withR(1).withRw(1).withW(1).withDw(3).withBasicQuorum(false)
+				.withAllowMulti(true).withLastWriteWins(true)
+				.withBigVClock(42L).withOldVClock(41L).withSmallVClock(5L).withYoungVClock(19L)
+				.withLegacyRiakSearchEnabled(false).withSearchIndex("index")
+				.build();
+		StoreBucketProperties storeBucketProperties2 = new StoreBucketProperties.Builder(new Namespace("namespace"))
+				.withBackend("backend").withNotFoundOk(true).withHllPrecision(15)
+				.withNVal(3).withPr(1).withPw(2).withR(1).withRw(1).withW(1).withDw(3).withBasicQuorum(false)
+				.withAllowMulti(true).withLastWriteWins(true)
+				.withBigVClock(42L).withOldVClock(41L).withSmallVClock(5L).withYoungVClock(19L)
+				.withLegacyRiakSearchEnabled(false).withSearchIndex("index")
+				.build();
+
+		assertThat(storeBucketProperties1, is(equalTo(storeBucketProperties2)));
+		assertThat(storeBucketProperties2, is(equalTo(storeBucketProperties1)));
+	}
+
+	@Test
+	public void equalsReturnsFalseForDifferentBucketProperties() {
+		StoreBucketProperties storeBucketProperties1 = new StoreBucketProperties.Builder(new Namespace("namespace1"))
+				.withBackend("backend1").withNotFoundOk(true).withHllPrecision(14)
+				.withNVal(3).withPr(1).withPw(2).withR(1).withRw(1).withW(1).withDw(3).withBasicQuorum(false)
+				.withAllowMulti(true).withLastWriteWins(true)
+				.withBigVClock(42L).withOldVClock(41L).withSmallVClock(5L).withYoungVClock(19L)
+				.withLegacyRiakSearchEnabled(false).withSearchIndex("index1")
+				.build();
+		StoreBucketProperties storeBucketProperties2 = new StoreBucketProperties.Builder(new Namespace("namespace2"))
+				.withBackend("backend2").withNotFoundOk(false).withHllPrecision(16)
+				.withNVal(5).withPr(2).withPw(4).withR(2).withRw(2).withW(2).withDw(4).withBasicQuorum(true)
+				.withAllowMulti(false).withLastWriteWins(false)
+				.withBigVClock(43L).withOldVClock(42L).withSmallVClock(4L).withYoungVClock(190L)
+				.withLegacyRiakSearchEnabled(true).withSearchIndex("index2")
+				.build();
+
+		assertThat(storeBucketProperties1, is(not(equalTo(storeBucketProperties2))));
+		assertThat(storeBucketProperties2, is(not(equalTo(storeBucketProperties1))));
+	}
+}