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.

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

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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);
5 changes: 2 additions & 3 deletions java/src/org/openqa/selenium/support/FindAll.java
Original file line number Diff line number Diff line change
@@ -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();
5 changes: 2 additions & 3 deletions java/src/org/openqa/selenium/support/FindBy.java
Original file line number Diff line number Diff line change
@@ -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);
5 changes: 2 additions & 3 deletions java/src/org/openqa/selenium/support/FindBys.java
Original file line number Diff line number Diff line change
@@ -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();