Merge pull request #766 from mykola-mokhnach/else_get

Avoid making unnecessary function calls
appium · Nov 13, 2017 · 5dab23d · 5dab23d
2 parents 3438cc5 + a1d8386
commit 5dab23d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -77,7 +77,7 @@ public static Class<? extends RemoteWebElement> 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
@@ -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 {