Remove BindingReflections.resolveRpc{In,Out}putClass()

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / BindingDOMMountPointServiceAdapter.java

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java
index 54067583a40fc57d84737ae1f1262c6e849f63fd..75742fb76612ddc33c100e12514796339766025a 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java
@@ -7,10 +7,7 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import com.google.common.base.Optional;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import java.util.Optional;
 import org.opendaylight.mdsal.binding.api.MountPoint;
 import org.opendaylight.mdsal.binding.api.MountPointService;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
@@ -18,42 +15,30 @@ import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class BindingDOMMountPointServiceAdapter implements MountPointService {
-    public static final Logger LOG = LoggerFactory.getLogger(BindingDOMMountPointServiceAdapter.class);
-
-    private final BindingToNormalizedNodeCodec codec;
-    private final DOMMountPointService mountService;
-    private final LoadingCache<DOMMountPoint, BindingMountPointAdapter> bindingMountpoints = CacheBuilder.newBuilder()
-            .weakKeys().build(new CacheLoader<DOMMountPoint, BindingMountPointAdapter>() {
-
-                @Override
-                public BindingMountPointAdapter load(final DOMMountPoint key) {
-                    return new BindingMountPointAdapter(codec,key);
-                }
-            });
-
-    public BindingDOMMountPointServiceAdapter(final DOMMountPointService mountService,
-            final BindingToNormalizedNodeCodec codec) {
-        this.codec = codec;
-        this.mountService = mountService;
+public class BindingDOMMountPointServiceAdapter
+        extends AbstractBindingLoadingAdapter<DOMMountPointService, DOMMountPoint, BindingMountPointAdapter>
+        implements MountPointService {
+    public BindingDOMMountPointServiceAdapter(final AdapterContext adapterContext,
+            final DOMMountPointService mountService) {
+        super(adapterContext, mountService);
     }
 
     @Override
     public Optional<MountPoint> getMountPoint(final InstanceIdentifier<?> mountPoint) {
-        YangInstanceIdentifier domPath = codec.toYangInstanceIdentifierBlocking(mountPoint);
-        Optional<DOMMountPoint> domMount = mountService.getMountPoint(domPath);
-        if (domMount.isPresent()) {
-            return Optional.fromNullable(bindingMountpoints.getUnchecked(domMount.get()));
-        }
-        return Optional.absent();
+        YangInstanceIdentifier domPath = currentSerializer().toCachedYangInstanceIdentifier(mountPoint);
+        Optional<DOMMountPoint> domMount = getDelegate().getMountPoint(domPath);
+        return domMount.map(this::getAdapter);
     }
 
     @Override
     public <T extends MountPointListener> ListenerRegistration<T> registerListener(final InstanceIdentifier<?> path,
             final T listener) {
-        return new BindingDOMMountPointListenerAdapter<>(listener, codec, mountService);
+        return new BindingDOMMountPointListenerAdapter<>(listener, adapterContext(), getDelegate());
+    }
+
+    @Override
+    BindingMountPointAdapter loadAdapter(final DOMMountPoint key) {
+        return new BindingMountPointAdapter(adapterContext(), key);
     }
 }