From a1d8386735fb5c0f34ac1e7184333ece1266a97f Mon Sep 17 00:00:00 2001 From: Mykola Mokhnach Date: Mon, 13 Nov 2017 21:24:04 +0100 Subject: [PATCH] Avoid making unnecessary function calls --- src/main/java/io/appium/java_client/internal/ElementMap.java | 2 +- .../io/appium/java_client/pagefactory/WidgetByBuilder.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/appium/java_client/internal/ElementMap.java b/src/main/java/io/appium/java_client/internal/ElementMap.java index 0dec31b3e..1d150ae96 100644 --- a/src/main/java/io/appium/java_client/internal/ElementMap.java +++ b/src/main/java/io/appium/java_client/internal/ElementMap.java @@ -77,7 +77,7 @@ public static Class getElementClass(HasSessionDetail } ElementMap element = Optional.ofNullable(mobileElementMap.get(String .valueOf(hasSessionDetails.getAutomationName()).toLowerCase().trim())) - .orElse(mobileElementMap + .orElseGet(() -> mobileElementMap .get(String.valueOf(hasSessionDetails.getPlatformName()).toLowerCase().trim())); if (element == null) { return RemoteWebElement.class; diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/WidgetByBuilder.java index 978e4fbaf..ee4a8c18c 100644 --- a/src/main/java/io/appium/java_client/pagefactory/WidgetByBuilder.java +++ b/src/main/java/io/appium/java_client/pagefactory/WidgetByBuilder.java @@ -93,12 +93,12 @@ private By getByFromDeclaredClass(WhatIsNeeded whatIsNeeded) { @Override protected By buildDefaultBy() { return ofNullable(super.buildDefaultBy()) - .orElse(getByFromDeclaredClass(WhatIsNeeded.DEFAULT_OR_HTML)); + .orElseGet(() -> getByFromDeclaredClass(WhatIsNeeded.DEFAULT_OR_HTML)); } @Override protected By buildMobileNativeBy() { return ofNullable(super.buildMobileNativeBy()) - .orElse(getByFromDeclaredClass(WhatIsNeeded.MOBILE_NATIVE)); + .orElseGet(() -> getByFromDeclaredClass(WhatIsNeeded.MOBILE_NATIVE)); } private enum WhatIsNeeded {