Improve some toString expressions of Selection Operators (#920)

scalar-labs · Jun 30, 2023 · 26d5160 · 26d5160
1 parent bf4d391
commit 26d5160
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 39 deletions.
diff --git a/core/src/main/java/com/scalar/db/api/GetWithIndex.java b/core/src/main/java/com/scalar/db/api/GetWithIndex.java
@@ -1,6 +1,5 @@
 package com.scalar.db.api;
 
-import com.google.common.base.MoreObjects;
 import com.scalar.db.io.Key;
 import java.util.Collection;
 import java.util.Objects;
@@ -97,9 +96,4 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(super.hashCode());
   }
-
-  @Override
-  public String toString() {
-    return super.toString() + MoreObjects.toStringHelper(this);
-  }
 }
diff --git a/core/src/main/java/com/scalar/db/api/Scan.java b/core/src/main/java/com/scalar/db/api/Scan.java
@@ -337,14 +337,19 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return super.toString()
-        + MoreObjects.toStringHelper(this)
-            .add("startClusteringKey", startClusteringKey)
-            .add("startInclusive", startInclusive)
-            .add("endClusteringKey", endClusteringKey)
-            .add("endInclusive", endInclusive)
-            .add("orderings", orderings)
-            .add("limit", limit);
+    return MoreObjects.toStringHelper(this)
+        .add("namespace", forNamespace())
+        .add("table", forTable())
+        .add("partitionKey", getPartitionKey())
+        .add("projections", getProjections())
+        .add("consistency", getConsistency())
+        .add("startClusteringKey", startClusteringKey)
+        .add("startInclusive", startInclusive)
+        .add("endClusteringKey", endClusteringKey)
+        .add("endInclusive", endInclusive)
+        .add("orderings", orderings)
+        .add("limit", limit)
+        .toString();
   }
 
   /** An optional parameter of {@link Scan} command to specify ordering of returned results. */

diff --git a/core/src/main/java/com/scalar/db/api/ScanAll.java b/core/src/main/java/com/scalar/db/api/ScanAll.java
@@ -1,6 +1,5 @@
 package com.scalar.db.api;
 
-import com.google.common.base.MoreObjects;
 import com.scalar.db.io.Key;
 import java.util.Collection;
 import java.util.Objects;
@@ -174,9 +173,4 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(super.hashCode());
   }
-
-  @Override
-  public String toString() {
-    return super.toString() + MoreObjects.toStringHelper(this);
-  }
 }
diff --git a/core/src/main/java/com/scalar/db/api/ScanWithIndex.java b/core/src/main/java/com/scalar/db/api/ScanWithIndex.java
@@ -1,6 +1,5 @@
 package com.scalar.db.api;
 
-import com.google.common.base.MoreObjects;
 import com.scalar.db.io.Key;
 import java.util.Collection;
 import java.util.Objects;
@@ -166,9 +165,4 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(super.hashCode());
   }
-
-  @Override
-  public String toString() {
-    return super.toString() + MoreObjects.toStringHelper(this);
-  }
 }
diff --git a/core/src/main/java/com/scalar/db/api/Selection.java b/core/src/main/java/com/scalar/db/api/Selection.java
@@ -1,6 +1,5 @@
 package com.scalar.db.api;
 
-import com.google.common.base.MoreObjects;
 import com.scalar.db.io.Key;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -110,16 +109,4 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(super.hashCode(), projections);
   }
-
-  @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("namespace", forNamespace())
-        .add("table", forTable())
-        .add("partitionKey", getPartitionKey())
-        .add("clusteringKey", getClusteringKey())
-        .add("projections", getProjections())
-        .add("consistency", getConsistency())
-        .toString();
-  }
 }