XML strings are only UTF-8

ngageoint · Sep 11, 2023 · 6f93611 · 6f93611
1 parent 8cca000
commit 6f93611
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 62 deletions.
diff --git a/six/modules/c++/cphd/include/cphd/CPHDXMLControl.h b/six/modules/c++/cphd/include/cphd/CPHDXMLControl.h
@@ -89,10 +89,6 @@ class CPHDXMLControl
             const Metadata& metadata,
             const std::vector<std::string>& schemaPaths = std::vector<std::string>(),
             bool prettyPrint = false);
-    std::string toXMLString_(
-        const Metadata& metadata,
-        const std::vector<std::string>& schemaPaths = std::vector<std::string>(),
-        bool prettyPrint = false);
     virtual std::u8string toXMLString(
         const Metadata& metadata,
         const std::vector<std::filesystem::path>* pSchemaPaths,

diff --git a/six/modules/c++/cphd/source/CPHDXMLControl.cpp b/six/modules/c++/cphd/source/CPHDXMLControl.cpp
@@ -84,14 +84,6 @@ std::u8string CPHDXMLControl::toXMLString(
 
     return toXMLString(metadata, &schemaPaths, prettyPrint);
 }
-std::string CPHDXMLControl::toXMLString_(
-    const Metadata& metadata,
-    const std::vector<std::string>& schemaPaths,
-    bool prettyPrint)
-{
-    const auto result = toXMLString(metadata, schemaPaths, prettyPrint);
-    return str::to_native(result);
-}
 
 std::unique_ptr<xml::lite::Document> CPHDXMLControl::toXML(
         const Metadata& metadata,

diff --git a/six/modules/c++/cphd03/include/cphd03/CPHDXMLControl.h b/six/modules/c++/cphd03/include/cphd03/CPHDXMLControl.h
@@ -60,10 +60,7 @@ class CPHDXMLControl : public six::XMLParser
     std::unique_ptr<Metadata> fromXML(const xml::lite::Document* doc);
    Metadata fromXML(const xml::lite::Document& doc);
 
-    std::unique_ptr<Metadata> fromXML(const std::string& xmlString);
     std::unique_ptr<Metadata> fromXML(const std::u8string& xmlString);
-
-    std::string toXMLString_(const Metadata& metadata);
     std::u8string toXMLString(const Metadata& metadata);
 
     size_t getXMLsize(const Metadata& metadata);

diff --git a/six/modules/c++/cphd03/source/CPHDXMLControl.cpp b/six/modules/c++/cphd03/source/CPHDXMLControl.cpp
@@ -72,10 +72,6 @@ std::u8string CPHDXMLControl::toXMLString(const Metadata& metadata)
 
     return str::u8FromNative("<?xml version=\"1.0\"?>") + ss.stream().str();
 }
-std::string CPHDXMLControl::toXMLString_(const Metadata& metadata)
-{
-    return str::to_native(toXMLString(metadata));
-}
 
 size_t CPHDXMLControl::getXMLsize(const Metadata& metadata)
 {
@@ -491,11 +487,6 @@ XMLElem CPHDXMLControl::areaSampleDirectionParametersToXML(
     return adpXML;
 }
 
-std::unique_ptr<Metadata> CPHDXMLControl::fromXML(const std::string& xmlString)
-{
-    auto result = fromXML(str::u8FromNative(xmlString));
-    return std::unique_ptr<Metadata>(result.release());
-}
 std::unique_ptr<Metadata> CPHDXMLControl::fromXML(const std::u8string& xmlString)
 {
     io::U8StringStream stringStream;

diff --git a/six/modules/c++/six.sicd/include/six/sicd/Utilities.h b/six/modules/c++/six.sicd/include/six/sicd/Utilities.h
@@ -428,10 +428,6 @@ struct Utilities final
      *
      * \return XML string representation of 'data'
      */
-    static std::string toXMLString(
-            const ComplexData& data,
-            const std::vector<std::string>& schemaPaths = std::vector<std::string>(),
-            logging::Logger* logger = nullptr);
     static std::u8string toXMLString(const ComplexData&,
         const std::vector<std::filesystem::path>*, logging::Logger* pLogger = nullptr);
     /*!

diff --git a/six/modules/c++/six.sicd/source/Utilities.cpp b/six/modules/c++/six.sicd/source/Utilities.cpp
@@ -1040,17 +1040,6 @@ std::unique_ptr<ComplexData> Utilities::parseDataFromString(const std::u8string&
     return parser.fromXML(xmlStr);
 }
 
-std::string Utilities::toXMLString(const ComplexData& data,
-                                   const std::vector<std::string>& schemaPaths_,
-                                   logging::Logger* logger)
-{
-    std::vector<std::filesystem::path> schemaPaths;
-    std::transform(schemaPaths_.begin(), schemaPaths_.end(), std::back_inserter(schemaPaths),
-        [](const std::string& s) { return s; });
-
-    const auto result = toXMLString(data, &schemaPaths, logger);
-    return str::to_native(result);
-}
 std::u8string Utilities::toXMLString(const ComplexData& data,
     const std::vector<std::filesystem::path>* pSchemaPaths, logging::Logger* pLogger)
 {

diff --git a/six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp b/six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp
@@ -92,7 +92,7 @@ TEST_CASE(FakeComplexData)
     const auto data = six::sicd::Utilities::createFakeComplexData();
 
     const std::vector<std::string> schemaPaths;
-    const auto result = six::sicd::Utilities::toXMLString(*data, schemaPaths);
+    const auto result = six::sicd::Utilities::toXMLString(*data, nullptr);
     TEST_ASSERT_FALSE(result.empty());
 }
 

diff --git a/six/modules/c++/six.sidd/source/Utilities.cpp b/six/modules/c++/six.sidd/source/Utilities.cpp
@@ -580,16 +580,6 @@ std::unique_ptr<DerivedData> Utilities::parseDataFromString(const std::u8string&
     return dataParser.fromXML(xmlStr);
 }
 
-std::string Utilities::toXMLString(const DerivedData& data,
-                                   const std::vector<std::string>& schemaPaths_, logging::Logger* logger)
-{
-    std::vector<std::filesystem::path> schemaPaths;
-    std::transform(schemaPaths_.begin(), schemaPaths_.end(), std::back_inserter(schemaPaths),
-        [](const std::string& s) { return s; });
-
-    const auto result = toXMLString(data, &schemaPaths, logger);
-    return str::to_native(result);
-}
 std::u8string Utilities::toXMLString(const DerivedData& data,
     const std::vector<std::filesystem::path>* pSchemaPaths, logging::Logger* pLogger)
 {

diff --git a/six/modules/c++/six/include/six/XMLControlFactory.h b/six/modules/c++/six/include/six/XMLControlFactory.h
@@ -179,8 +179,6 @@ struct XMLControlRegistry
  */
 std::u8string toXMLString(const Data* data,
                         const XMLControlRegistry *xmlRegistry = nullptr);
-std::string toXMLString_(const Data* data,
-    const XMLControlRegistry* xmlRegistry = nullptr);
 
 /*!
  *  Additionally performs schema validation --

diff --git a/six/modules/c++/six/source/XMLControlFactory.cpp b/six/modules/c++/six/source/XMLControlFactory.cpp
@@ -78,12 +78,6 @@ std::u8string six::toXMLString(const Data* data,
     return toValidXMLString(data, std::vector<std::string>(),
                             &log, xmlRegistry);
 }
-std::string six::toXMLString_(const Data* data,
-    const six::XMLControlRegistry* xmlRegistry)
-{
-    const auto result = toXMLString(data, xmlRegistry);
-    return str::to_native(result);
-}
 
 template<typename TSchemaPaths>
 std::u8string six_toValidXMLString(const Data& data,

diff --git a/six/projects/csm/source/SICDSensorModel.cpp b/six/projects/csm/source/SICDSensorModel.cpp
@@ -108,8 +108,8 @@ void SICDSensorModel::initializeFromFile(const std::string& pathname)
                 container->getData(0)->clone()));
 
         // get xml as string for sensor model state
-        const auto xmlStr = six::toXMLString_(mData.get(), &xmlRegistry);
-        mSensorModelState = NAME + std::string(" ") + xmlStr;
+        const auto xmlStr = six::toXMLString(mData.get(), &xmlRegistry);
+        mSensorModelState = NAME + std::string(" ") + str::to_native(xmlStr);
         reinitialize();
     }
     catch (const except::Exception& ex)

diff --git a/six/projects/csm/source/SIDDSensorModel.cpp b/six/projects/csm/source/SIDDSensorModel.cpp
@@ -140,8 +140,8 @@ void SIDDSensorModel::initializeFromFile(const std::string& pathname,
         mData.reset(reinterpret_cast<six::sidd::DerivedData*>(data->clone()));
 
         // get xml as string for sensor model state
-        const auto xmlStr = six::toXMLString_(mData.get(), &xmlRegistry);
-        mSensorModelState = NAME + std::string(" ") + xmlStr;
+        const auto xmlStr = six::toXMLString(mData.get(), &xmlRegistry);
+        mSensorModelState = NAME + std::string(" ") + str::to_native(xmlStr);
         reinitialize();
     }
     catch (const except::Exception& ex)