[IIDM v1.5] Removed deprecated NetworkXmlWriterContext::getExtensionW…

…riter (#279) (#301) * Removed deprecated NetworkXmlWriterContext::getExtensionWriter (#279) Signed-off-by: Sébastien LAIGRE <[email protected]> Co-authored-by: Mathieu BAGUE <[email protected]>
powsybl · Apr 13, 2021 · fa59a54 · fa59a54
1 parent 536e7ff
commit fa59a54
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 47 deletions.
diff --git a/extensions/entsoe/src/EntsoeAreaXmlSerializer.cpp b/extensions/entsoe/src/EntsoeAreaXmlSerializer.cpp
@@ -43,7 +43,7 @@ Extension& EntsoeAreaXmlSerializer::read(Extendable& extendable, converter::xml:
 
 void EntsoeAreaXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& entsoeArea = safeCast<EntsoeArea>(extension);
-    context.getExtensionsWriter().writeCharacters(Enum::toString<EntsoeGeographicalCode>(entsoeArea.getCode()));
+    context.getWriter().writeCharacters(Enum::toString<EntsoeGeographicalCode>(entsoeArea.getCode()));
 }
 
 }  // namespace entsoe

diff --git a/extensions/entsoe/src/MergedXnodeXmlSerializer.cpp b/extensions/entsoe/src/MergedXnodeXmlSerializer.cpp
@@ -45,13 +45,13 @@ Extension& MergedXnodeXmlSerializer::read(Extendable& extendable, converter::xml
 
 void MergedXnodeXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& mergedXnode = safeCast<MergedXnode>(extension);
-    context.getExtensionsWriter().writeAttribute("rdp", mergedXnode.getRdp());
-    context.getExtensionsWriter().writeAttribute("xdp", mergedXnode.getXdp());
-    context.getExtensionsWriter().writeAttribute("xnodeP1", mergedXnode.getXnodeP1());
-    context.getExtensionsWriter().writeAttribute("xnodeQ1", mergedXnode.getXnodeQ1());
-    context.getExtensionsWriter().writeAttribute("xnodeP2", mergedXnode.getXnodeP2());
-    context.getExtensionsWriter().writeAttribute("xnodeQ2", mergedXnode.getXnodeQ2());
-    context.getExtensionsWriter().writeAttribute("code", mergedXnode.getCode());
+    context.getWriter().writeAttribute("rdp", mergedXnode.getRdp());
+    context.getWriter().writeAttribute("xdp", mergedXnode.getXdp());
+    context.getWriter().writeAttribute("xnodeP1", mergedXnode.getXnodeP1());
+    context.getWriter().writeAttribute("xnodeQ1", mergedXnode.getXnodeQ1());
+    context.getWriter().writeAttribute("xnodeP2", mergedXnode.getXnodeP2());
+    context.getWriter().writeAttribute("xnodeQ2", mergedXnode.getXnodeQ2());
+    context.getWriter().writeAttribute("code", mergedXnode.getCode());
 }
 
 }  // namespace entsoe

diff --git a/extensions/entsoe/src/XnodeXmlSerializer.cpp b/extensions/entsoe/src/XnodeXmlSerializer.cpp
@@ -38,7 +38,7 @@ Extension& XnodeXmlSerializer::read(Extendable& extendable, converter::xml::Netw
 
 void XnodeXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& xnode = safeCast<Xnode>(extension);
-    context.getExtensionsWriter().writeAttribute("code", xnode.getCode());
+    context.getWriter().writeAttribute("code", xnode.getCode());
 }
 
 }  // namespace entsoe

diff --git a/extensions/iidm/src/ActivePowerControlXmlSerializer.cpp b/extensions/iidm/src/ActivePowerControlXmlSerializer.cpp
@@ -45,8 +45,8 @@ Extension& ActivePowerControlXmlSerializer::read(Extendable& extendable, convert
 void ActivePowerControlXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& apc = safeCast<ActivePowerControl>(extension);
 
-    context.getExtensionsWriter().writeAttribute("participate", apc.isParticipate());
-    context.getExtensionsWriter().writeAttribute("droop", apc.getDroop());
+    context.getWriter().writeAttribute("participate", apc.isParticipate());
+    context.getWriter().writeAttribute("droop", apc.getDroop());
 }
 
 }  // namespace iidm

diff --git a/extensions/iidm/src/CoordinatedReactiveControlXmlSerializer.cpp b/extensions/iidm/src/CoordinatedReactiveControlXmlSerializer.cpp
@@ -43,7 +43,7 @@ Extension& CoordinatedReactiveControlXmlSerializer::read(Extendable& extendable,
 
 void CoordinatedReactiveControlXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& crc = safeCast<CoordinatedReactiveControl>(extension);
-    context.getExtensionsWriter().writeAttribute("qPercent", crc.getQPercent());
+    context.getWriter().writeAttribute("qPercent", crc.getQPercent());
 }
 
 }  // namespace iidm

diff --git a/extensions/iidm/src/ThreeWindingsTransformerPhaseAngleClockXmlSerializer.cpp b/extensions/iidm/src/ThreeWindingsTransformerPhaseAngleClockXmlSerializer.cpp
@@ -45,8 +45,8 @@ Extension& ThreeWindingsTransformerPhaseAngleClockXmlSerializer::read(Extendable
     void ThreeWindingsTransformerPhaseAngleClockXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
         const auto& ext = safeCast<ThreeWindingsTransformerPhaseAngleClock>(extension);
 
-        context.getExtensionsWriter().writeOptionalAttribute("phaseAngleClockLeg2", ext.getPhaseAngleClockLeg2(), 0UL);
-        context.getExtensionsWriter().writeOptionalAttribute("phaseAngleClockLeg3", ext.getPhaseAngleClockLeg3(), 0UL);
+        context.getWriter().writeOptionalAttribute("phaseAngleClockLeg2", ext.getPhaseAngleClockLeg2(), 0UL);
+        context.getWriter().writeOptionalAttribute("phaseAngleClockLeg3", ext.getPhaseAngleClockLeg3(), 0UL);
     }
 
 }  // namespace iidm

diff --git a/extensions/iidm/src/TwoWindingsTransformerPhaseAngleClockXmlSerializer.cpp b/extensions/iidm/src/TwoWindingsTransformerPhaseAngleClockXmlSerializer.cpp
@@ -42,7 +42,7 @@ Extension& TwoWindingsTransformerPhaseAngleClockXmlSerializer::read(Extendable&
 void TwoWindingsTransformerPhaseAngleClockXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& ext = safeCast<TwoWindingsTransformerPhaseAngleClock>(extension);
 
-    context.getExtensionsWriter().writeOptionalAttribute("phaseAngleClock", ext.getPhaseAngleClock(), 0UL);
+    context.getWriter().writeOptionalAttribute("phaseAngleClock", ext.getPhaseAngleClock(), 0UL);
 }
 
 }  // namespace iidm

diff --git a/extensions/iidm/src/VoltagePerReactivePowerControlXmlSerializer.cpp b/extensions/iidm/src/VoltagePerReactivePowerControlXmlSerializer.cpp
@@ -40,7 +40,7 @@ Extension& VoltagePerReactivePowerControlXmlSerializer::read(Extendable& extenda
 void VoltagePerReactivePowerControlXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& ext = safeCast<VoltagePerReactivePowerControl>(extension);
 
-    context.getExtensionsWriter().writeAttribute("slope", ext.getSlope());
+    context.getWriter().writeAttribute("slope", ext.getSlope());
 }
 
 }  // namespace iidm

diff --git a/extensions/sld/src/BusbarSectionPositionXmlSerializer.cpp b/extensions/sld/src/BusbarSectionPositionXmlSerializer.cpp
@@ -39,8 +39,8 @@ Extension& BusbarSectionPositionXmlSerializer::read(Extendable& extendable, conv
 
 void BusbarSectionPositionXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& busbarSectionPosition = safeCast<BusbarSectionPosition>(extension);
-    context.getExtensionsWriter().writeAttribute("busbarIndex", busbarSectionPosition.getBusbarIndex());
-    context.getExtensionsWriter().writeAttribute("sectionIndex", busbarSectionPosition.getSectionIndex());
+    context.getWriter().writeAttribute("busbarIndex", busbarSectionPosition.getBusbarIndex());
+    context.getWriter().writeAttribute("sectionIndex", busbarSectionPosition.getSectionIndex());
 }
 
 }  // namespace sld

diff --git a/extensions/sld/src/ConnectablePositionXmlSerializer.cpp b/extensions/sld/src/ConnectablePositionXmlSerializer.cpp
@@ -82,11 +82,11 @@ void ConnectablePositionXmlSerializer::writePosition(const ConnectablePosition::
     if (index) {
         elementName += std::to_string(*index);
     }
-    context.getExtensionsWriter().writeStartElement(getNamespacePrefix(), elementName);
-    context.getExtensionsWriter().writeAttribute("name", feeder.getName());
-    context.getExtensionsWriter().writeAttribute("order", feeder.getOrder());
-    context.getExtensionsWriter().writeAttribute("direction", Enum::toString(feeder.getDirection()));
-    context.getExtensionsWriter().writeEndElement();
+    context.getWriter().writeStartElement(getNamespacePrefix(), elementName);
+    context.getWriter().writeAttribute("name", feeder.getName());
+    context.getWriter().writeAttribute("order", feeder.getOrder());
+    context.getWriter().writeAttribute("direction", Enum::toString(feeder.getDirection()));
+    context.getWriter().writeEndElement();
 }
 
 }  // namespace sld

diff --git a/include/powsybl/iidm/converter/xml/NetworkXmlWriterContext.hpp b/include/powsybl/iidm/converter/xml/NetworkXmlWriterContext.hpp
@@ -51,8 +51,6 @@ class NetworkXmlWriterContext {
 
     const std::string& getExtensionVersion(const std::string& extensionName) const;
 
-    powsybl::xml::XmlStreamWriter& getExtensionsWriter();
-
     const BusFilter& getFilter() const;
 
     const ExportOptions& getOptions() const;
@@ -63,13 +61,9 @@ class NetworkXmlWriterContext {
 
     bool isExportedEquipment(const std::string& id);
 
-    void setExtensionsWriter(powsybl::xml::XmlStreamWriter& extensionsWriter);
-
 private:
     powsybl::xml::XmlStreamWriter& m_writer;
 
-    std::reference_wrapper<powsybl::xml::XmlStreamWriter> m_extensionsWriter;
-
     std::unique_ptr<Anonymizer> m_anonymizer;
 
     ExportOptions m_options;

diff --git a/src/iidm/converter/xml/NetworkXml.cpp b/src/iidm/converter/xml/NetworkXml.cpp
@@ -163,7 +163,7 @@ void writeExtensionNamespaces(const Network& network, NetworkXmlWriterContext& c
 }
 
 void writeExtension(const Extension& extension, NetworkXmlWriterContext& context) {
-    powsybl::xml::XmlStreamWriter& writer = context.getExtensionsWriter();
+    powsybl::xml::XmlStreamWriter& writer = context.getWriter();
     stdcxx::CReference<ExtensionXmlSerializer> serializer = getExtensionSerializer(context.getOptions(), extension.getName());
     if (!serializer) {
         throw AssertionError(stdcxx::format("Extension XML Serializer of %1% should not be null", extension.getName()));
@@ -184,14 +184,14 @@ void writeExtensions(const Network& network, NetworkXmlWriterContext& context) {
         if (!context.isExportedEquipment(identifiable.getId()) || boost::empty(identifiable.getExtensions()) || !context.getOptions().hasAtLeastOneExtension(identifiable.getExtensions())) {
             continue;
         }
-        context.getExtensionsWriter().writeStartElement(context.getVersion().getPrefix(), EXTENSION);
-        context.getExtensionsWriter().writeAttribute(ID, context.getAnonymizer().anonymizeString(identifiable.getId()));
+        context.getWriter().writeStartElement(context.getVersion().getPrefix(), EXTENSION);
+        context.getWriter().writeAttribute(ID, context.getAnonymizer().anonymizeString(identifiable.getId()));
         for (const auto& extension : identifiable.getExtensions()) {
             if (context.getOptions().withExtension(extension.getName())) {
                 writeExtension(extension, context);
             }
         }
-        context.getExtensionsWriter().writeEndElement();
+        context.getWriter().writeEndElement();
     }
 }
 

diff --git a/src/iidm/converter/xml/NetworkXmlWriterContext.cpp b/src/iidm/converter/xml/NetworkXmlWriterContext.cpp
@@ -20,7 +20,6 @@ namespace xml {
 
 NetworkXmlWriterContext::NetworkXmlWriterContext(std::unique_ptr<Anonymizer>&& anonymizer, powsybl::xml::XmlStreamWriter& writer, const ExportOptions& options, const BusFilter& filter, const IidmXmlVersion& version) :
     m_writer(writer),
-    m_extensionsWriter(writer),
     m_anonymizer(std::move(anonymizer)),
     m_options(options),
     m_version(version),
@@ -48,10 +47,6 @@ const std::string& NetworkXmlWriterContext::getExtensionVersion(const std::strin
     return m_options.getExtensionVersion(extensionName);
 }
 
-powsybl::xml::XmlStreamWriter& NetworkXmlWriterContext::getExtensionsWriter() {
-    return m_extensionsWriter.get();
-}
-
 const BusFilter& NetworkXmlWriterContext::getFilter() const {
     return m_filter;
 }
@@ -72,10 +67,6 @@ bool NetworkXmlWriterContext::isExportedEquipment(const std::string& id) {
     return m_exportedEquipments.find(id) != m_exportedEquipments.end();
 }
 
-void NetworkXmlWriterContext::setExtensionsWriter(powsybl::xml::XmlStreamWriter& extensionsWriter) {
-    m_extensionsWriter = std::ref(extensionsWriter);
-}
-
 }  // namespace xml
 
 }  // namespace converter

diff --git a/src/iidm/extensions/LoadDetailXmlSerializer.cpp b/src/iidm/extensions/LoadDetailXmlSerializer.cpp
@@ -59,10 +59,10 @@ Extension& LoadDetailXmlSerializer::read(Extendable& extendable, converter::xml:
 
 void LoadDetailXmlSerializer::write(const Extension& extension, converter::xml::NetworkXmlWriterContext& context) const {
     const auto& detail = safeCast<iidm::extensions::LoadDetail>(extension);
-    context.getExtensionsWriter().writeAttribute("fixedActivePower", detail.getFixedActivePower());
-    context.getExtensionsWriter().writeAttribute("fixedReactivePower", detail.getFixedReactivePower());
-    context.getExtensionsWriter().writeAttribute("variableActivePower", detail.getVariableActivePower());
-    context.getExtensionsWriter().writeAttribute("variableReactivePower", detail.getVariableReactivePower());
+    context.getWriter().writeAttribute("fixedActivePower", detail.getFixedActivePower());
+    context.getWriter().writeAttribute("fixedReactivePower", detail.getFixedReactivePower());
+    context.getWriter().writeAttribute("variableActivePower", detail.getVariableActivePower());
+    context.getWriter().writeAttribute("variableReactivePower", detail.getVariableReactivePower());
 }
 
 }  // namespace extensions

diff --git a/test/iidm/converter/xml/extensions/TerminalMockXmlSerializer.cpp b/test/iidm/converter/xml/extensions/TerminalMockXmlSerializer.cpp
@@ -76,7 +76,7 @@ Extension& TerminalMockXmlSerializer::read(Extendable& extendable, NetworkXmlRea
 
 void TerminalMockXmlSerializer::write(const Extension& extension, NetworkXmlWriterContext& context) const {
     const auto& terminalMockExt = safeCast<TerminalMockExt>(extension);
-    TerminalRefXml::writeTerminalRef(terminalMockExt.getTerminal(), context, getNamespacePrefix(), "terminal", context.getExtensionsWriter());
+    TerminalRefXml::writeTerminalRef(terminalMockExt.getTerminal(), context, getNamespacePrefix(), "terminal", context.getWriter());
 }
 
 }  // namespace extensions