Streamline GlobalContext retrieving

We do not have to use flatMap or additional Optional to get
EfffectiveModelContext from DOMSchemaService.

Use just DOMSchemaService::getGlobalContext method reference instead.

Change-Id: I0cbcf59bc65ba84bdcf6c5c921c6628b255af97d
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java
index c9083d38ba6c481cf9790419ac1e83ce856d284e..8ca93647fd285a9506959bc155114d26477c5605 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
-import java.util.Optional;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
@@ -269,7 +268,7 @@ public final class ParserIdentifier {
 
     private static EffectiveModelContext modelContext(final DOMMountPoint mountPoint) {
         return mountPoint.getService(DOMSchemaService.class)
-            .flatMap(svc -> Optional.ofNullable(svc.getGlobalContext()))
+            .map(DOMSchemaService::getGlobalContext)
             .orElse(null);
     }
 }

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApi.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApi.java
index 61b680c517a8d3e3300ee0a82db4b647e8aa33b9..2da154bae6cc06a0533062918bdfe6580f9ed8c9 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApi.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/mountpoints/MountPointOpenApi.java
@@ -26,7 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.ws.rs.HttpMethod;
@@ -156,7 +155,7 @@ public class MountPointOpenApi implements DOMMountPointListener, AutoCloseable {
         checkState(mountService != null);
         return mountService.getMountPoint(id)
             .flatMap(mountPoint -> mountPoint.getService(DOMSchemaService.class))
-            .flatMap(svc -> Optional.ofNullable(svc.getGlobalContext()))
+            .map(DOMSchemaService::getGlobalContext)
             .orElse(null);
     }