import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
import org.opendaylight.netconf.api.DocumentedException;
-import org.opendaylight.netconf.api.DocumentedException.ErrorSeverity;
import org.opendaylight.netconf.api.DocumentedException.ErrorTag;
-import org.opendaylight.netconf.api.DocumentedException.ErrorType;
import org.opendaylight.netconf.api.xml.XmlElement;
import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.api.xml.XmlUtil;
import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext;
import org.opendaylight.netconf.mdsal.connector.TransactionProvider;
import org.opendaylight.netconf.mdsal.connector.ops.Datastore;
+import org.opendaylight.yangtools.yang.common.ErrorSeverity;
+import org.opendaylight.yangtools.yang.common.ErrorType;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.slf4j.Logger;
throws DocumentedException {
final Optional<YangInstanceIdentifier> dataRootOptional = getDataRootFromFilter(operationElement);
- if (!dataRootOptional.isPresent()) {
- return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY);
+ if (dataRootOptional.isEmpty()) {
+ return document.createElement(XmlNetconfConstants.DATA_KEY);
}
final YangInstanceIdentifier dataRoot = dataRootOptional.get();
final DOMDataTreeReadWriteTransaction rwTx = getTransaction(Datastore.running);
try {
- final java.util.Optional<NormalizedNode<?, ?>> normalizedNodeOptional = rwTx.read(
+ final Optional<NormalizedNode> normalizedNodeOptional = rwTx.read(
LogicalDatastoreType.OPERATIONAL, dataRoot).get();
transactionProvider.abortRunningTransaction(rwTx);
- if (!normalizedNodeOptional.isPresent()) {
- return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY);
+ if (normalizedNodeOptional.isEmpty()) {
+ return document.createElement(XmlNetconfConstants.DATA_KEY);
}
return serializeNodeWithParentStructure(document, dataRoot, normalizedNodeOptional.get());