X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2FBindingDOMWriteTransactionAdapter.java;h=c0a71543e306eaa35786c59ad7b59797bf4b5cf3;hp=88c8bf5a9994227a194c0dd68b4334e0c81794b7;hb=40fb1fe3e59d720771af163ac344719b84bc86b4;hpb=b830d5ede22e323fe724cd747fe99280dfa2240d diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java index 88c8bf5a99..c0a71543e3 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.md.sal.binding.impl; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; @@ -22,6 +21,7 @@ import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import com.google.common.util.concurrent.CheckedFuture; @@ -52,16 +52,14 @@ class BindingDOMWriteTransactionAdapter exten final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier normalizedPath, final InstanceIdentifier path) { List currentArguments = new ArrayList<>(); DataNormalizationOperation currentOp = getCodec().getDataNormalizer().getRootOperation(); - Iterator iterator = normalizedPath.getPathArguments().iterator(); - while (iterator.hasNext()) { - PathArgument currentArg = iterator.next(); + for (PathArgument currentArg : normalizedPath.getPathArguments()) { try { currentOp = currentOp.getChild(currentArg); } catch (DataNormalizationException e) { throw new IllegalArgumentException(String.format("Invalid child encountered in path %s", path), e); } currentArguments.add(currentArg); - org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier currentPath = org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.create( + YangInstanceIdentifier currentPath = YangInstanceIdentifier.create( currentArguments); getDelegate().merge(store, currentPath, currentOp.createDefault(currentArg));