Make newRemoteWebElement protected

- Reverted newRemoteWebElement() method visibility from private to protected so other depending frameworks didn't break.
- Fixes : qaf-tm/qaf#119 which was introduced because of newRemoteWebElement method visibility changed from protected to private
- minor code improvement to reduce representative statements and it will also support any Dialect added in future.

Signed-off-by: Simon Stewart <[email protected]>

Author: cjayswal

java/client/src/org/openqa/selenium/remote/internal/JsonToWebElementConverter.java

@@ -50,14 +50,11 @@ public Object apply(Object result) {
 
     if (result instanceof Map<?, ?>) {
       Map<?, ?> resultAsMap = (Map<?, ?>) result;
-      if (resultAsMap.containsKey(Dialect.OSS.getEncodedElementKey())) {
-        RemoteWebElement element = newRemoteWebElement();
-        element.setId(String.valueOf(resultAsMap.get(Dialect.OSS.getEncodedElementKey())));
-        return element;
-      } else if (resultAsMap.containsKey(Dialect.W3C.getEncodedElementKey())) {
-        RemoteWebElement element = newRemoteWebElement();
-        element.setId(String.valueOf(resultAsMap.get(Dialect.W3C.getEncodedElementKey())));
-        return element;
+      String elementKey = getElementKey(resultAsMap);
+		  if (null!=elementKey) {
+			  RemoteWebElement element = newRemoteWebElement();
+			  element.setId(String.valueOf(resultAsMap.get(elementKey)));
+			  return element;
       } else {
         return Maps.transformValues(resultAsMap, this);
       }
@@ -77,7 +74,7 @@ public Object apply(Object result) {
     return result;
   }
 
-  private RemoteWebElement newRemoteWebElement() {
+  protected RemoteWebElement newRemoteWebElement() {
     return setOwner(new RemoteWebElement());
   }
 
@@ -88,4 +85,13 @@ private RemoteWebElement setOwner(RemoteWebElement element) {
     }
     return element;
   }
+  private static String getElementKey(Map<?, ?> resultAsMap) {
+		for (Dialect d : Dialect.values()) {
+			String elementKeyForDialect = d.getEncodedElementKey();
+			if (resultAsMap.containsKey(elementKeyForDialect)) {
+				return elementKeyForDialect;
+			}
+		}
+		return null;
+	}
 }