Skip to content

Commit d0cec1f

Browse files
committed
[json] delegate primitve detection to guava
1 parent 478b5f7 commit d0cec1f

File tree

1 file changed

+2
-41
lines changed

1 file changed

+2
-41
lines changed

java/client/src/org/openqa/selenium/json/JsonToBeanConverter.java

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.openqa.selenium.json;
1919

20+
import com.google.common.primitives.Primitives;
2021
import com.google.gson.JsonArray;
2122
import com.google.gson.JsonElement;
2223
import com.google.gson.JsonNull;
@@ -354,46 +355,6 @@ private List<?> convertList(JsonArray toConvert, int depth) {
354355

355356

356357
private boolean isPrimitive(Class<?> clazz) {
357-
if (clazz.isPrimitive()) {
358-
return true;
359-
}
360-
361-
if (Boolean.class.isAssignableFrom(clazz)) {
362-
return true;
363-
}
364-
365-
if (Byte.class.isAssignableFrom(clazz)) {
366-
return true;
367-
}
368-
369-
if (Character.class.isAssignableFrom(clazz)) {
370-
return true;
371-
}
372-
373-
if (Double.class.isAssignableFrom(clazz)) {
374-
return true;
375-
}
376-
377-
if (Float.class.isAssignableFrom(clazz)) {
378-
return true;
379-
}
380-
381-
if (Integer.class.isAssignableFrom(clazz)) {
382-
return true;
383-
}
384-
385-
if (Long.class.isAssignableFrom(clazz)) {
386-
return true;
387-
}
388-
389-
if (Short.class.isAssignableFrom(clazz)) {
390-
return true;
391-
}
392-
393-
if (Void.class.isAssignableFrom(clazz)) {
394-
return true;
395-
}
396-
397-
return false;
358+
return clazz.isPrimitive() || Primitives.isWrapperType(clazz);
398359
}
399360
}

0 commit comments

Comments
 (0)