From: Jakub Morvay Date: Thu, 17 Jan 2019 14:11:46 +0000 (+0000) Subject: Merge "Eliminate XmlUtil.createElement(Document, String)" X-Git-Tag: release/neon~29 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=04467f3b89c536d611c54c1ecd6a8da24eb6beef;hp=a056f6b00b493c5c102372668649a5d1507345a9;p=netconf.git Merge "Eliminate XmlUtil.createElement(Document, String)" --- diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java index 4f71ac89c0..53b7ba4a10 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java @@ -10,7 +10,6 @@ package org.opendaylight.netconf.mdsal.connector.ops; import org.opendaylight.netconf.api.DocumentedException; 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.TransactionProvider; import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; import org.slf4j.Logger; @@ -40,7 +39,7 @@ public class Commit extends AbstractSingletonNetconfOperation { boolean commitStatus = transactionProvider.commitTransaction(); LOG.trace("Commit completed successfully {}", commitStatus); - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } @Override diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java index a06dbf82a2..99bb53650c 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java @@ -93,7 +93,7 @@ public final class CopyConfig extends AbstractEdit { ErrorTag.BAD_ELEMENT, ErrorSeverity.ERROR); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } private void copyToCandidate(final XmlElement operationElement) diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java index 3ec15d473d..726a160683 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java @@ -15,7 +15,6 @@ 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.TransactionProvider; import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; import org.slf4j.Logger; @@ -51,7 +50,7 @@ public class DiscardChanges extends AbstractSingletonNetconfOperation { throw new DocumentedException(e.getMessage(), e, ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED, ErrorSeverity.ERROR, errorInfo); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } @Override diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java index dc107b8f65..0fc35ee659 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java @@ -20,7 +20,6 @@ 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.DataTreeChangeTracker.DataTreeChange; @@ -81,7 +80,7 @@ public final class EditConfig extends AbstractEdit { executeOperations(changeTracker); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } private void executeOperations(final DataTreeChangeTracker changeTracker) throws DocumentedException { diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java index 4c0554a358..aac3f1e875 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java @@ -10,7 +10,6 @@ package org.opendaylight.netconf.mdsal.connector.ops; import org.opendaylight.netconf.api.DocumentedException; 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.util.mapping.AbstractSingletonNetconfOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +37,7 @@ public class Lock extends AbstractSingletonNetconfOperation { final Datastore targetDatastore = extractTargetParameter(operationElement); if (targetDatastore == Datastore.candidate) { LOG.debug("Locking candidate datastore on session: {}", getNetconfSessionIdForReporting()); - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } throw new DocumentedException("Unable to lock " + targetDatastore + " datastore", diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java index 00e7506bc5..3690e1cc17 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java @@ -10,7 +10,6 @@ package org.opendaylight.netconf.mdsal.connector.ops; import org.opendaylight.netconf.api.DocumentedException; 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.util.mapping.AbstractSingletonNetconfOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +36,7 @@ public class Unlock extends AbstractSingletonNetconfOperation { final Datastore targetDatastore = Lock.extractTargetParameter(operationElement); if (targetDatastore == Datastore.candidate) { LOG.debug("Unlocking candidate datastore on session: {}", getNetconfSessionIdForReporting()); - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } throw new DocumentedException("Unable to unlock " + targetDatastore + " datastore", diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java index df1657b5bf..165e7eee94 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java @@ -15,7 +15,6 @@ 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.TransactionProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +47,7 @@ public final class Validate extends AbstractConfigOperation { transactionProvider.validateTransaction(); LOG.trace(" request completed successfully on session {}", getNetconfSessionIdForReporting()); - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } protected static Datastore extractSourceParameter(final XmlElement operationElement, final String operationName) diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java index 8dadc6bec1..d26b1fba65 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java @@ -17,7 +17,6 @@ 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; @@ -47,7 +46,7 @@ public class Get extends AbstractGet { final Optional dataRootOptional = getDataRootFromFilter(operationElement); if (!dataRootOptional.isPresent()) { - return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY); + return document.createElement(XmlNetconfConstants.DATA_KEY); } final YangInstanceIdentifier dataRoot = dataRootOptional.get(); @@ -59,7 +58,7 @@ public class Get extends AbstractGet { transactionProvider.abortRunningTransaction(rwTx); if (!normalizedNodeOptional.isPresent()) { - return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY); + return document.createElement(XmlNetconfConstants.DATA_KEY); } return serializeNodeWithParentStructure(document, dataRoot, normalizedNodeOptional.get()); diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java index b23473da54..ef434b80f6 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java @@ -18,7 +18,6 @@ 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; @@ -56,7 +55,7 @@ public class GetConfig extends AbstractGet { final Optional dataRootOptional = getDataRootFromFilter(operationElement); if (!dataRootOptional.isPresent()) { - return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY); + return document.createElement(XmlNetconfConstants.DATA_KEY); } final YangInstanceIdentifier dataRoot = dataRootOptional.get(); @@ -73,7 +72,7 @@ public class GetConfig extends AbstractGet { } if (!normalizedNodeOptional.isPresent()) { - return XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY); + return document.createElement(XmlNetconfConstants.DATA_KEY); } return serializeNodeWithParentStructure(document, dataRoot, normalizedNodeOptional.get()); diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java index b3d9d3e872..d3c4061428 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java @@ -120,22 +120,20 @@ public final class XmlUtil { return DEFAULT_DOM_BUILDER.get().newDocument(); } - public static Element createElement(final Document document, final String qname) { - return createElement(document, qname, Optional.empty()); - } - public static Element createElement(final Document document, final String qname, final Optional namespaceURI) { - if (namespaceURI.isPresent()) { - final Element element = document.createElementNS(namespaceURI.get(), qname); - String name = XMLNS_ATTRIBUTE; - if (element.getPrefix() != null) { - name += ":" + element.getPrefix(); - } - element.setAttributeNS(XMLNS_ATTRIBUTE_NS_URI, name, namespaceURI.get()); - return element; + if (!namespaceURI.isPresent()) { + return document.createElement(qname); } - return document.createElement(qname); + + final String uri = namespaceURI.get(); + final Element element = document.createElementNS(uri, qname); + String name = XMLNS_ATTRIBUTE; + if (element.getPrefix() != null) { + name += ":" + element.getPrefix(); + } + element.setAttributeNS(XMLNS_ATTRIBUTE_NS_URI, name, uri); + return element; } public static Element createTextElement(final Document document, final String qname, final String content, diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java index 1338ccdefd..5a5ae1cc43 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java @@ -12,7 +12,6 @@ import java.util.Collections; import org.opendaylight.netconf.api.DocumentedException; 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.impl.NetconfServerSession; import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; import org.slf4j.Logger; @@ -58,7 +57,7 @@ public class DefaultCloseSession extends AbstractSingletonNetconfOperation imple DocumentedException.ErrorSeverity.ERROR, Collections.singletonMap( DocumentedException.ErrorSeverity.ERROR.toString(), e.getMessage())); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } @Override diff --git a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java index 81c6af23e7..bfc59c2598 100644 --- a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java +++ b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/ops/CreateSubscription.java @@ -16,7 +16,6 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NetconfSession; 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.mapping.api.SessionAwareNetconfOperation; import org.opendaylight.netconf.notifications.NetconfNotification; import org.opendaylight.netconf.notifications.NetconfNotificationListener; @@ -88,7 +87,7 @@ public class CreateSubscription extends AbstractSingletonNetconfOperation .registerNotificationListener(streamNameType, new NotificationSubscription(netconfSession, filter)); subscriptions.add(notificationListenerRegistration); - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } private static StreamNameType parseStreamIfPresent(final XmlElement operationElement) throws DocumentedException { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java index 93ea6eaff8..aa7b3a437e 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java @@ -9,7 +9,6 @@ package org.opendaylight.netconf.test.tool.rpc; 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.util.mapping.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -21,7 +20,7 @@ public class SimulatedCommit extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } @Override diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java index cf6fd1d74a..bf90d9479d 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java @@ -102,7 +102,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im }, delayAggregator, TimeUnit.SECONDS); } } - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } private static NetconfMessage parseNetconfNotification(String content) { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java index 924024c2ba..dc445ab7ff 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java @@ -9,7 +9,6 @@ package org.opendaylight.netconf.test.tool.rpc; 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.util.mapping.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -22,7 +21,7 @@ public class SimulatedDiscardChanges extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } @Override diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java index b2231f2f33..65c222ec67 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java @@ -10,7 +10,6 @@ package org.opendaylight.netconf.test.tool.rpc; import org.opendaylight.netconf.api.DocumentedException; 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.util.mapping.AbstractLastNetconfOperation; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -39,7 +38,7 @@ public class SimulatedEditConfig extends AbstractLastNetconfOperation { storage.setConfigList(configElementData.getChildElements()); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } @Override diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java index e7cc098d96..41821f6b10 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java @@ -9,7 +9,6 @@ package org.opendaylight.netconf.test.tool.rpc; 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.util.mapping.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -25,7 +24,7 @@ public class SimulatedGet extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - final Element element = XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY); + final Element element = document.createElement(XmlNetconfConstants.DATA_KEY); for (final XmlElement e : storage.getConfigList()) { final Element domElement = e.getDomElement(); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java index ca09bb310c..d7b9f09cbd 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java @@ -59,7 +59,7 @@ public class SimulatedGetConfig extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - final Element element = XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY); + final Element element = document.createElement(XmlNetconfConstants.DATA_KEY); for (final XmlElement e : storage.getConfigList()) { final Element domElement = e.getDomElement(); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java index beda99d066..38034de0e8 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java @@ -9,7 +9,6 @@ package org.opendaylight.netconf.test.tool.rpc; 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.util.mapping.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -22,7 +21,7 @@ public class SimulatedLock extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } @Override diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java index 22d27f5c04..99113eff91 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java @@ -9,7 +9,6 @@ package org.opendaylight.netconf.test.tool.rpc; 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.util.mapping.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -22,7 +21,7 @@ public class SimulatedUnLock extends AbstractLastNetconfOperation { @Override protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { - return XmlUtil.createElement(document, XmlNetconfConstants.OK); + return document.createElement(XmlNetconfConstants.OK); } @Override