Address suggested changes

Author: rjap-salesforce

utam-core/src/main/java/utam/core/selenium/appium/MobileDriverAdapter.java

@@ -12,6 +12,7 @@
 import static utam.core.framework.UtamLogger.warning;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.remote.SupportsContextSwitching;
@@ -140,15 +141,16 @@ private static AppiumDriver checkAndroidWebViewContext(
     for (Map<String, Object> page : pages) {
       String newTitle = (String) page.get(WEBVIEW_TITLE_KEY_ANDROID);
       // 'description' doesn't cast to Map, only String
-      String jsonString = (String) page.get(WEBVIEW_PAGE_DESCRIPTION_KEY);
-      Map description = null;
+      String serializedDescription = (String) page.get(WEBVIEW_PAGE_DESCRIPTION_KEY);
+      boolean visible = false;
       try {
-        description = new ObjectMapper().readValue(jsonString, Map.class);
+        JsonNode descriptionNode = new ObjectMapper().readTree(serializedDescription);
+        if (descriptionNode.has(WEBVIEW_PAGE_DESCRIPTION_VISIBILITY_KEY)) {
+          visible = descriptionNode.get(WEBVIEW_PAGE_DESCRIPTION_VISIBILITY_KEY).asBoolean();
+        }
       } catch (JsonProcessingException e) {
         error(e);
       }
-      boolean visible =
-          description != null && (boolean) description.get(WEBVIEW_PAGE_DESCRIPTION_VISIBILITY_KEY);
       if (newTitle.equalsIgnoreCase(title) && visible) {
         String id = (String) page.get(WEBVIEW_PAGE_KEY);
         AppiumDriver newDriver = switchToContext(appiumDriver, webviewName, id);

utam-core/src/test/java/utam/core/selenium/appium/MobileDriverAdapterTests.java

@@ -22,7 +22,16 @@
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.expectThrows;
-import static utam.core.selenium.appium.MobileDriverAdapter.*;
+import static utam.core.selenium.appium.MobileDriverAdapter.NATIVE_CONTEXT_HANDLE;
+import static utam.core.selenium.appium.MobileDriverAdapter.WEBVIEW_CONTEXT_HANDLE_PREFIX;
+import static utam.core.selenium.appium.MobileDriverAdapter.WEBVIEW_CONTEXT_KEY_ANDROID;
+import static utam.core.selenium.appium.MobileDriverAdapter.WEBVIEW_CONTEXT_KEY_IOS;
+import static utam.core.selenium.appium.MobileDriverAdapter.WEBVIEW_PAGES_KEY;
+import static utam.core.selenium.appium.MobileDriverAdapter.WEBVIEW_PAGE_DESCRIPTION_KEY;
+import static utam.core.selenium.appium.MobileDriverAdapter.WEBVIEW_PAGE_DESCRIPTION_VISIBILITY_KEY;
+import static utam.core.selenium.appium.MobileDriverAdapter.WEBVIEW_PAGE_KEY;
+import static utam.core.selenium.appium.MobileDriverAdapter.WEBVIEW_TITLE_KEY_ANDROID;
+import static utam.core.selenium.appium.MobileDriverAdapter.WEBVIEW_TITLE_KEY_IOS;
 
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.remote.SupportsContextSwitching;