From f1567155e146c4b821ef8a339f068b7d09f52481 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Wed, 1 Jun 2022 10:46:52 +0200 Subject: [PATCH 1/3] fix: Perform safe typecast while getting the platform name --- gradle.properties | 2 +- src/main/java/io/appium/java_client/AppiumDriver.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index cc4c62990..62048789f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ signing.secretKeyRingFile=PathToYourKeyRingFile ossrhUsername=your-jira-id ossrhPassword=your-jira-password -selenium.version=4.2.0 +selenium.version=4.2.1 diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java index 6d57cadd2..ca56d0caa 100644 --- a/src/main/java/io/appium/java_client/AppiumDriver.java +++ b/src/main/java/io/appium/java_client/AppiumDriver.java @@ -133,8 +133,11 @@ public AppiumDriver(Capabilities capabilities) { */ protected static Capabilities ensurePlatformName( Capabilities originalCapabilities, String defaultName) { - String currentName = (String) originalCapabilities.getCapability(PLATFORM_NAME); - return isBlank(currentName) + Object currentName = originalCapabilities.getCapability(PLATFORM_NAME); + if (!(currentName instanceof String)) { + currentName = ""; + } + return isBlank((String) currentName) ? originalCapabilities.merge(new ImmutableCapabilities(PLATFORM_NAME, defaultName)) : originalCapabilities; } From aa7c561ff86456aef1d939057a140be1f63dfd4b Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Wed, 1 Jun 2022 10:50:01 +0200 Subject: [PATCH 2/3] Tune condition --- src/main/java/io/appium/java_client/AppiumDriver.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java index ca56d0caa..dafc7a38e 100644 --- a/src/main/java/io/appium/java_client/AppiumDriver.java +++ b/src/main/java/io/appium/java_client/AppiumDriver.java @@ -134,10 +134,7 @@ public AppiumDriver(Capabilities capabilities) { protected static Capabilities ensurePlatformName( Capabilities originalCapabilities, String defaultName) { Object currentName = originalCapabilities.getCapability(PLATFORM_NAME); - if (!(currentName instanceof String)) { - currentName = ""; - } - return isBlank((String) currentName) + return isBlank((currentName instanceof String) ? (String) currentName : "") ? originalCapabilities.merge(new ImmutableCapabilities(PLATFORM_NAME, defaultName)) : originalCapabilities; } From f8a2dee1138d577b0001884ec5d9d12363413724 Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Wed, 1 Jun 2022 11:13:20 +0200 Subject: [PATCH 3/3] Address comments --- src/main/java/io/appium/java_client/AppiumDriver.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java index dafc7a38e..1616053ac 100644 --- a/src/main/java/io/appium/java_client/AppiumDriver.java +++ b/src/main/java/io/appium/java_client/AppiumDriver.java @@ -133,8 +133,7 @@ public AppiumDriver(Capabilities capabilities) { */ protected static Capabilities ensurePlatformName( Capabilities originalCapabilities, String defaultName) { - Object currentName = originalCapabilities.getCapability(PLATFORM_NAME); - return isBlank((currentName instanceof String) ? (String) currentName : "") + return originalCapabilities.getPlatformName() == null ? originalCapabilities.merge(new ImmutableCapabilities(PLATFORM_NAME, defaultName)) : originalCapabilities; }