import static com.google.common.base.Preconditions.checkState;
+import com.google.common.collect.Iterables;
+
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
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;
-import com.google.common.collect.Iterables;
-
public class DataReaderRouter extends
-AbstractDataReadRouter<InstanceIdentifier, CompositeNode> {
+AbstractDataReadRouter<YangInstanceIdentifier, CompositeNode> {
private final static Logger LOG = LoggerFactory
.getLogger(DataReaderRouter.class);
private final static URI NETCONF_NAMESPACE = URI
"data");
@Override
- protected CompositeNodeTOImpl merge(final InstanceIdentifier path,
+ protected CompositeNodeTOImpl merge(final YangInstanceIdentifier path,
final Iterable<CompositeNode> data) {
- PathArgument pathArgument = Iterables.getLast(path.getPath(), null);
+ PathArgument pathArgument = Iterables.getLast(path.getPathArguments(), null);
boolean empty = true;
QName name = (pathArgument == null ? null : pathArgument.getNodeType());
final ArrayList<Node<?>> nodes = new ArrayList<Node<?>>();
"Only one simple node for key $s is allowed in node $s",
keyValue.getKey(), node);
checkState(
- simpleNode.get(0).getValue() == keyValue.getValue(),
+ simpleNode.get(0).getValue().equals(keyValue.getValue()),
"Key node must equal to instance identifier value in node $s",
node);
ret.put(keyValue.getKey(), simpleNode.get(0));
}
public Map<QName, SimpleNode<?>> 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);