Add Values.of(Map<String, Value> values).

Also update Javadoc to include {@link} syntax and fix typo.

PiperOrigin-RevId: 806318745

Author: protobuf-github-bot

java/util/src/main/java/com/google/protobuf/util/Values.java

@@ -11,6 +11,7 @@
 import com.google.protobuf.NullValue;
 import com.google.protobuf.Struct;
 import com.google.protobuf.Value;
+import java.util.Map;
 
 /** Utilities to help create {@code google.protobuf.Value} messages. */
 public final class Values {
@@ -25,38 +26,46 @@ public static Value ofNull() {
     return NULL_VALUE;
   }
 
-  /** Returns a Value object with number set to value. */
+  /** Returns a {@link Value} object with number set to value. */
   public static Value of(boolean value) {
     return value ? TRUE_VALUE : FALSE_VALUE;
   }
 
-  /** Returns a Value object with number set to value. */
+  /** Returns a {@link Value} object with number set to value. */
   public static Value of(double value) {
     return Value.newBuilder().setNumberValue(value).build();
   }
 
-  /** Returns a Value object with string set to value. */
+  /** Returns a {@link Value} object with string set to value. */
   public static Value of(String value) {
     return value.isEmpty() ? EMPTY_STR_VALUE : Value.newBuilder().setStringValue(value).build();
   }
 
-  /** Returns a Value object with struct set to value. */
+  /** Returns a {@link Value} object with struct set to value. */
   public static Value of(Struct value) {
     return Value.newBuilder().setStructValue(value).build();
   }
 
-  /** Returns a Value with ListValue set to value. */
+  /** Returns a {@link Value} with a {@link ListValue} set to value. */
   public static Value of(ListValue value) {
     return Value.newBuilder().setListValue(value).build();
   }
 
   /**
-   * Returns a Value with ListValue set to the appending the result of calling {@link #of} on each
-   * element in the iterable.
+   * Returns a {@link Value} with a {@link ListValue} whose values are set to the result of calling
+   * {@link #of} on each element in the iterable.
    */
   public static Value of(Iterable<Value> values) {
     return Value.newBuilder().setListValue(ListValue.newBuilder().addAllValues(values)).build();
   }
 
+  /**
+   * Returns a {@link Value} with a {@link Struct} whose fields are set to the result of calling
+   * {@link #of} on each value in the map, preserving keys.
+   */
+  public static Value of(Map<String, Value> values) {
+    return Value.newBuilder().setStructValue(Struct.newBuilder().putAllFields(values)).build();
+  }
+
   private Values() {}
 }

java/util/src/test/java/com/google/protobuf/util/ValuesTest.java

@@ -14,41 +14,43 @@
 import com.google.protobuf.Struct;
 import com.google.protobuf.Value;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
 public final class ValuesTest {
   @Test
-  public void testOfNull_IsNullValue() throws Exception {
+  public void testOfNull_isNullValue() throws Exception {
     assertThat(Values.ofNull())
         .isEqualTo(Value.newBuilder().setNullValue(NullValue.NULL_VALUE).build());
   }
 
   @Test
-  public void testOfBoolean_ConstructsValue() {
+  public void testOfBoolean_constructsValue() {
     assertThat(Values.of(true)).isEqualTo(Value.newBuilder().setBoolValue(true).build());
     assertThat(Values.of(false)).isEqualTo(Value.newBuilder().setBoolValue(false).build());
   }
 
   @Test
-  public void testOfNumeric_ConstructsValue() {
+  public void testOfNumeric_constructsValue() {
     assertThat(Values.of(100)).isEqualTo(Value.newBuilder().setNumberValue(100).build());
     assertThat(Values.of(1000L)).isEqualTo(Value.newBuilder().setNumberValue(1000).build());
     assertThat(Values.of(1000.23f)).isEqualTo(Value.newBuilder().setNumberValue(1000.23f).build());
     assertThat(Values.of(10000.23)).isEqualTo(Value.newBuilder().setNumberValue(10000.23).build());
   }
 
   @Test
-  public void testOfString_ConstructsValue() {
+  public void testOfString_constructsValue() {
     assertThat(Values.of("")).isEqualTo(Value.newBuilder().setStringValue("").build());
     assertThat(Values.of("foo")).isEqualTo(Value.newBuilder().setStringValue("foo").build());
   }
 
   @Test
-  public void testOfStruct_ConstructsValue() {
+  public void testOfStruct_constructsValue() {
     Struct.Builder builder = Struct.newBuilder();
     builder.putFields("a", Values.of("a"));
     builder.putFields("b", Values.of("b"));
@@ -58,7 +60,7 @@ public void testOfStruct_ConstructsValue() {
   }
 
   @Test
-  public void testOfListValue_ConstructsInstance() {
+  public void testOfListValue_constructsInstance() {
     ListValue.Builder builder = ListValue.newBuilder();
     builder.addValues(Values.of(1));
     builder.addValues(Values.of(2));
@@ -68,7 +70,7 @@ public void testOfListValue_ConstructsInstance() {
   }
 
   @Test
-  public void testOfIterable_ReturnsTheValue() {
+  public void testOfIterable_returnsTheValue() {
     ListValue.Builder builder = ListValue.newBuilder();
     builder.addValues(Values.of(1));
     builder.addValues(Values.of(2));
@@ -86,4 +88,24 @@ public void testOfIterable_ReturnsTheValue() {
     assertThat(Values.of(new ArrayList<Value>()))
         .isEqualTo(Value.newBuilder().setListValue(ListValue.getDefaultInstance()).build());
   }
+
+  @Test
+  public void testOfMap_returnsTheValue() {
+    Struct.Builder builder = Struct.newBuilder();
+    builder.putFields("a", Values.of(1));
+    builder.putFields("b", Values.of(2));
+    builder.putFields("c", Values.of(true));
+    builder.putFields("d", Value.newBuilder().setStructValue(builder).build());
+
+    Map<String, Value> map = new HashMap<>();
+    map.put("a", Values.of(1));
+    map.put("b", Values.of(2));
+    map.put("c", Values.of(true));
+    Map<String, Value> copyMap = new HashMap<>(map);
+    map.put("d", Values.of(copyMap));
+
+    assertThat(Values.of(map)).isEqualTo(Value.newBuilder().setStructValue(builder).build());
+    assertThat(Values.of(new HashMap<String, Value>()))
+        .isEqualTo(Value.newBuilder().setStructValue(Struct.getDefaultInstance()).build());
+  }
 }