X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fdom%2Fbroker%2Fimpl%2FDataReaderRouter.java;h=c03ae7317737abe4029e608d5e77560c83b665e2;hb=1e12c13aaec75493f70dd759208181f45c385102;hp=4b5b86d0dafd2cc08df1f7c9a31086350e3b3512;hpb=7e24111a0842d66187c752022aa975c411b42cca;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/DataReaderRouter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/DataReaderRouter.java index 4b5b86d0da..c03ae73177 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/DataReaderRouter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/DataReaderRouter.java @@ -25,17 +25,17 @@ import java.util.Set; import org.opendaylight.controller.md.sal.common.impl.routing.AbstractDataReadRouter; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifierWithPredicates; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.Node; import org.opendaylight.yangtools.yang.data.api.SimpleNode; import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DataReaderRouter extends -AbstractDataReadRouter { +@Deprecated +public class DataReaderRouter extends AbstractDataReadRouter { private final static Logger LOG = LoggerFactory .getLogger(DataReaderRouter.class); private final static URI NETCONF_NAMESPACE = URI @@ -44,7 +44,7 @@ AbstractDataReadRouter { "data"); @Override - protected CompositeNodeTOImpl merge(final InstanceIdentifier path, + protected CompositeNodeTOImpl merge(final YangInstanceIdentifier path, final Iterable data) { PathArgument pathArgument = Iterables.getLast(path.getPathArguments(), null); boolean empty = true; @@ -117,11 +117,11 @@ AbstractDataReadRouter { } public Map> getKeyNodes( - final InstanceIdentifier.PathArgument argument, + final YangInstanceIdentifier.PathArgument argument, final CompositeNode node) { - if (argument instanceof InstanceIdentifier.NodeIdentifierWithPredicates) { + if (argument instanceof YangInstanceIdentifier.NodeIdentifierWithPredicates) { return _getKeyNodes( - (InstanceIdentifier.NodeIdentifierWithPredicates) argument, + (YangInstanceIdentifier.NodeIdentifierWithPredicates) argument, node); } else if (argument != null) { return _getKeyNodes(argument, node);