Simplify BindingMountPointAdapter

Use Optional.transform() instead of explicit presence check.

Change-Id: I19f1ef6b49c9f9a4455366258f6edae8c9e790ac
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java
index c39196de35433a5d8db9fd7f64c2607d0a00c4c0..ef8c9e3ea5994c5dbf84f7666931d3f3d6fd4bee 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java
@@ -16,7 +16,6 @@ import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-
 public class BindingMountPointAdapter implements MountPoint {
 
     private final InstanceIdentifier<?> identifier;
@@ -27,7 +26,7 @@ public class BindingMountPointAdapter implements MountPoint {
         services = CacheBuilder.newBuilder().build(new BindingDOMAdapterLoader(codec) {
 
             @Override
-            protected DOMService getDelegate(Class<? extends DOMService> reqDeleg) {
+            protected DOMService getDelegate(final Class<? extends DOMService> reqDeleg) {
                 return domMountPoint.getService(reqDeleg).orNull();
             }
         });
@@ -39,12 +38,7 @@ public class BindingMountPointAdapter implements MountPoint {
     }
 
     @Override
-    public <T extends BindingService> Optional<T> getService(Class<T> service) {
-        Optional<BindingService> potential = services.getUnchecked(service);
-        if (potential.isPresent()) {
-            return Optional.of(service.cast(potential.get()));
-        }
-        return Optional.absent();
+    public <T extends BindingService> Optional<T> getService(final Class<T> service) {
+        return services.getUnchecked(service).transform(service::cast);
     }
-
 }