Copy forward AttributesTest.java

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

@@ -31,6 +31,7 @@
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nullable;
@@ -374,10 +375,10 @@
      * Gets the value of an "extension" arg by key, or {@code null} if it's not set.
      *
      * <p>While ordinary {@link Args} should be universally useful and meaningful, extension
-     * arguments can apply just to resolvers of a certain URI scheme, just to resolvers producing
-     * a particular type of {@link java.net.SocketAddress}, or even an individual {@link
-     * NameResolver} subclass. Extension args are identified by an instance of {@link Args.Key}
-     * which should be defined in a java package and class appropriate to the argument's scope.
+     * arguments can apply just to resolvers of a certain URI scheme, just to resolvers producing a
+     * particular type of {@link java.net.SocketAddress}, or even an individual {@link NameResolver}
+     * subclass. Extension args are identified by an instance of {@link Args.Key} which should be
+     * defined in a java package and class appropriate to the argument's scope.
      *
      * <p>{@link Args} are normally reserved for information in *support* of name resolution, not
      * the name to be resolved itself. However, there are rare cases where all or part of the target
@@ -438,7 +439,7 @@
           .add("proxyDetector", proxyDetector)
           .add("syncContext", syncContext)
           .add("serviceConfigParser", serviceConfigParser)
           .add("extensions", extensions)
           .add("scheduledExecutorService", scheduledExecutorService)
           .add("channelLogger", channelLogger)
           .add("executor", executor)
@@ -575,17 +576,13 @@
         return this;
       }
 
-      /**
-       * See {@link Args#getExtension(Key)}.
-       */
+      /** See {@link Args#getExtension(Key)}. */
       public <T> Builder setExtension(Key<T> key, T value) {
         extensionsBuilder.set(key, value);
         return this;
       }
 
-      /**
-       * Copies each extension argument from 'extensions' into this Builder.
-       */
+      /** Copies each extension argument from 'extensions' into this Builder. */
       @Internal
       public Builder setAllExtensions(Extensions extensions) {
         extensionsBuilder.setAll(extensions);
@@ -622,7 +619,7 @@
       public String toString() {
         return debugString;
       }
 
       /**
        * Creates a new instance of {@link Key}.
        *
@@ -662,6 +659,10 @@
         return (T) data.get(key);
       }
 
+      Set<Key<?>> keysForTest() {
+        return Collections.unmodifiableSet(data.keySet());
+      }
+
       /** Creates a new builder. */
       public static Builder newBuilder() {
         return new Builder(EMPTY);
@@ -680,7 +681,7 @@
       public String toString() {
         return data.toString();
       }
 
       /** Fluently builds instances of {@link Extensions}. */
       public static final class Builder {
         private Extensions base;
@@ -708,9 +709,7 @@
           return this;
         }
 
-        /**
-         * Copies all entries from 'other' into this Builder.
-         */
+        /** Copies all entries from 'other' into this Builder. */
         public Builder setAll(Extensions other) {
           data(other.data.size()).putAll(other.data);
           return this;
@@ -723,7 +722,7 @@
               if (!newdata.containsKey(entry.getKey())) {
                 newdata.put(entry.getKey(), entry.getValue());
               }
             }
             base = new Extensions(newdata);
             newdata = null;
           }

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2024 The gRPC Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.grpc;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertSame;
+
+import io.grpc.NameResolver.Args;
+import io.grpc.NameResolver.Args.Extensions;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Unit tests for {@link NameResolver.Args.Extensions}. */
+@RunWith(JUnit4.class)
+public class NameResolverArgsExtensionsTest {
+  private static final Args.Key<String> YOLO_KEY = Args.Key.create("yolo");
+
+  @Test
+  public void buildExtensions() {
+    Extensions attrs = Extensions.newBuilder().set(YOLO_KEY, "To be, or not to be?").build();
+    assertSame("To be, or not to be?", attrs.get(YOLO_KEY));
+    assertThat(attrs.keysForTest()).hasSize(1);
+  }
+
+  @Test
+  public void duplicates() {
+    Extensions attrs =
+        Extensions.newBuilder()
+            .set(YOLO_KEY, "To be?")
+            .set(YOLO_KEY, "Or not to be?")
+            .set(Args.Key.create("yolo"), "I'm not a duplicate")
+            .build();
+    assertThat(attrs.get(YOLO_KEY)).isEqualTo("Or not to be?");
+    assertThat(attrs.keysForTest()).hasSize(2);
+  }
+
+  @Test
+  public void toBuilder() {
+    Extensions attrs =
+        Extensions.newBuilder().set(YOLO_KEY, "To be?").build().toBuilder()
+            .set(YOLO_KEY, "Or not to be?")
+            .set(Args.Key.create("yolo"), "I'm not a duplicate")
+            .build();
+    assertThat(attrs.get(YOLO_KEY)).isEqualTo("Or not to be?");
+    assertThat(attrs.keysForTest()).hasSize(2);
+  }
+
+  @Test
+  public void empty() {
+    assertThat(Extensions.EMPTY.keysForTest()).isEmpty();
+  }
+}