From ac17f540b6d2a1c52cf8d0a7f2f99e37ab0bd268 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 4 Sep 2014 12:26:44 +0200 Subject: [PATCH] Prefer InstanceIdentifier imports InstanceIdentifier/YangInstanceIdentifier are now separate, so we can import them at the same time. Do precisely that. Change-Id: I54a5cd49ef7b8584a5b09a12ab97e132fb92cb57 Signed-off-by: Robert Varga --- .../md/sal/binding/impl/RuntimeMappingModule.java | 13 ++++++------- .../impl/AbstractForwardedTransaction.java | 15 +++++++-------- .../sal/binding/impl/MountPointManagerImpl.java | 8 +++----- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java index a15b1d746c..754d14f2c4 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java @@ -22,6 +22,7 @@ import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadi import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl; import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.RpcService; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.CompositeNode; @@ -38,8 +39,7 @@ import org.slf4j.LoggerFactory; /** * */ -public final class RuntimeMappingModule extends - org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRuntimeMappingModule { +public final class RuntimeMappingModule extends AbstractRuntimeMappingModule { private static final Logger LOG = LoggerFactory.getLogger(RuntimeMappingModule.class); @@ -138,25 +138,24 @@ public final class RuntimeMappingModule extends @Override public Entry toDataDom( - final Entry, DataObject> entry) { + final Entry, DataObject> entry) { return delegate.toDataDom(entry); } @Override - public YangInstanceIdentifier toDataDom( - final org.opendaylight.yangtools.yang.binding.InstanceIdentifier path) { + public YangInstanceIdentifier toDataDom(final InstanceIdentifier path) { return delegate.toDataDom(path); } @Override public DataObject dataObjectFromDataDom( - final org.opendaylight.yangtools.yang.binding.InstanceIdentifier path, + final InstanceIdentifier path, final CompositeNode result) throws DeserializationException { return delegate.dataObjectFromDataDom(path, result); } @Override - public org.opendaylight.yangtools.yang.binding.InstanceIdentifier fromDataDom(final YangInstanceIdentifier entry) + public InstanceIdentifier fromDataDom(final YangInstanceIdentifier entry) throws DeserializationException { return delegate.fromDataDom(entry); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java index 96a3f1cc3b..088e2283d7 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java @@ -7,6 +7,10 @@ */ package org.opendaylight.controller.md.sal.binding.impl; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.Futures; import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; @@ -15,15 +19,10 @@ import org.opendaylight.yangtools.concepts.Delegator; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.util.concurrent.MappingCheckedFuture; import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.Futures; - - abstract class AbstractForwardedTransaction>> implements Delegator, Identifiable { @@ -56,9 +55,9 @@ abstract class AbstractForwardedTransaction CheckedFuture,ReadFailedException> doRead( + protected final CheckedFuture,ReadFailedException> doRead( final DOMDataReadTransaction readTx, final LogicalDatastoreType store, - final org.opendaylight.yangtools.yang.binding.InstanceIdentifier path) { + final InstanceIdentifier path) { return MappingCheckedFuture.create( Futures.transform(readTx.read(store, codec.toNormalized(path)), diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/MountPointManagerImpl.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/MountPointManagerImpl.java index c390fe7049..c3f46b2a62 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/MountPointManagerImpl.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/MountPointManagerImpl.java @@ -7,10 +7,11 @@ */ package org.opendaylight.controller.sal.binding.impl; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executors; - import org.opendaylight.controller.md.sal.binding.util.AbstractBindingSalProviderInstance; import org.opendaylight.controller.sal.binding.api.mount.MountProviderInstance; import org.opendaylight.controller.sal.binding.api.mount.MountProviderService; @@ -20,9 +21,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; - public class MountPointManagerImpl implements MountProviderService { public final Logger LOG = LoggerFactory.getLogger(MountPointManagerImpl.class); @@ -113,7 +111,7 @@ public class MountPointManagerImpl implements MountProviderService { private final InstanceIdentifier identifier; - public BindingMountPointImpl(final org.opendaylight.yangtools.yang.binding.InstanceIdentifier identifier, + public BindingMountPointImpl(final InstanceIdentifier identifier, final RpcProviderRegistryImpl rpcRegistry, final NotificationBrokerImpl notificationBroker, final DataBrokerImpl dataBroker) { super(rpcRegistry, notificationBroker, dataBroker); -- 2.36.6