*/
package org.opendaylight.controller.md.sal.binding.impl;
+import com.google.common.annotations.VisibleForTesting;
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 org.gaul.modernizer_maven_annotations.SuppressModernizer;
import org.opendaylight.controller.md.sal.binding.api.MountPoint;
import org.opendaylight.controller.md.sal.binding.api.MountPointService;
import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
+@Deprecated(forRemoval = true)
public class BindingDOMMountPointServiceAdapter implements MountPointService {
-
- public static final Logger LOG = LoggerFactory.getLogger(BindingDOMMountPointServiceAdapter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BindingDOMMountPointServiceAdapter.class);
private final BindingToNormalizedNodeCodec codec;
private final DOMMountPointService mountService;
- private final LoadingCache<DOMMountPoint, BindingMountPointAdapter> bindingMountpoints = CacheBuilder.newBuilder()
- .build(new CacheLoader<DOMMountPoint, BindingMountPointAdapter>() {
-
+ @VisibleForTesting
+ final LoadingCache<DOMMountPoint, BindingMountPointAdapter> bindingMountpoints = CacheBuilder.newBuilder()
+ .weakKeys().weakValues().build(new CacheLoader<DOMMountPoint, BindingMountPointAdapter>() {
@Override
- public BindingMountPointAdapter load(DOMMountPoint key) throws Exception {
- return new BindingMountPointAdapter(codec,key);
+ public BindingMountPointAdapter load(final DOMMountPoint key) {
+ return new BindingMountPointAdapter(codec, key);
}
});
- public BindingDOMMountPointServiceAdapter(DOMMountPointService mountService,BindingToNormalizedNodeCodec codec) {
+ public BindingDOMMountPointServiceAdapter(final DOMMountPointService mountService,
+ final BindingToNormalizedNodeCodec codec) {
this.codec = codec;
this.mountService = mountService;
}
@Override
- public Optional<MountPoint> getMountPoint(InstanceIdentifier<?> mountPoint) {
+ @SuppressModernizer
+ public Optional<MountPoint> getMountPoint(final InstanceIdentifier<?> mountPoint) {
- YangInstanceIdentifier domPath = codec.toNormalized(mountPoint);
+ YangInstanceIdentifier domPath = codec.toYangInstanceIdentifierBlocking(mountPoint);
Optional<DOMMountPoint> domMount = mountService.getMountPoint(domPath);
- if(domMount.isPresent()) {
+ if (domMount.isPresent()) {
return Optional.<MountPoint>fromNullable(bindingMountpoints.getUnchecked(domMount.get()));
}
return Optional.absent();
}
@Override
- public <T extends MountPointListener> ListenerRegistration<T> registerListener(InstanceIdentifier<?> path,
- T listener) {
- return new BindingDOMMountPointListenerAdapter<T>(listener,codec,mountService);
+ public <T extends MountPointListener> ListenerRegistration<T> registerListener(final InstanceIdentifier<?> path,
+ final T listener) {
+ return new BindingDOMMountPointListenerAdapter<>(listener, codec, mountService);
}
-
}