X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb-bierman02%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Frestconf%2Frestful%2Futils%2FPostDataTransactionUtil.java;h=445e9fbc2f5ca5fd5c9ffcd99f4f647616727ff7;hb=824baf9fe14e31465c58f3842c4cb0aa88b34757;hp=a1e613b005ef173baa69c77e8a0a0c5e30211179;hpb=1bcaf624205de83ea78a131e960103f2b785468c;p=netconf.git diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtil.java index a1e613b005..445e9fbc2f 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtil.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtil.java @@ -7,6 +7,7 @@ */ package org.opendaylight.restconf.restful.utils; +import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; import java.net.URI; import javax.ws.rs.core.Response; @@ -16,10 +17,9 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; -import org.opendaylight.netconf.sal.restconf.impl.ControllerContext; -import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; import org.opendaylight.restconf.common.context.NormalizedNodeContext; +import org.opendaylight.restconf.common.errors.RestconfDocumentedException; import org.opendaylight.restconf.common.references.SchemaContextRef; import org.opendaylight.restconf.restful.transaction.TransactionVarsWrapper; import org.opendaylight.restconf.utils.parser.ParserIdentifier; @@ -40,7 +40,9 @@ import org.slf4j.LoggerFactory; /** * Util class to post data to DS. * + * @deprecated move to splitted module restconf-nb-rfc8040 */ +@Deprecated public final class PostDataTransactionUtil { private static final Logger LOG = LoggerFactory.getLogger(PostDataTransactionUtil.class); @@ -216,7 +218,7 @@ public final class PostDataTransactionUtil { final boolean before, final DOMTransactionChain domTransactionChain) { rwTransaction.delete(datastore, path.getParent().getParent()); final InstanceIdentifierContext instanceIdentifier = - ControllerContext.getInstance().toInstanceIdentifier(point); + ParserIdentifier.toInstanceIdentifier(point, schemaContext, Optional.absent()); int lastItemPosition = 0; for (final LeafSetEntryNode nodeChild : readLeafList.getValue()) { if (nodeChild.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) { @@ -251,7 +253,7 @@ public final class PostDataTransactionUtil { final DOMTransactionChain domTransactionChain) { rwTransaction.delete(datastore, path.getParent().getParent()); final InstanceIdentifierContext instanceIdentifier = - ControllerContext.getInstance().toInstanceIdentifier(point); + ParserIdentifier.toInstanceIdentifier(point, schemaContext, Optional.absent()); int lastItemPosition = 0; for (final MapEntryNode mapEntryNode : readList.getValue()) { if (mapEntryNode.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) {