Skip to content

use generics for AbstractFindByBuilder to avoid excessive casting #15526

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 3 commits into from
Jul 7, 2025
Merged

use generics for AbstractFindByBuilder to avoid excessive casting #15526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2d8176
use generics for AbstractFindByBuilder to avoid excessive casting
asolntsev Mar 27, 2025
24cfe16
Merge branch 'trunk' into refactor/typed-find-by-builder
asolntsev Apr 3, 2025
2069849
Merge branch 'trunk' into refactor/typed-find-by-builder
diemol Jul 7, 2025
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
4 changes: 2 additions & 2 deletions java/src/org/openqa/selenium/support/AbstractFindByBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import java.util.Set;
import org.openqa.selenium.By;

public abstract class AbstractFindByBuilder {
public abstract class AbstractFindByBuilder<T> {

public abstract By buildIt(Object annotation, Field field);
public abstract By buildIt(T annotation, Field field);

protected By buildByFromFindBy(FindBy findBy) {
assertValidFindBy(findBy);
Expand Down
5 changes: 2 additions & 3 deletions java/src/org/openqa/selenium/support/FindAll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@
public @interface FindAll {
FindBy[] value();

class FindByBuilder extends AbstractFindByBuilder {
class FindByBuilder extends AbstractFindByBuilder<FindAll> {
@Override
public By buildIt(Object annotation, Field field) {
FindAll findBys = (FindAll) annotation;
public By buildIt(FindAll findBys, Field field) {
assertValidFindAll(findBys);

FindBy[] findByArray = findBys.value();
Expand Down
5 changes: 2 additions & 3 deletions java/src/org/openqa/selenium/support/FindBy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,9 @@

String xpath() default "";

class FindByBuilder extends AbstractFindByBuilder {
class FindByBuilder extends AbstractFindByBuilder<FindBy> {
@Override
public By buildIt(Object annotation, Field field) {
FindBy findBy = (FindBy) annotation;
public By buildIt(FindBy findBy, Field field) {
assertValidFindBy(findBy);

By ans = buildByFromShortFindBy(findBy);
Expand Down
5 changes: 2 additions & 3 deletions java/src/org/openqa/selenium/support/FindBys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@
public @interface FindBys {
FindBy[] value();

class FindByBuilder extends AbstractFindByBuilder {
class FindByBuilder extends AbstractFindByBuilder<FindBys> {
@Override
public By buildIt(Object annotation, Field field) {
FindBys findBys = (FindBys) annotation;
public By buildIt(FindBys findBys, Field field) {
assertValidFindBys(findBys);

FindBy[] findByArray = findBys.value();
Expand Down