Add 'getArray' method for array values (#12703)

Co-authored-by: Diego Molina <[email protected]>

Author: sbabcoc

java/src/org/openqa/selenium/grid/config/Config.java

@@ -18,6 +18,7 @@
 package org.openqa.selenium.grid.config;
 
 import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -46,6 +47,23 @@ default Optional<Boolean> getBool(String section, String option) {
     return get(section, option).map(Boolean::parseBoolean);
   }
 
+  default Optional<List<List<String>>> getArray(String section, String option) {
+    Optional<List<String>> flatConfigs = getAll(section, option);
+    if (!flatConfigs.isPresent()) return Optional.empty();
+
+    List<String> configItem = new ArrayList<>();
+    List<List<String>> configList = new ArrayList<>();
+    for (String next : flatConfigs.get()) {
+      if (Config.DELIMITER.equals(next)) {
+        configList.add(configItem);
+        configItem = new ArrayList<>();
+      } else {
+        configItem.add(next);
+      }
+    }
+    return Optional.of(configList);
+  }
+
   default <X> X getClass(String section, String option, Class<X> typeOfClass, String defaultClazz) {
     String clazz = get(section, option).orElse(defaultClazz);
 

java/test/org/openqa/selenium/grid/config/JsonConfigTest.java

@@ -125,4 +125,38 @@ void ensureCanReadListOfMaps() {
     Optional<List<String>> content = config.getAll("node", "driver-configuration");
     assertThat(content).isEqualTo(Optional.of(expected));
   }
+
+  @Test
+  void ensureCanReadListOfLists() {
+    String raw =
+      String.join(
+          "",
+          "",
+          "{",
+          "`cheeses`: {",
+          "`default`: `manchego`,",
+          "`type`: [",
+          "{",
+          "`name`: `soft cheese`,",
+          "`default`: `brie`",
+          "},",
+          "{",
+          "`name`: `Medium-hard cheese`,",
+          "`default`: `Emmental`",
+          "}",
+          "]",
+          "}",
+          "}")
+        .replace("`", "\"");
+    Config config = new JsonConfig(new StringReader(raw));
+
+    List<List<String>> expected =
+      Arrays.asList(
+        Arrays.asList("name=\"soft cheese\"", "default=\"brie\""),
+        Arrays.asList("name=\"Medium-hard cheese\"", "default=\"Emmental\""));
+    assertThat(config.getArray("cheeses", "type").orElse(Collections.emptyList()))
+      .isEqualTo(expected);
+    assertThat(config.getArray("cheeses", "type").orElse(Collections.emptyList()).subList(0, 1))
+      .isEqualTo(expected.subList(0, 1));
+  }
 }

java/test/org/openqa/selenium/grid/config/MapConfigTest.java

@@ -132,4 +132,39 @@ void ensureCanReadListOfMaps() {
     Optional<List<String>> content = config.getAll("node", "driver-configuration");
     assertThat(content).isEqualTo(Optional.of(expected));
   }
+
+  @Test
+  void ensureCanReadListOfLists() {
+    String json =
+      String.join(
+          "",
+          "",
+          "{",
+          "`cheeses`: {",
+          "`default`: `manchego`,",
+          "`type`: [",
+          "{",
+          "`name`: `soft cheese`,",
+          "`default`: `brie`",
+          "},",
+          "{",
+          "`name`: `Medium-hard cheese`,",
+          "`default`: `Emmental`",
+          "}",
+          "]",
+          "}",
+          "}")
+        .replace("`", "\"");
+    Map<String, Object> raw = new Json().toType(json, MAP_TYPE);
+    Config config = new MapConfig(raw);
+
+    List<List<String>> expected =
+      Arrays.asList(
+        Arrays.asList("name=\"soft cheese\"", "default=\"brie\""),
+        Arrays.asList("name=\"Medium-hard cheese\"", "default=\"Emmental\""));
+    assertThat(config.getArray("cheeses", "type").orElse(Collections.emptyList()))
+      .isEqualTo(expected);
+    assertThat(config.getArray("cheeses", "type").orElse(Collections.emptyList()).subList(0, 1))
+      .isEqualTo(expected.subList(0, 1));
+  }
 }

java/test/org/openqa/selenium/grid/config/TomlConfigTest.java

@@ -98,4 +98,29 @@ void ensureCanReadListOfMaps() {
     Optional<List<String>> content = config.getAll("node", "driver-configuration");
     assertThat(content).isEqualTo(Optional.of(expected));
   }
+
+  @Test
+  void ensureCanReadListOfLists() {
+    String[] rawConfig =
+      new String[] {
+        "[cheeses]",
+        "default = manchego",
+        "[[cheeses.type]]",
+        "name = \"soft cheese\"",
+        "default = \"brie\"",
+        "[[cheeses.type]]",
+        "name = \"Medium-hard cheese\"",
+        "default = \"Emmental\""
+      };
+    Config config = new TomlConfig(new StringReader(String.join("\n", rawConfig)));
+
+    List<List<String>> expected =
+      Arrays.asList(
+        Arrays.asList("default=\"brie\"", "name=\"soft cheese\""),
+        Arrays.asList("default=\"Emmental\"", "name=\"Medium-hard cheese\""));
+    assertThat(config.getArray("cheeses", "type").orElse(Collections.emptyList()))
+      .isEqualTo(expected);
+    assertThat(config.getArray("cheeses", "type").orElse(Collections.emptyList()).subList(0, 1))
+      .isEqualTo(expected.subList(0, 1));
+  }
 }