Merge pull request eugenp#763 from Sandeep4odesk/master

zhendrikse · web-flow · commit a44be73deb7e · 2016-10-24T23:39:32.000+02:00
Handling Optional as per orElseThrow criteria
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java b/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java
@@ -1,6 +1,7 @@
 package main.java.com.baeldung.selenium;
 
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.concurrent.TimeUnit;
 
 import org.openqa.selenium.By;
@@ -28,16 +29,16 @@ public String getTitle() {
         return webDriver.getTitle();
     }
 
-    public void getAboutBaeldungPage() {
+    public void getAboutBaeldungPage() throws Exception {
         closeOverlay();
         clickAboutLink();
         clickAboutUsLink();
     }
 
-    private void closeOverlay() {
+    private void closeOverlay() throws Exception {
         List<WebElement> webElementList = webDriver.findElements(By.tagName("a"));
-        if (webElementList != null && !webElementList.isEmpty()) {
-            webElementList.stream().filter(webElement -> "Close".equalsIgnoreCase(webElement.getAttribute("title"))).findAny().get().click();
+        if (webElementList != null && !webElementList.isEmpty() && webElementList.stream().filter(webElement -> "Close".equalsIgnoreCase(webElement.getAttribute("title"))).findAny().isPresent()) {
+            webElementList.stream().filter(webElement -> "Close".equalsIgnoreCase(webElement.getAttribute("title"))).findAny().orElseThrow(NoSuchElementException::new).click();
         }
     }
 
@@ -50,8 +51,6 @@ private void clickAboutUsLink() {
     }
 
     public boolean isAuthorInformationAvailable() {
-        return webDriver
-                .findElement(By.xpath("//*[contains(text(), 'Eugen &#65533; an engineer')]"))
-                .isDisplayed();
+        return webDriver.findElement(By.xpath("//*[contains(text(), 'Eugen &#65533; an engineer')]")).isDisplayed();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package main.java.com.baeldung.selenium;`
`2`	`2`
`3`	`3`	`import java.util.List;`
	`4`	`+import java.util.NoSuchElementException;`
`4`	`5`	`import java.util.concurrent.TimeUnit;`
`5`	`6`
`6`	`7`	`import org.openqa.selenium.By;`
`@@ -28,16 +29,16 @@ public String getTitle() {`
`28`	`29`	`return webDriver.getTitle();`
`29`	`30`	`}`
`30`	`31`
`31`		`- public void getAboutBaeldungPage() {`
	`32`	`+ public void getAboutBaeldungPage() throws Exception {`
`32`	`33`	`closeOverlay();`
`33`	`34`	`clickAboutLink();`
`34`	`35`	`clickAboutUsLink();`
`35`	`36`	`}`
`36`	`37`
`37`		`- private void closeOverlay() {`
	`38`	`+ private void closeOverlay() throws Exception {`
`38`	`39`	`List<WebElement> webElementList = webDriver.findElements(By.tagName("a"));`
`39`		`- if (webElementList != null && !webElementList.isEmpty()) {`
`40`		`- webElementList.stream().filter(webElement -> "Close".equalsIgnoreCase(webElement.getAttribute("title"))).findAny().get().click();`
	`40`	`+ if (webElementList != null && !webElementList.isEmpty() && webElementList.stream().filter(webElement -> "Close".equalsIgnoreCase(webElement.getAttribute("title"))).findAny().isPresent()) {`
	`41`	`+ webElementList.stream().filter(webElement -> "Close".equalsIgnoreCase(webElement.getAttribute("title"))).findAny().orElseThrow(NoSuchElementException::new).click();`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`
`@@ -50,8 +51,6 @@ private void clickAboutUsLink() {`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`public boolean isAuthorInformationAvailable() {`
`53`		`- return webDriver`
`54`		`- .findElement(By.xpath("//*[contains(text(), 'Eugen – an engineer')]"))`
`55`		`- .isDisplayed();`
	`54`	`+ return webDriver.findElement(By.xpath("//*[contains(text(), 'Eugen – an engineer')]")).isDisplayed();`
`56`	`55`	`}`
`57`	`56`	`}`