PageFactory: add field when constructing the locator.

Author: shs96c

java/client/src/org/openqa/selenium/support/AbstractFindByBuilder.java

@@ -19,12 +19,13 @@
 
 import org.openqa.selenium.By;
 
+import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.Set;
 
 public abstract class AbstractFindByBuilder {
 
-  public abstract By buildIt(Object annotation);
+  public abstract By buildIt(Object annotation, Field field);
 
   protected By buildByFromFindBy(FindBy findBy) {
     assertValidFindBy(findBy);
@@ -38,29 +39,37 @@ protected By buildByFromFindBy(FindBy findBy) {
   }
 
   protected By buildByFromShortFindBy(FindBy findBy) {
-    if (!"".equals(findBy.className()))
+    if (!"".equals(findBy.className())) {
       return By.className(findBy.className());
+    }
 
-    if (!"".equals(findBy.css()))
+    if (!"".equals(findBy.css())) {
       return By.cssSelector(findBy.css());
+    }
 
-    if (!"".equals(findBy.id()))
+    if (!"".equals(findBy.id())) {
       return By.id(findBy.id());
+    }
 
-    if (!"".equals(findBy.linkText()))
+    if (!"".equals(findBy.linkText())) {
       return By.linkText(findBy.linkText());
+    }
 
-    if (!"".equals(findBy.name()))
+    if (!"".equals(findBy.name())) {
       return By.name(findBy.name());
+    }
 
-    if (!"".equals(findBy.partialLinkText()))
+    if (!"".equals(findBy.partialLinkText())) {
       return By.partialLinkText(findBy.partialLinkText());
+    }
 
-    if (!"".equals(findBy.tagName()))
+    if (!"".equals(findBy.tagName())) {
       return By.tagName(findBy.tagName());
+    }
 
-    if (!"".equals(findBy.xpath()))
+    if (!"".equals(findBy.xpath())) {
       return By.xpath(findBy.xpath());
+    }
 
     // Fall through
     return null;

java/client/src/org/openqa/selenium/support/FindAll.java

@@ -25,6 +25,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.reflect.Field;
 
 /**
  * Used to mark a field on a Page Object to indicate that lookup should use a series of @FindBy tags
@@ -47,7 +48,7 @@
   FindBy[] value();
 
   public static class FindByBuilder extends AbstractFindByBuilder {
-    public By buildIt(Object annotation) {
+    public By buildIt(Object annotation, Field field) {
       FindAll findBys = (FindAll) annotation;
       assertValidFindAll(findBys);
 

java/client/src/org/openqa/selenium/support/FindBy.java

@@ -24,6 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.reflect.Field;
 
 /**
  * <p>Used to mark a field on a Page Object to indicate an alternative mechanism for locating the
@@ -77,7 +78,7 @@
   String xpath() default "";
 
   public static class FindByBuilder extends AbstractFindByBuilder {
-    public By buildIt(Object annotation) {
+    public By buildIt(Object annotation, Field field) {
       FindBy findBy = (FindBy) annotation;
       assertValidFindBy(findBy);
 

java/client/src/org/openqa/selenium/support/FindBys.java

@@ -24,6 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.reflect.Field;
 
 /**
  * Used to mark a field on a Page Object to indicate that lookup should use a series of @FindBy tags
@@ -45,7 +46,7 @@
   FindBy[] value();
 
   public static class FindByBuilder extends AbstractFindByBuilder {
-    public By buildIt(Object annotation) {
+    public By buildIt(Object annotation, Field field) {
       FindBys findBys = (FindBys) annotation;
       assertValidFindBys(findBys);
 

java/client/src/org/openqa/selenium/support/pagefactory/Annotations.java

@@ -69,15 +69,14 @@ public By buildBy() {
           builder = annotation.annotationType()
               .getAnnotation(PageFactoryFinder.class).value()
               .newInstance();
-        } catch (InstantiationException e) {
-        } catch (IllegalAccessException e) {
+        } catch (ReflectiveOperationException e) {
+          // Fall through.
         }
       }
       if (builder != null) {
-        ans = builder.buildIt(annotation);
+        ans = builder.buildIt(annotation, field);
         break;
       }
-
     }
 
     if (ans == null) {

java/client/test/org/openqa/selenium/support/pagefactory/AnnotationsTest.java

@@ -40,6 +40,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.reflect.Field;
 import java.util.List;
 
 @RunWith(JUnit4.class)
@@ -109,7 +110,7 @@ public class AnnotationsTest {
     public static class FindByXXXXBuilder extends AbstractFindByBuilder {
 
       @Override
-      public By buildIt(Object annotation) {
+      public By buildIt(Object annotation, Field field) {
         return new By() {
           @Override
           public List<WebElement> findElements(SearchContext context) {