[java] fixed reading array parameters in the CDP client

SeleniumHQ · Nov 9, 2023 · feece00 · feece00
1 parent d1787a9
commit feece00
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/java/src/org/openqa/selenium/devtools/CdpClientGenerator.java b/java/src/org/openqa/selenium/devtools/CdpClientGenerator.java
@@ -439,14 +439,22 @@ public BodyDeclaration<?> toMethodDeclaration() {
                   String.format(
                       "return new Event<>(\"%s.%s\", ConverterFunctions.empty());",
                       domain.name, name));
-        } else if (type instanceof ObjectType || type instanceof ArrayType) {
+        } else if (type instanceof ObjectType) {
           methodDecl
               .getBody()
               .get()
               .addStatement(
                   String.format(
                       "return new Event<>(\"%s.%s\", input -> %s);",
                       domain.name, name, type.getMapper()));
+        } else if (type instanceof ArrayType) {
+          methodDecl
+              .getBody()
+              .get()
+              .addStatement(
+                  String.format(
+                      "return new Event<>(\"%s.%s\", ConverterFunctions.map(\"%s\", input -> %s));",
+                      domain.name, name, type.getName(), type.getMapper()));
         } else {
           methodDecl
               .getBody()
@@ -660,11 +668,17 @@ public MethodDeclaration toMethodDeclaration() {
         body.addStatement(
             String.format(
                 "return new Command<>(\"%s.%s\", Map.copyOf(params));", domain.name, name));
-      } else if (type instanceof ObjectType || type instanceof ArrayType) {
+      } else if (type instanceof ObjectType) {
         body.addStatement(
             String.format(
                 "return new Command<>(\"%s.%s\", Map.copyOf(params), input -> %s);",
                 domain.name, name, type.getMapper()));
+      } else if (type instanceof ArrayType) {
+        body.addStatement(
+            String.format(
+                "return new Command<>(\"%s.%s\", Map.copyOf(params), ConverterFunctions.map(\"%s\","
+                    + " input -> %s));",
+                domain.name, name, type.getName(), type.getMapper()));
       } else {
         body.addStatement(
             String.format(

diff --git a/java/src/org/openqa/selenium/devtools/ConverterFunctions.java b/java/src/org/openqa/selenium/devtools/ConverterFunctions.java
@@ -28,14 +28,21 @@ public static <X> Function<JsonInput, X> map(final String keyName, Type typeOfX)
     Require.nonNull("Key name", keyName);
     Require.nonNull("Type to convert to", typeOfX);
 
+    return map(keyName, input -> input.read(typeOfX));
+  }
+
+  public static <X> Function<JsonInput, X> map(final String keyName, Function<JsonInput, X> read) {
+    Require.nonNull("Key name", keyName);
+    Require.nonNull("Read callback", read);
+
     return input -> {
       X value = null;
 
       input.beginObject();
       while (input.hasNext()) {
         String name = input.nextName();
         if (keyName.equals(name)) {
-          value = input.read(typeOfX);
+          value = read.apply(input);
         } else {
           input.skipValue();
         }