Simplify expressions

Change-Id: I690c65054618c8cf62f8845529377b467d390db5 (cherry picked from commit 9b79bb78)

Simplify expressions
Change-Id: I690c65054618c8cf62f8845529377b467d390db5 (cherry picked from commit 9b79bb78)
Sho SHIMIZU · Sho Shimizu
Commit a4861d4d6d8799297693db9c687b28c9e3082504 a4861d4d 1 parent 09cd6158
Showing 1 changed file with 2 additions and 2 deletions
core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
View file @a4861d4
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
View file @a4861d4
@@ -22,6 +22,7 @@ import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
+ import org.onlab.util.Tools;
 import org.onosproject.net.resource.ContinuousResource;
 import org.onosproject.net.resource.ContinuousResourceId;
 import org.onosproject.net.resource.DiscreteResource;
@@ -169,8 +170,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
                         return continuousTxStore.lookup((ContinuousResourceId) x);
                     }
                 })
-                 .filter(Optional::isPresent)
-                 .map(Optional::get)
+                 .flatMap(Tools::stream)
                 .collect(Collectors.toList());
         // the order is preserved by LinkedHashMap
         Map<DiscreteResourceId, List<Resource>> resourceMap = resources.stream()