api: fix bugs of missing to copy customOptions when converting to a new builder, also trash hashCode/equals (#5647)

* api: fix bugs of missing out customOptions in CreateSubchannelArgs toBuider, hashCode, equals

* trash equals/hashCode for CreateSubchannelArgs as they are problematic

Author: voidzcy

api/src/main/java/io/grpc/LoadBalancer.java

@@ -723,7 +723,8 @@ public SubchannelStateListener getStateListener() {
      * Returns a builder with the same initial values as this object.
      */
     public Builder toBuilder() {
-      return newBuilder().setAddresses(addrs).setAttributes(attrs).setStateListener(stateListener);
+      return newBuilder().setAddresses(addrs).setAttributes(attrs).setStateListener(stateListener)
+          .copyCustomOptions(customOptions);
     }
 
     /**
@@ -743,25 +744,6 @@ public String toString() {
           .toString();
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hashCode(addrs, attrs, stateListener);
-    }
-
-    /**
-     * Returns true if the {@link Subchannel}, {@link Status}, and
-     * {@link ClientStreamTracer.Factory} all match.
-     */
-    @Override
-    public boolean equals(Object other) {
-      if (!(other instanceof CreateSubchannelArgs)) {
-        return false;
-      }
-      CreateSubchannelArgs that = (CreateSubchannelArgs) other;
-      return Objects.equal(addrs, that.addrs) && Objects.equal(attrs, that.attrs)
-          && Objects.equal(stateListener, that.stateListener);
-    }
-
     @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1771")
     public static final class Builder {
 
@@ -773,6 +755,12 @@ public static final class Builder {
       Builder() {
       }
 
+      private <T> Builder copyCustomOptions(Object[][] options) {
+        customOptions = new Object[options.length][2];
+        System.arraycopy(options, 0, customOptions, 0, options.length);
+        return this;
+      }
+
       /**
        * Add a custom option. Any existing value for the key is overwritten.
        *

api/src/test/java/io/grpc/LoadBalancerTest.java

@@ -268,6 +268,23 @@ public void createSubchannelArgs_option_lastOneWins() {
     assertThat(args.getOption(testKey)).isEqualTo(testValue2);
   }
 
+  @Test
+  public void createSubchannelArgs_build() {
+    CreateSubchannelArgs.Key<Object> testKey = CreateSubchannelArgs.Key.create("test-key");
+    Object testValue = new Object();
+    CreateSubchannelArgs args = CreateSubchannelArgs.newBuilder()
+        .setAddresses(eag)
+        .setAttributes(attrs)
+        .setStateListener(subchannelStateListener)
+        .addOption(testKey, testValue)
+        .build();
+    CreateSubchannelArgs rebuildedArgs = args.toBuilder().build();
+    assertThat(rebuildedArgs.getAddresses()).containsExactly(eag);
+    assertThat(rebuildedArgs.getAttributes()).isSameInstanceAs(attrs);
+    assertThat(rebuildedArgs.getStateListener()).isSameInstanceAs(subchannelStateListener);
+    assertThat(rebuildedArgs.getOption(testKey)).isSameInstanceAs(testValue);
+  }
+
   @Test
   public void createSubchannelArgs_toString() {
     CreateSubchannelArgs.Key<String> testKey = CreateSubchannelArgs.Key.create("test-key");