#764 alternative fix #769

TikhomirovSergey · 2017-11-17T22:24:20Z

Change list

#764 FIX. This change was made according to the confersation #765

Types of changes

No changes in production code.
Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

The asking for the current platform was optimized.

The asking for the browser or not was optimized.

Also: - WidgetListInterceptor was optimized - some code style improvements

TikhomirovSergey · 2017-11-17T22:26:20Z

@vrunoa You can review it too. It would be cool if you could try to test this change on your environment.

mykola-mokhnach · 2017-11-18T07:02:51Z

src/main/java/io/appium/java_client/internal/ElementMap.java

-        ElementMap element = Optional.ofNullable(mobileElementMap.get(String
-                .valueOf(hasSessionDetails.getAutomationName()).toLowerCase().trim()))
+        ElementMap element = Optional.ofNullable(mobileElementMap.get(
+                String.valueOf(platform).toLowerCase().trim()))


does it make any sense to use String.valueOf for values of type String?

@mykola-mokhnach It may return null value

mykola-mokhnach · 2017-11-18T07:03:45Z

src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java

@@ -67,6 +69,15 @@ public AppiumElementLocator(SearchContext searchContext, By by, boolean shouldCa
        this.exceptionMessageIfElementNotFound =  "Can't locate an element by this strategy: " + by.toString();
    }

+    private static By getBy(By currentBy, SearchContext currentContent) {
+        if (!ContentMappedBy.class.isAssignableFrom(currentBy.getClass())) {
+            return currentBy;


it might be easier to understand the code if this condition had an explanation comment

mykola-mokhnach · 2017-11-18T07:04:16Z

src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java

@@ -114,7 +125,8 @@ public WebElement findElement() {
        List<WebElement> result;
        try {
            result = waitFor(() -> {
-                List<WebElement> list = searchContext.findElements(by);
+                List<WebElement> list = searchContext
+                        .findElements(getBy(by, searchContext));
                if (list.size() > 0) {


return list.size() > 0 ? list : null

mykola-mokhnach · 2017-11-18T07:05:03Z

src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java

-                || !HasSessionDetails.class.isAssignableFrom(originalDriver.getClass())) {
-            hasSessionDetails = null;
+        HasSessionDetails hasSessionDetails = ofNullable(this.originalDriver).map(webDriver -> {
+            if (!HasSessionDetails.class.isAssignableFrom(originalDriver.getClass())) {


originalDriver -> webDriver

mykola-mokhnach · 2017-11-18T07:08:14Z

src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java

    @Override public WebElement findElement(SearchContext context) {
-        return context.findElement(map.get(getCurrentContentType(context)));
+        return context.findElement(map.get(currentContent));


is it ok if map.get returns null in any of these methods?

It is not possible. It will use NATIVE_MOBILE_SPECIFIC as it is defined by default or it will use HTML_OR_DEFAULT when there is no SearchContext which also implements ContextArare or HasSessionDetails. Also it will use HTML_OR_DEFAULT when HasSessionDetails.isBrowser returns true or current context != NATIVE_CONTEXT.

Also there is the method

/** * This method sets required content type for the further searching. * @param type required content type {@link ContentType} * @return self-reference. */ public By useContent(@Nonnull ContentType type) { checkNotNull(type); currentContent = type; return this; }

mykola-mokhnach

LGTM, just minor comments

TikhomirovSergey · 2017-11-18T21:14:03Z

@mykola-mokhnach I have improved some things that you pointed.
@SrinivasanTarget I am waining for your review.

SrinivasanTarget

👍

SrinivasanTarget · 2017-11-19T06:45:52Z

LGTM

mykola-mokhnach · 2017-11-19T07:20:07Z

src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java

-        HasSessionDetails hasSessionDetails = ofNullable(this.originalDriver).map(webDriver -> {
-            if (!HasSessionDetails.class.isAssignableFrom(originalDriver.getClass())) {
+        this.webDriver = unpackWebDriverFromSearchContext(context);
+        HasSessionDetails hasSessionDetails = ofNullable(this.webDriver).map(webDriver -> {


I meant it's better to use the mapped local variable webDriver -> inside the lambda handler rather than class-level this.originalDriverone.

TikhomirovSergey · 2017-11-19T19:23:10Z

@vrunoa
Also it is interesting to know about the time. Was it increased or reduced with this change on your environment? I will wait for a day or two days.

vrunoa · 2017-11-20T00:24:57Z

@TikhomirovSergey i'm running tests, i'll get back to you as soon as I have some results.

TikhomirovSergey · 2017-11-20T13:40:28Z

@vrunoa and what the result?

TikhomirovSergey · 2017-11-21T09:16:38Z

ping @vrunoa

vrunoa · 2017-11-21T12:07:43Z

@TikhomirovSergey sorry for the delay. I'm session a lot less getSession calls and test times got reduced. Lets merge it.

TikhomirovSergey · 2017-11-21T13:20:49Z

@vrunoa How much time was reduced? I will merge it later today

vrunoa · 2017-11-21T13:30:16Z

@TikhomirovSergey from 2hs to 50minutes approximately.

SrinivasanTarget · 2017-11-21T15:52:12Z

2hs to 50minutes approximately

Awesome

TikhomirovSergey added 4 commits November 15, 2017 00:09

#764 FIX.

2ddb61c

The asking for the current platform was optimized.

#764 FIX. AppiumFieldDecorator. Code style improvement

60b2aa9

#764 FIX.

e75a8a5

The asking for the browser or not was optimized.

#764 FIX: DefaultGenericMobileDriver: toString method was changed

a19c0de

Also: - WidgetListInterceptor was optimized - some code style improvements

TikhomirovSergey added bug refactor labels Nov 17, 2017

TikhomirovSergey self-assigned this Nov 17, 2017

TikhomirovSergey requested review from mykola-mokhnach and SrinivasanTarget November 17, 2017 22:24

mykola-mokhnach reviewed Nov 18, 2017

View reviewed changes

mykola-mokhnach approved these changes Nov 18, 2017

View reviewed changes

mykola-mokhnach mentioned this pull request Nov 18, 2017

Cache session details to avoid making unnecessary queries #765

Closed

4 tasks

#764 FIX: improving of some minor issues.

b784e16

appium deleted a comment Nov 19, 2017

SrinivasanTarget approved these changes Nov 19, 2017

View reviewed changes

mykola-mokhnach reviewed Nov 19, 2017

View reviewed changes

#764 FIX: improving of some minor issues.

d10f5d1

appium deleted a comment Nov 19, 2017

TikhomirovSergey merged commit dd8f33e into appium:master Nov 21, 2017

KazuCocoa mentioned this pull request Jun 20, 2018

Appium 1.8+ is brutally slow using Geb and Spock framework on iOS because AppiumDriver.getSession() became slow appium/appium#10790

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#764 alternative fix #769

#764 alternative fix #769

TikhomirovSergey commented Nov 17, 2017

TikhomirovSergey commented Nov 17, 2017

mykola-mokhnach Nov 18, 2017

TikhomirovSergey Nov 18, 2017

mykola-mokhnach Nov 18, 2017

mykola-mokhnach Nov 18, 2017

mykola-mokhnach Nov 18, 2017

mykola-mokhnach Nov 18, 2017

TikhomirovSergey Nov 18, 2017

mykola-mokhnach left a comment

TikhomirovSergey commented Nov 18, 2017

SrinivasanTarget left a comment

SrinivasanTarget commented Nov 19, 2017

mykola-mokhnach Nov 19, 2017

TikhomirovSergey commented Nov 19, 2017

vrunoa commented Nov 20, 2017

TikhomirovSergey commented Nov 20, 2017

TikhomirovSergey commented Nov 21, 2017

vrunoa commented Nov 21, 2017

TikhomirovSergey commented Nov 21, 2017 •

edited

Loading

vrunoa commented Nov 21, 2017

SrinivasanTarget commented Nov 21, 2017

#764 alternative fix #769

#764 alternative fix #769

Conversation

TikhomirovSergey commented Nov 17, 2017

Change list

Types of changes

TikhomirovSergey commented Nov 17, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mykola-mokhnach left a comment

Choose a reason for hiding this comment

TikhomirovSergey commented Nov 18, 2017

SrinivasanTarget left a comment

Choose a reason for hiding this comment

SrinivasanTarget commented Nov 19, 2017

Choose a reason for hiding this comment

TikhomirovSergey commented Nov 19, 2017

vrunoa commented Nov 20, 2017

TikhomirovSergey commented Nov 20, 2017

TikhomirovSergey commented Nov 21, 2017

vrunoa commented Nov 21, 2017

TikhomirovSergey commented Nov 21, 2017 • edited Loading

vrunoa commented Nov 21, 2017

SrinivasanTarget commented Nov 21, 2017

TikhomirovSergey commented Nov 21, 2017 •

edited

Loading