From 55c2b3a3386322d2d7f9161e628bac95f19c7f44 Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Tue, 6 Dec 2016 22:15:21 +0100
Subject: [PATCH] Refactor Optional examples

---
 .../baeldung/java8/optional/OptionalTest.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java b/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java
index 672c4f4aba..8aeaf2b9f7 100644
--- a/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java
+++ b/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java
@@ -1,18 +1,15 @@
 package com.baeldung.java8.optional;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import com.baeldung.optional.Modem;
+import com.baeldung.optional.Person;
+import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 
-import org.junit.Test;
-
-import com.baeldung.optional.Person;
-import com.baeldung.optional.Modem;
+import static org.junit.Assert.*;
 
 public class OptionalTest {
     // creating Optional
@@ -122,9 +119,11 @@ public class OptionalTest {
     }
 
     public boolean priceIsInRange2(Modem modem2) {
-        Optional<Modem> modemOptional = Optional.ofNullable(modem2);
-        boolean isInRange = modemOptional.filter(modem -> Optional.ofNullable(modem.getPrice()).orElse(-1.0) >= 10 && modem.getPrice() <= 15).isPresent();
-        return isInRange;
+        return Optional.ofNullable(modem2)
+          .map(Modem::getPrice)
+          .filter(p -> p >= 10)
+          .filter(p -> p <= 15)
+          .isPresent();
     }
     // Transforming Value With map()
     @Test