implement composition of Elements

src/test/elements/Element.java

@@ -0,0 +1,52 @@
+package test.elements;
+
+import org.openqa.selenium.*;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+public class Element {
+    private WebDriver driver;
+    private By locator;
+
+    public Element(WebDriver driver, By locator) {
+        this.driver = driver;
+        this.locator = locator;
+    }
+
+    public void click() {
+        while (true) {
+            try {
+                driver.findElement(locator).click();
+                return;
+            } catch (NoSuchElementException e) {
+                waitForElement(locator);
+            } catch (ElementNotInteractableException e) {
+                waitForElementVisible(locator);
+            }
+        }
+    }
+
+    public void sendKeys(String string) {
+        while (true) {
+            try {
+                driver.findElement(locator).sendKeys(string);
+                return;
+            } catch (NoSuchElementException e) {
+                waitForElement(locator);
+            } catch (ElementNotInteractableException e) {
+                waitForElementVisible(locator);
+            }
+        }
+    }
+
+    private void waitForElement(By locator) {
+        WebDriverWait wait = new WebDriverWait(driver, 30);
+        wait.until(ExpectedConditions.presenceOfElementLocated(locator));
+    }
+
+    private void waitForElementVisible(By locator) {
+        WebDriverWait wait = new WebDriverWait(driver, 30);
+        wait.until(ExpectedConditions.visibilityOfElementLocated(locator));
+    }
+
+}

src/test/pages/BasePage.java

@@ -1,32 +1,12 @@
 package test.pages;
 
+import test.elements.Element;
 import org.openqa.selenium.*;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
 
-class BasePage {
-    WebDriver driver;
+    class BasePage {
+        WebDriver driver;
 
-    void click(By locator) {
-        while (true) {
-            try {
-                driver.findElement(locator).click();
-                return;
-            } catch (NoSuchElementException e) {
-                waitForElement(locator);
-            } catch (ElementNotInteractableException e) {
-                waitForElementVisible(locator);
-            }
+        Element getElement(By locator) {
+            return new Element(driver, locator);
         }
     }
-
-    private void waitForElement(By locator) {
-        WebDriverWait wait = new WebDriverWait(driver, 30);
-        wait.until(ExpectedConditions.presenceOfElementLocated(locator));
-    }
-
-    private void waitForElementVisible(By locator) {
-        WebDriverWait wait = new WebDriverWait(driver, 30);
-        wait.until(ExpectedConditions.visibilityOfElementLocated(locator));
-    }
-}

src/test/pages/HomePage.java

@@ -22,9 +22,9 @@ public HomePage(WebDriver driver) {
     }
 
     public void signIn(User user) {
-        sendKeys(username, user.getUsername());
-        sendKeys(password, user.getPassword());
-        click(submit);
+        getElement(username).sendKeys(user.getUsername());
+        getElement(password).sendKeys(user.getPassword());
+        getElement(submit).click();
     }