From: Robert Varga Date: Thu, 10 Nov 2022 16:43:38 +0000 (+0100) Subject: Remove AbstractNotificationsData.writeNormalizedNode() X-Git-Tag: v5.0.0~115 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=81e1dfc894f9cd124b5d1cc3298cc5f4f1fe897f;p=netconf.git Remove AbstractNotificationsData.writeNormalizedNode() This method is not used anywhere, remove it. Change-Id: I673edab4eb06115d1926586d40ab0877d6d38828 Signed-off-by: Robert Varga --- diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractNotificationsData.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractNotificationsData.java index b96593465c..3a2fc930c7 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractNotificationsData.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractNotificationsData.java @@ -9,20 +9,15 @@ package org.opendaylight.restconf.nb.rfc8040.streams.listeners; import com.google.common.util.concurrent.ListenableFuture; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.nio.charset.StandardCharsets; import java.time.Instant; import java.time.OffsetDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -32,12 +27,6 @@ import org.opendaylight.restconf.nb.rfc8040.Rfc8040; import org.opendaylight.restconf.nb.rfc8040.handlers.SchemaContextHandler; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; -import org.opendaylight.yangtools.yang.data.codec.xml.XMLStreamNormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -49,7 +38,6 @@ import org.w3c.dom.Element; abstract class AbstractNotificationsData { private static final Logger LOG = LoggerFactory.getLogger(AbstractNotificationsData.class); private static final TransformerFactory TF = TransformerFactory.newInstance(); - private static final XMLOutputFactory OF = XMLOutputFactory.newInstance(); private final String localName; @@ -103,48 +91,6 @@ abstract class AbstractNotificationsData { return UntrustedXML.newDocumentBuilder().newDocument(); } - /** - * Write normalized node to {@link DOMResult}. - * - * @param normalized - * data - * @param context - * actual schema context - * @param schemaPath - * schema path of data - * @return {@link DOMResult} - */ - protected DOMResult writeNormalizedNode(final NormalizedNode normalized, final EffectiveModelContext context, - final SchemaPath schemaPath) throws IOException, XMLStreamException { - final Document doc = UntrustedXML.newDocumentBuilder().newDocument(); - final DOMResult result = new DOMResult(doc); - NormalizedNodeWriter normalizedNodeWriter = null; - NormalizedNodeStreamWriter normalizedNodeStreamWriter = null; - XMLStreamWriter writer = null; - - try { - writer = OF.createXMLStreamWriter(result); - normalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.create(writer, context, schemaPath); - normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(normalizedNodeStreamWriter); - - normalizedNodeWriter.write(normalized); - - normalizedNodeWriter.flush(); - } finally { - if (normalizedNodeWriter != null) { - normalizedNodeWriter.close(); - } - if (normalizedNodeStreamWriter != null) { - normalizedNodeStreamWriter.close(); - } - if (writer != null) { - writer.close(); - } - } - - return result; - } - /** * Generating base element of every notification. *