Mass-migrate to java.util.Optional
[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / BindingMountPointAdapter.java
index ef8c9e3ea5994c5dbf84f7666931d3f3d6fd4bee..d7beecb19124246e9d5f69c8794727107323a25c 100644 (file)
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import com.google.common.base.Optional;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.LoadingCache;
+import java.util.Optional;
 import org.opendaylight.mdsal.binding.api.BindingService;
 import org.opendaylight.mdsal.binding.api.MountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
@@ -27,7 +27,7 @@ public class BindingMountPointAdapter implements MountPoint {
 
             @Override
             protected DOMService getDelegate(final Class<? extends DOMService> reqDeleg) {
-                return domMountPoint.getService(reqDeleg).orNull();
+                return domMountPoint.getService(reqDeleg).orElse(null);
             }
         });
     }
@@ -39,6 +39,6 @@ public class BindingMountPointAdapter implements MountPoint {
 
     @Override
     public <T extends BindingService> Optional<T> getService(final Class<T> service) {
-        return services.getUnchecked(service).transform(service::cast);
+        return services.getUnchecked(service).map(service::cast);
     }
 }