xds: add toString() and delete unnecessary equals()/hashCode() for LB configs (#7451)
diff --git a/xds/src/main/java/io/grpc/xds/AddressFilter.java b/xds/src/main/java/io/grpc/xds/AddressFilter.java
index 62da7ad..841e96d 100644
--- a/xds/src/main/java/io/grpc/xds/AddressFilter.java
+++ b/xds/src/main/java/io/grpc/xds/AddressFilter.java
@@ -82,5 +82,10 @@
PathChain(String name) {
this.name = checkNotNull(name, "name");
}
+
+ @Override
+ public String toString() {
+ return name + (next == null ? "" : ", " + next);
+ }
}
}
diff --git a/xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java b/xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java
index bf1dbb5..7e28927 100644
--- a/xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java
+++ b/xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java
@@ -18,6 +18,7 @@
import static com.google.common.base.Preconditions.checkArgument;
+import com.google.common.base.MoreObjects;
import io.grpc.Internal;
import io.grpc.LoadBalancer;
import io.grpc.LoadBalancer.Helper;
@@ -26,7 +27,6 @@
import io.grpc.Status;
import io.grpc.internal.JsonUtil;
import java.util.Map;
-import java.util.Objects;
/**
* The provider for the "cds" balancing policy. This class should not be directly referenced in
@@ -96,20 +96,8 @@
}
@Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- CdsConfig cdsConfig = (CdsConfig) o;
- return Objects.equals(name, cdsConfig.name);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(name);
+ public String toString() {
+ return MoreObjects.toStringHelper(this).add("name", name).toString();
}
}
}
diff --git a/xds/src/main/java/io/grpc/xds/EdsLoadBalancerProvider.java b/xds/src/main/java/io/grpc/xds/EdsLoadBalancerProvider.java
index 5783095..3130c42 100644
--- a/xds/src/main/java/io/grpc/xds/EdsLoadBalancerProvider.java
+++ b/xds/src/main/java/io/grpc/xds/EdsLoadBalancerProvider.java
@@ -19,7 +19,6 @@
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
import io.grpc.Internal;
import io.grpc.LoadBalancer;
import io.grpc.LoadBalancer.Helper;
@@ -95,29 +94,5 @@
.add("endpointPickingPolicy", endpointPickingPolicy)
.toString();
}
-
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof EdsConfig)) {
- return false;
- }
- EdsConfig that = (EdsConfig) obj;
- return Objects.equal(this.clusterName, that.clusterName)
- && Objects.equal(this.edsServiceName, that.edsServiceName)
- && Objects.equal(this.lrsServerName, that.lrsServerName)
- && Objects.equal(this.localityPickingPolicy, that.localityPickingPolicy)
- && Objects.equal(this.endpointPickingPolicy, that.endpointPickingPolicy);
- }
-
- @Override
- public int hashCode() {
- return
- Objects.hashCode(
- clusterName,
- edsServiceName,
- lrsServerName,
- localityPickingPolicy,
- endpointPickingPolicy);
- }
}
}
diff --git a/xds/src/main/java/io/grpc/xds/LrsLoadBalancerProvider.java b/xds/src/main/java/io/grpc/xds/LrsLoadBalancerProvider.java
index d4a663b..a7e6e8a 100644
--- a/xds/src/main/java/io/grpc/xds/LrsLoadBalancerProvider.java
+++ b/xds/src/main/java/io/grpc/xds/LrsLoadBalancerProvider.java
@@ -18,6 +18,7 @@
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import io.grpc.Internal;
import io.grpc.LoadBalancer;
import io.grpc.LoadBalancerProvider;
@@ -80,5 +81,16 @@
this.locality = checkNotNull(locality, "locality");
this.childPolicy = checkNotNull(childPolicy, "childPolicy");
}
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("clusterName", clusterName)
+ .add("edsServiceName", edsServiceName)
+ .add("lrsServerName", lrsServerName)
+ .add("locality", locality)
+ .add("childPolicy", childPolicy)
+ .toString();
+ }
}
}
