Skip to content

fix: Always release annotated element reference from the builder instance #2128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 4, 2024
Merged

fix: Always release annotated element reference from the builder instance #2128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52deed6
fix: Always release annotated element reference from the builder inst…
mykola-mokhnach Mar 1, 2024
10b52de
fix style
mykola-mokhnach Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import io.appium.java_client.pagefactory.bys.builder.AppiumByBuilder;
import io.appium.java_client.pagefactory.locator.CacheableElementLocatorFactory;
import io.appium.java_client.pagefactory.locator.CacheableLocator;
import org.openqa.selenium.By;
import org.openqa.selenium.SearchContext;

import javax.annotation.Nullable;
Expand Down Expand Up @@ -90,12 +89,18 @@ public CacheableLocator createLocator(AnnotatedElement annotatedElement) {
customDuration = duration;
}
builder.setAnnotated(annotatedElement);
By byResult = builder.buildBy();
return ofNullable(byResult)
.map(by -> searchContextReference != null
? new AppiumElementLocator(searchContextReference, by, builder.isLookupCached(), customDuration)
: new AppiumElementLocator(searchContext, by, builder.isLookupCached(), customDuration)
)
.orElse(null);
try {
return ofNullable(builder.buildBy())
.map(by -> {
var isLookupCached = builder.isLookupCached();
return searchContextReference != null
? new AppiumElementLocator(searchContextReference, by, isLookupCached, customDuration)
: new AppiumElementLocator(searchContext, by, isLookupCached, customDuration);
})
.orElse(null);
} finally {
// unleak element reference after the locator is built
builder.setAnnotated(null);
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/io/appium/java_client/pagefactory/WidgetByBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private static Class<?> getClassFromAListField(Field field) {
@SuppressWarnings("unchecked")
private By getByFromDeclaredClass(WhatIsNeeded whatIsNeeded) {
AnnotatedElement annotatedElement = annotatedElementContainer.getAnnotated();
Field field = Field.class.cast(annotatedElement);
Field field = (Field) annotatedElement;
Class<?> declaredClass;

By result = null;
Expand Down