Fix review comments.

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

@@ -94,8 +94,8 @@
 
           @Override
           public void onResult(ResolutionResult resolutionResult) {
             listener.onAddresses(resolutionResult.getAddressesOrError().getValue(),
                 resolutionResult.getAttributes());
           }
       });
     }
@@ -224,9 +224,9 @@
     public final void onAddresses(
         List<EquivalentAddressGroup> servers, @ResolutionResultAttr Attributes attributes) {
       // TODO(jihuncho) need to promote Listener2 if we want to use ConfigOrError
       onResult2(
           ResolutionResult.newBuilder().setAddressesOrError(
               StatusOr.fromValue(servers)).setAttributes(attributes).build());
     }
 
     /**
@@ -606,7 +606,7 @@
         List<EquivalentAddressGroup> addresses,
         @ResolutionResultAttr Attributes attributes,
         ConfigOrError serviceConfig) {
       this.addressesOrError = StatusOr.fromValue(addresses);
       this.attributes = checkNotNull(attributes, "attributes");
       this.serviceConfig = serviceConfig;
     }
@@ -676,7 +676,7 @@
     @Override
     public String toString() {
       return MoreObjects.toStringHelper(this)
           .add("addresses", addressesOrError)
           .add("attributes", attributes)
           .add("serviceConfig", serviceConfig)
           .toString();
@@ -701,7 +701,7 @@
      */
     @Override
     public int hashCode() {
       return Objects.hashCode(addressesOrError, attributes, serviceConfig);
     }
 
     /**
@@ -728,7 +728,7 @@
        */
       @Deprecated
       public Builder setAddresses(List<EquivalentAddressGroup> addresses) {
-        this.addresses = StatusOr.fromValue(addresses);
+        setAddressesOrError(StatusOr.fromValue(addresses));
         return this;
       }
 
@@ -738,7 +738,7 @@
        * @param addresses Resolved addresses or an error in resolving addresses
        */
       public Builder setAddressesOrError(StatusOr<List<EquivalentAddressGroup>> addresses) {
-        this.addresses = addresses;
+        this.addresses = checkNotNull(addresses, "StatusOr addresses cannot be null.");
         return this;
       }
 

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

@@ -54,29 +54,29 @@
    */
   public @Nullable T getValue() {
     if (status != null) {
       throw new IllegalStateException("No value present.");
     }
     return value;
   }
 
   /** Returns the status. If there is a value (which can be null), returns OK. */
   public Status getStatus() {
-    return status == null? Status.OK : status;
+    return status == null ? Status.OK : status;
   }
 
   @Override
   public boolean equals(Object other) {
     if (!(other instanceof StatusOr)) {
       return false;
     }
     StatusOr<?> otherStatus = (StatusOr<?>) other;
     if (hasValue() != otherStatus.hasValue()) {
       return false;
     }
     if (hasValue()) {
       return Objects.equal(value, otherStatus.value);
     }
     return Objects.equal(status, otherStatus.status);
   }
 
   @Override

core/src/main/java/io/grpc/internal/ManagedChannelImpl.java

@@ -1704,7 +1704,7 @@
 
       StatusOr<List<EquivalentAddressGroup>> serversOrError =
           resolutionResult.getAddressesOrError();
-      if (serversOrError != null && serversOrError.hasValue()) {
+      if (serversOrError.hasValue()) {
         channelLogger.log(
             ChannelLogLevel.DEBUG,
             "Resolved address: {0}, config={1}",
@@ -1825,7 +1825,7 @@
         if (serversOrError != null && serversOrError.hasValue()) {
           resolvedAddresses.setAddresses(serversOrError.getValue());
         } else {
           resolvedAddresses.setAddresses(new ArrayList<>());
         }
         resolvedAddresses = resolvedAddresses.setAttributes(attributes)
             .setLoadBalancingPolicyConfig(effectiveServiceConfig.getLoadBalancingConfig());