java: Convert an object to JSON with the help of asList/toList method if available

Author: barancev

Diff for: java/client/src/org/openqa/selenium/remote/BeanToJsonConverter.java

@@ -192,6 +192,22 @@ private JsonElement convertObject(Object toConvert, int maxDepth) throws Excepti
       }
     }
 
+    Method toList = getMethod(toConvert, "toList");
+    if (toList == null) {
+      toList = getMethod(toConvert, "asList");
+    }
+    if (toList != null) {
+      try {
+        return convertObject(toList.invoke(toConvert), maxDepth - 1);
+      } catch (IllegalArgumentException e) {
+        throw new WebDriverException(e);
+      } catch (IllegalAccessException e) {
+        throw new WebDriverException(e);
+      } catch (InvocationTargetException e) {
+        throw new WebDriverException(e);
+      }
+    }
+
     Method toJson = getMethod(toConvert, "toJson");
     if (toJson != null) {
       try {

Diff for: java/client/test/org/openqa/selenium/remote/BeanToJsonConverterTest.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.remote;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -242,6 +243,18 @@ public void testShouldCallToMapMethodIfPresent() {
     assertEquals("{\"a key\":\"a value\"}", json);
   }
 
+  @Test
+  public void testShouldCallAsListMethodIfPresent() {
+    String json = new BeanToJsonConverter().convert(new Listable1("item1", "item2"));
+    assertEquals("[\"item1\",\"item2\"]", json);
+  }
+
+  @Test
+  public void testShouldCallToListMethodIfPresent() {
+    String json = new BeanToJsonConverter().convert(new Listable2("item1", "item2"));
+    assertEquals("[\"item1\",\"item2\"]", json);
+  }
+
   @Test
   public void testConvertsToJsonMethodResultToPrimitiveIfItIsNotJson() {
     // We want this parsed as a string primitive, but JsonParser will reject it
@@ -562,4 +575,29 @@ public Map<String, Object> toMap() {
       return ImmutableMap.of(key, value);
     }
   }
+
+  public class Listable1 {
+    private List<String> items;
+
+    public Listable1(String... items) {
+      this.items = ImmutableList.copyOf(items);
+    }
+
+    public List<String> asList() {
+      return items;
+    }
+  }
+
+  public class Listable2 {
+    private List<String> items;
+
+    public Listable2(String... items) {
+      this.items = ImmutableList.copyOf(items);
+    }
+
+    public List<String> toList() {
+      return items;
+    }
+  }
+
 }