Eliminate some more references to SchemaService

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / main / java / org / opendaylight / controller / md / sal / binding / impl / BindingDOMMountPointServiceAdapter.java

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java
index 3a63fba7301b78f891f0402dcdf07ab0f92c6c2e..8b88f0f5c01348ee3bacd9a4277682f699d7505b 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java
@@ -29,7 +29,7 @@ public class BindingDOMMountPointServiceAdapter implements MountPointService {
     private final BindingToNormalizedNodeCodec codec;
     private final DOMMountPointService mountService;
     private final LoadingCache<DOMMountPoint, BindingMountPointAdapter> bindingMountpoints = CacheBuilder.newBuilder()
-            .build(new CacheLoader<DOMMountPoint, BindingMountPointAdapter>() {
+            .weakKeys().build(new CacheLoader<DOMMountPoint, BindingMountPointAdapter>() {
 
                 @Override
                 public BindingMountPointAdapter load(DOMMountPoint key) throws Exception {
@@ -45,7 +45,7 @@ public class BindingDOMMountPointServiceAdapter implements MountPointService {
     @Override
     public Optional<MountPoint> getMountPoint(InstanceIdentifier<?> mountPoint) {
 
-        YangInstanceIdentifier domPath = codec.toNormalized(mountPoint);
+        YangInstanceIdentifier domPath = codec.toYangInstanceIdentifierBlocking(mountPoint);
         Optional<DOMMountPoint> domMount = mountService.getMountPoint(domPath);
         if(domMount.isPresent()) {
             return Optional.<MountPoint>fromNullable(bindingMountpoints.getUnchecked(domMount.get()));
@@ -56,7 +56,7 @@ public class BindingDOMMountPointServiceAdapter implements MountPointService {
     @Override
     public <T extends MountPointListener> ListenerRegistration<T> registerListener(InstanceIdentifier<?> path,
             T listener) {
-        return new BindingDOMMountPointListenerAdapter<T>(listener,codec,mountService);
+        return new BindingDOMMountPointListenerAdapter<>(listener, codec, mountService);
     }
 
 }