瀏覽代碼

Rename KV classes

Patrick-Christopher Mattulat 3 年之前
父節點
當前提交
b8f16c9a8a

+ 8 - 8
CMakeLists.txt

@@ -94,10 +94,10 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/event/EventHandler.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/event/EventManager.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/event/SerializableJsonEvent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KVPair.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KVDocument.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KVParser.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KVReader.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KvPair.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KvDocument.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KvParser.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/kv/KvReader.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/SerializableJsonFactory.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJsonBooleanFactory.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/json/boxing/SerializableJsonDoubleFactory.cpp
@@ -161,10 +161,10 @@ if (${LS_STD_BUILD_WITH_TESTS})
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/event/EventHandlerTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/event/EventManagerTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/serialization/json/event/SerializableJsonEventTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KVPairTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KVDocumentTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KVParserTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KVReaderTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KvPairTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KvDocumentTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KvParserTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/io/kv/KvReaderTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/SerializableFactoryTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJsonBooleanFactoryTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/test/cases/factory/serialization/json/boxing/SerializableJsonDoubleFactoryTest.cpp

+ 0 - 46
include/ls_std/io/kv/KVParser.hpp

@@ -1,46 +0,0 @@
-/*
- * Author:          Patrick-Christopher Mattulat
- * Company:         Lynar Studios
- * E-Mail:          webmaster@lynarstudios.com
- * Created:         2020-12-25
- * Changed:         2021-04-23
- *
- * */
-
-#ifndef LS_STD_KV_PARSER_HPP
-#define LS_STD_KV_PARSER_HPP
-
-#include <ls_std/base/Class.hpp>
-#include <ls_std/base/Types.hpp>
-#include "KVDocument.hpp"
-#include "KVParseData.hpp"
-#include <memory>
-
-namespace ls_std
-{
-  class KVParser : public ls_std::Class
-  {
-    public:
-
-      explicit KVParser(const std::shared_ptr<ls_std::KVDocument> &_document);
-      ~KVParser() override = default;
-
-      std::shared_ptr<ls_std::KVDocument> getDocument();
-      void parse(const ls_std::byte_field &_data);
-      void setDocument(const std::shared_ptr<ls_std::KVDocument> &_document);
-
-    private:
-
-      std::shared_ptr<ls_std::KVDocument> document{};
-
-      void _assignDocument(const std::shared_ptr<ls_std::KVDocument> &_document);
-      static bool _lineHasPair(ls_std::KVParseData _parseData);
-      void _parse(const ls_std::byte_field &_data);
-      void _parsePair(ls_std::KVParseData _parseData);
-      static ls_std::KVParseData _readLine(const ls_std::byte_field &_data, std::string::size_type _index);
-      static void _readLineWithUnixLineBreak(ls_std::KVParseData &_parseData);
-      static void _readLineWithWindowsLineBreak(ls_std::KVParseData &_parseData);
-  };
-}
-
-#endif

+ 9 - 9
include/ls_std/io/kv/KVDocument.hpp → include/ls_std/io/kv/KvDocument.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -11,28 +11,28 @@
 #define LS_STD_KV_DOCUMENT_HPP
 
 #include <ls_std/base/Class.hpp>
-#include "KVPair.hpp"
-#include "KVTypes.hpp"
+#include "KvPair.hpp"
+#include "KvTypes.hpp"
 #include <map>
 
 namespace ls_std
 {
-  class KVDocument : public ls_std::Class
+  class KvDocument : public ls_std::Class
   {
     public:
 
-      KVDocument();
-      ~KVDocument() override = default;
+      KvDocument();
+      ~KvDocument() override = default;
 
-      bool addPair(ls_std::KVPair _pair);
+      bool addPair(ls_std::KvPair _pair);
       void clear();
-      std::map<ls_std::kv_key, ls_std::KVPair> getPairs();
+      std::map<ls_std::kv_key, ls_std::KvPair> getPairs();
       bool hasPair(const ls_std::kv_key &_key);
       void removePair(const ls_std::kv_key &_key);
 
     private:
 
-      std::map<ls_std::kv_key, ls_std::KVPair> pairs{};
+      std::map<ls_std::kv_key, ls_std::KvPair> pairs{};
 
       bool _hasPair(const ls_std::kv_key &_key);
   };

+ 5 - 5
include/ls_std/io/kv/KVPair.hpp → include/ls_std/io/kv/KvPair.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -11,16 +11,16 @@
 #define LS_STD_KV_PAIR_HPP
 
 #include <ls_std/base/Class.hpp>
-#include "KVTypes.hpp"
+#include "KvTypes.hpp"
 
 namespace ls_std
 {
-  class KVPair : public ls_std::Class
+  class KvPair : public ls_std::Class
   {
     public:
 
-      explicit KVPair(const ls_std::kv_key &_key, ls_std::kv_value _value);
-      ~KVPair() override = default;
+      explicit KvPair(const ls_std::kv_key &_key, ls_std::kv_value _value);
+      ~KvPair() override = default;
 
       ls_std::kv_key getKey();
       ls_std::kv_value getValue();

+ 2 - 2
include/ls_std/io/kv/KVParseData.hpp → include/ls_std/io/kv/KvParseData.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -15,7 +15,7 @@
 
 namespace ls_std
 {
-  struct KVParseData
+  struct KvParseData
   {
     std::string::size_type index{};
     ls_std::String line{};

+ 46 - 0
include/ls_std/io/kv/KvParser.hpp

@@ -0,0 +1,46 @@
+/*
+ * Author:          Patrick-Christopher Mattulat
+ * Company:         Lynar Studios
+ * E-Mail:          webmaster@lynarstudios.com
+ * Created:         2020-12-25
+ * Changed:         2021-05-02
+ *
+ * */
+
+#ifndef LS_STD_KV_PARSER_HPP
+#define LS_STD_KV_PARSER_HPP
+
+#include <ls_std/base/Class.hpp>
+#include <ls_std/base/Types.hpp>
+#include "KvDocument.hpp"
+#include "KvParseData.hpp"
+#include <memory>
+
+namespace ls_std
+{
+  class KvParser : public ls_std::Class
+  {
+    public:
+
+      explicit KvParser(const std::shared_ptr<ls_std::KvDocument> &_document);
+      ~KvParser() override = default;
+
+      std::shared_ptr<ls_std::KvDocument> getDocument();
+      void parse(const ls_std::byte_field &_data);
+      void setDocument(const std::shared_ptr<ls_std::KvDocument> &_document);
+
+    private:
+
+      std::shared_ptr<ls_std::KvDocument> document{};
+
+      void _assignDocument(const std::shared_ptr<ls_std::KvDocument> &_document);
+      static bool _lineHasPair(ls_std::KvParseData _parseData);
+      void _parse(const ls_std::byte_field &_data);
+      void _parsePair(ls_std::KvParseData _parseData);
+      static ls_std::KvParseData _readLine(const ls_std::byte_field &_data, std::string::size_type _index);
+      static void _readLineWithUnixLineBreak(ls_std::KvParseData &_parseData);
+      static void _readLineWithWindowsLineBreak(ls_std::KvParseData &_parseData);
+  };
+}
+
+#endif

+ 9 - 9
include/ls_std/io/kv/KVReader.hpp → include/ls_std/io/kv/KvReader.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,18 +12,18 @@
 
 #include <ls_std/base/Class.hpp>
 #include <ls_std/io/IReader.hpp>
-#include <ls_std/io/kv/KVDocument.hpp>
+#include <ls_std/io/kv/KvDocument.hpp>
 #include <ls_std/io/File.hpp>
 #include <memory>
 
 namespace ls_std
 {
-  class KVReader : public ls_std::Class, public ls_std::IReader
+  class KvReader : public ls_std::Class, public ls_std::IReader
   {
     public:
 
-      explicit KVReader(const std::shared_ptr<ls_std::KVDocument> &_document, const std::string &_absolutePath);
-      ~KVReader() override = default;
+      explicit KvReader(const std::shared_ptr<ls_std::KvDocument> &_document, const std::string &_absolutePath);
+      ~KvReader() override = default;
 
       // implementation
 
@@ -31,16 +31,16 @@ namespace ls_std
 
       // additional functionality
 
-      std::shared_ptr<ls_std::KVDocument> getDocument();
-      void setDocument(const std::shared_ptr<ls_std::KVDocument> &_document);
+      std::shared_ptr<ls_std::KvDocument> getDocument();
+      void setDocument(const std::shared_ptr<ls_std::KvDocument> &_document);
       void setFile(const ls_std::File &_kvFile);
 
     private:
 
-      std::shared_ptr<ls_std::KVDocument> document{};
+      std::shared_ptr<ls_std::KvDocument> document{};
       ls_std::File kvFile;
 
-      void _assignDocument(const std::shared_ptr<ls_std::KVDocument> &_document);
+      void _assignDocument(const std::shared_ptr<ls_std::KvDocument> &_document);
       void _assignFile(ls_std::File _kvFile);
   };
 }

+ 0 - 0
include/ls_std/io/kv/KVTypes.hpp → include/ls_std/io/kv/KvTypes.hpp


+ 4 - 4
include/ls_std/ls_std.hpp

@@ -55,10 +55,10 @@
 #include "io/IWriter.hpp"
 #include "io/NewLine.hpp"
 #include "io/StorableFile.hpp"
-#include "io/kv/KVPair.hpp"
-#include "io/kv/KVDocument.hpp"
-#include "io/kv/KVParser.hpp"
-#include "io/kv/KVReader.hpp"
+#include "io/kv/KvPair.hpp"
+#include "io/kv/KvDocument.hpp"
+#include "io/kv/KvParser.hpp"
+#include "io/kv/KvReader.hpp"
 
 #include "logic/State.hpp"
 #include "logic/StateConnection.hpp"

+ 10 - 10
source/ls_std/io/kv/KVDocument.cpp → source/ls_std/io/kv/KvDocument.cpp

@@ -3,44 +3,44 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/io/kv/KVDocument.hpp>
+#include <ls_std/io/kv/KvDocument.hpp>
 
-ls_std::KVDocument::KVDocument() : ls_std::Class("KVDocument")
+ls_std::KvDocument::KvDocument() : ls_std::Class("KvDocument")
 {}
 
-bool ls_std::KVDocument::addPair(ls_std::KVPair _pair)
+bool ls_std::KvDocument::addPair(ls_std::KvPair _pair)
 {
   bool added{};
 
   if (!this->_hasPair(_pair.getKey()))
   {
-    std::pair<ls_std::kv_key, ls_std::KVPair> pair = std::make_pair(_pair.getKey(), _pair);
+    std::pair<ls_std::kv_key, ls_std::KvPair> pair = std::make_pair(_pair.getKey(), _pair);
     added = this->pairs.insert(pair).second;
   }
 
   return added;
 }
 
-void ls_std::KVDocument::clear()
+void ls_std::KvDocument::clear()
 {
   this->pairs.clear();
 }
 
-std::map<ls_std::kv_key, ls_std::KVPair> ls_std::KVDocument::getPairs()
+std::map<ls_std::kv_key, ls_std::KvPair> ls_std::KvDocument::getPairs()
 {
   return this->pairs;
 }
 
-bool ls_std::KVDocument::hasPair(const ls_std::kv_key &_key)
+bool ls_std::KvDocument::hasPair(const ls_std::kv_key &_key)
 {
   return this->_hasPair(_key);
 }
 
-void ls_std::KVDocument::removePair(const ls_std::kv_key &_key)
+void ls_std::KvDocument::removePair(const ls_std::kv_key &_key)
 {
   if (_hasPair(_key))
   {
@@ -48,7 +48,7 @@ void ls_std::KVDocument::removePair(const ls_std::kv_key &_key)
   }
 }
 
-bool ls_std::KVDocument::_hasPair(const ls_std::kv_key &_key)
+bool ls_std::KvDocument::_hasPair(const ls_std::kv_key &_key)
 {
   return this->pairs.find(_key) != this->pairs.end();
 }

+ 8 - 8
source/ls_std/io/kv/KVPair.cpp → source/ls_std/io/kv/KvPair.cpp

@@ -3,36 +3,36 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/io/kv/KVPair.hpp>
+#include <ls_std/io/kv/KvPair.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 
-ls_std::KVPair::KVPair(const ls_std::kv_key &_key, ls_std::kv_value _value)
-    : ls_std::Class("KVPair"),
+ls_std::KvPair::KvPair(const ls_std::kv_key &_key, ls_std::kv_value _value)
+    : ls_std::Class("KvPair"),
       value(std::move(_value))
 {
   this->_assignKey(_key);
 }
 
-ls_std::kv_key ls_std::KVPair::getKey()
+ls_std::kv_key ls_std::KvPair::getKey()
 {
   return this->key;
 }
 
-ls_std::kv_value ls_std::KVPair::getValue()
+ls_std::kv_value ls_std::KvPair::getValue()
 {
   return this->value;
 }
 
-void ls_std::KVPair::setValue(const ls_std::kv_value &_value)
+void ls_std::KvPair::setValue(const ls_std::kv_value &_value)
 {
   this->value = _value;
 }
 
-void ls_std::KVPair::_assignKey(const ls_std::kv_key &_key)
+void ls_std::KvPair::_assignKey(const ls_std::kv_key &_key)
 {
   if (_key.empty())
   {

+ 19 - 19
source/ls_std/io/kv/KVParser.cpp → source/ls_std/io/kv/KvParser.cpp

@@ -3,35 +3,35 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/io/kv/KVParser.hpp>
+#include <ls_std/io/kv/KvParser.hpp>
 #include <ls_std/exception/NullPointerException.hpp>
 #include <ls_std/io/NewLine.hpp>
 
-ls_std::KVParser::KVParser(const std::shared_ptr<ls_std::KVDocument> &_document) : ls_std::Class("KVParser")
+ls_std::KvParser::KvParser(const std::shared_ptr<ls_std::KvDocument> &_document) : ls_std::Class("KvParser")
 {
   this->_assignDocument(_document);
 }
 
-std::shared_ptr<ls_std::KVDocument> ls_std::KVParser::getDocument()
+std::shared_ptr<ls_std::KvDocument> ls_std::KvParser::getDocument()
 {
   return this->document;
 }
 
-void ls_std::KVParser::parse(const ls_std::byte_field &_data)
+void ls_std::KvParser::parse(const ls_std::byte_field &_data)
 {
   this->_parse(_data);
 }
 
-void ls_std::KVParser::setDocument(const std::shared_ptr<ls_std::KVDocument> &_document)
+void ls_std::KvParser::setDocument(const std::shared_ptr<ls_std::KvDocument> &_document)
 {
   this->_assignDocument(_document);
 }
 
-void ls_std::KVParser::_assignDocument(const std::shared_ptr<ls_std::KVDocument> &_document)
+void ls_std::KvParser::_assignDocument(const std::shared_ptr<ls_std::KvDocument> &_document)
 {
   if (_document == nullptr)
   {
@@ -41,48 +41,48 @@ void ls_std::KVParser::_assignDocument(const std::shared_ptr<ls_std::KVDocument>
   this->document = _document;
 }
 
-bool ls_std::KVParser::_lineHasPair(ls_std::KVParseData _parseData)
+bool ls_std::KvParser::_lineHasPair(ls_std::KvParseData _parseData)
 {
   return _parseData.line.contains("=") && _parseData.line.contains(";");
 }
 
-void ls_std::KVParser::_parse(const ls_std::byte_field &_data)
+void ls_std::KvParser::_parse(const ls_std::byte_field &_data)
 {
   for (std::string::size_type index = 0; index < _data.size(); index++)
   {
-    ls_std::KVParseData parseData = ls_std::KVParser::_readLine(_data, index);
+    ls_std::KvParseData parseData = ls_std::KvParser::_readLine(_data, index);
     this->_parsePair(parseData);
     index = parseData.index;
   }
 }
 
-void ls_std::KVParser::_parsePair(ls_std::KVParseData _parseData)
+void ls_std::KvParser::_parsePair(ls_std::KvParseData _parseData)
 {
-  if (ls_std::KVParser::_lineHasPair(_parseData))
+  if (ls_std::KvParser::_lineHasPair(_parseData))
   {
     size_t equalSignPosition = _parseData.line.toString().find('=');
     ls_std::kv_key key = _parseData.line.toString().substr(0, equalSignPosition);
     ls_std::kv_value value = _parseData.line.toString().substr(equalSignPosition + 1);
     value = value.substr(0, value.find(';'));
 
-    this->document->addPair(ls_std::KVPair{key, value});
+    this->document->addPair(ls_std::KvPair{key, value});
   }
 }
 
-ls_std::KVParseData ls_std::KVParser::_readLine(const ls_std::byte_field &_data, std::string::size_type _index)
+ls_std::KvParseData ls_std::KvParser::_readLine(const ls_std::byte_field &_data, std::string::size_type _index)
 {
-  ls_std::KVParseData parseData{};
+  ls_std::KvParseData parseData{};
   parseData.line = _data.substr(_index);
 
   if (parseData.line.contains(ls_std::NewLine::getWindowsNewLine()))
   {
-    ls_std::KVParser::_readLineWithWindowsLineBreak(parseData);
+    ls_std::KvParser::_readLineWithWindowsLineBreak(parseData);
   }
   else
   {
     if (parseData.line.contains(ls_std::NewLine::getUnixNewLine()))
     {
-      ls_std::KVParser::_readLineWithUnixLineBreak(parseData);
+      ls_std::KvParser::_readLineWithUnixLineBreak(parseData);
     }
   }
 
@@ -90,13 +90,13 @@ ls_std::KVParseData ls_std::KVParser::_readLine(const ls_std::byte_field &_data,
   return parseData;
 }
 
-void ls_std::KVParser::_readLineWithUnixLineBreak(ls_std::KVParseData &_parseData)
+void ls_std::KvParser::_readLineWithUnixLineBreak(ls_std::KvParseData &_parseData)
 {
   size_t newLinePosition = _parseData.line.toString().find(ls_std::NewLine::getUnixNewLine());
   _parseData.line = _parseData.line.toString().substr(0, newLinePosition);
 }
 
-void ls_std::KVParser::_readLineWithWindowsLineBreak(ls_std::KVParseData &_parseData)
+void ls_std::KvParser::_readLineWithWindowsLineBreak(ls_std::KvParseData &_parseData)
 {
   size_t newLinePosition = _parseData.line.toString().find(ls_std::NewLine::getWindowsNewLine());
   _parseData.line = _parseData.line.toString().substr(0, newLinePosition + 1);

+ 12 - 12
source/ls_std/io/kv/KVReader.cpp → source/ls_std/io/kv/KvReader.cpp

@@ -3,47 +3,47 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
-#include <ls_std/io/kv/KVReader.hpp>
+#include <ls_std/io/kv/KvReader.hpp>
 #include <ls_std/exception/IllegalArgumentException.hpp>
 #include <ls_std/io/FileReader.hpp>
-#include <ls_std/io/kv/KVParser.hpp>
+#include <ls_std/io/kv/KvParser.hpp>
 
-ls_std::KVReader::KVReader(const std::shared_ptr<ls_std::KVDocument> &_document, const std::string &_absolutePath)
-    : ls_std::Class("KVReader"),
+ls_std::KvReader::KvReader(const std::shared_ptr<ls_std::KvDocument> &_document, const std::string &_absolutePath)
+    : ls_std::Class("KvReader"),
       kvFile(ls_std::File{""})
 {
   this->_assignDocument(_document);
   this->_assignFile(ls_std::File{_absolutePath});
 }
 
-ls_std::byte_field ls_std::KVReader::read()
+ls_std::byte_field ls_std::KvReader::read()
 {
   ls_std::byte_field data = ls_std::FileReader{this->kvFile}.read();
-  ls_std::KVParser{this->document}.parse(data);
+  ls_std::KvParser{this->document}.parse(data);
 
   return data;
 }
 
-std::shared_ptr<ls_std::KVDocument> ls_std::KVReader::getDocument()
+std::shared_ptr<ls_std::KvDocument> ls_std::KvReader::getDocument()
 {
   return this->document;
 }
 
-void ls_std::KVReader::setDocument(const std::shared_ptr<ls_std::KVDocument> &_document)
+void ls_std::KvReader::setDocument(const std::shared_ptr<ls_std::KvDocument> &_document)
 {
   this->_assignDocument(_document);
 }
 
-void ls_std::KVReader::setFile(const ls_std::File &_kvFile)
+void ls_std::KvReader::setFile(const ls_std::File &_kvFile)
 {
   this->_assignFile(_kvFile);
 }
 
-void ls_std::KVReader::_assignDocument(const std::shared_ptr<ls_std::KVDocument> &_document)
+void ls_std::KvReader::_assignDocument(const std::shared_ptr<ls_std::KvDocument> &_document)
 {
   if (_document == nullptr)
   {
@@ -53,7 +53,7 @@ void ls_std::KVReader::_assignDocument(const std::shared_ptr<ls_std::KVDocument>
   this->document = _document;
 }
 
-void ls_std::KVReader::_assignFile(ls_std::File _kvFile)
+void ls_std::KvReader::_assignFile(ls_std::File _kvFile)
 {
   if (!_kvFile.exists())
   {

+ 25 - 25
test/cases/io/kv/KVDocumentTest.cpp → test/cases/io/kv/KvDocumentTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class KVDocumentTest : public ::testing::Test
+  class KvDocumentTest : public ::testing::Test
   {
     protected:
 
-      KVDocumentTest() = default;
-      ~KVDocumentTest() override = default;
+      KvDocumentTest() = default;
+      ~KvDocumentTest() override = default;
 
       void SetUp() override
       {}
@@ -26,20 +26,20 @@ namespace
       {}
   };
 
-  TEST_F(KVDocumentTest, addPair)
+  TEST_F(KvDocumentTest, addPair)
   {
-    ls_std::KVDocument document{};
-    ls_std::KVPair pair{"port", "13088"};
+    ls_std::KvDocument document{};
+    ls_std::KvPair pair{"port", "13088"};
 
     ASSERT_TRUE(document.getPairs().empty());
     ASSERT_TRUE(document.addPair(pair));
     ASSERT_EQ(1, document.getPairs().size());
   }
 
-  TEST_F(KVDocumentTest, addPairNegative)
+  TEST_F(KvDocumentTest, addPairNegative)
   {
-    ls_std::KVDocument document{};
-    ls_std::KVPair pair{"port", "13088"};
+    ls_std::KvDocument document{};
+    ls_std::KvPair pair{"port", "13088"};
 
     ASSERT_TRUE(document.getPairs().empty());
     ASSERT_TRUE(document.addPair(pair));
@@ -48,10 +48,10 @@ namespace
     ASSERT_FALSE(document.addPair(pair));
   }
 
-  TEST_F(KVDocumentTest, clear)
+  TEST_F(KvDocumentTest, clear)
   {
-    ls_std::KVDocument document{};
-    ls_std::KVPair pair{"port", "13088"};
+    ls_std::KvDocument document{};
+    ls_std::KvPair pair{"port", "13088"};
 
     ASSERT_TRUE(document.getPairs().empty());
     ASSERT_TRUE(document.addPair(pair));
@@ -63,33 +63,33 @@ namespace
     ASSERT_EQ(0, document.getPairs().size());
   }
 
-  TEST_F(KVDocumentTest, getPairs)
+  TEST_F(KvDocumentTest, getPairs)
   {
-    ls_std::KVDocument document{};
+    ls_std::KvDocument document{};
     ASSERT_TRUE(document.getPairs().empty());
   }
 
-  TEST_F(KVDocumentTest, hasPair)
+  TEST_F(KvDocumentTest, hasPair)
   {
-    ls_std::KVDocument document{};
+    ls_std::KvDocument document{};
     ASSERT_TRUE(document.getPairs().empty());
-    ASSERT_TRUE(document.addPair(ls_std::KVPair{"port", "80"}));
+    ASSERT_TRUE(document.addPair(ls_std::KvPair{"port", "80"}));
     ASSERT_TRUE(document.hasPair("port"));
   }
 
-  TEST_F(KVDocumentTest, hasPairNegative)
+  TEST_F(KvDocumentTest, hasPairNegative)
   {
-    ls_std::KVDocument document{};
+    ls_std::KvDocument document{};
     ASSERT_TRUE(document.getPairs().empty());
     ASSERT_FALSE(document.hasPair("port"));
   }
 
-  TEST_F(KVDocumentTest, removePair)
+  TEST_F(KvDocumentTest, removePair)
   {
-    ls_std::KVDocument document{};
-    ASSERT_TRUE(document.addPair(ls_std::KVPair{"port", "80"}));
-    ASSERT_TRUE(document.addPair(ls_std::KVPair{"host", "localhost"}));
-    ASSERT_TRUE(document.addPair(ls_std::KVPair{"protocol", "TCP"}));
+    ls_std::KvDocument document{};
+    ASSERT_TRUE(document.addPair(ls_std::KvPair{"port", "80"}));
+    ASSERT_TRUE(document.addPair(ls_std::KvPair{"host", "localhost"}));
+    ASSERT_TRUE(document.addPair(ls_std::KvPair{"protocol", "TCP"}));
     ASSERT_EQ(3, document.getPairs().size());
 
     document.removePair("protocol");

+ 10 - 10
test/cases/io/kv/KVPairTest.cpp → test/cases/io/kv/KvPairTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class KVPairTest : public ::testing::Test
+  class KvPairTest : public ::testing::Test
   {
     protected:
 
-      KVPairTest() = default;
-      ~KVPairTest() override = default;
+      KvPairTest() = default;
+      ~KvPairTest() override = default;
 
       void SetUp() override
       {}
@@ -26,21 +26,21 @@ namespace
       {}
   };
 
-  TEST_F(KVPairTest, getKey)
+  TEST_F(KvPairTest, getKey)
   {
-    ls_std::KVPair pair{"port", "13088"};
+    ls_std::KvPair pair{"port", "13088"};
     ASSERT_STREQ("port", pair.getKey().c_str());
   }
 
-  TEST_F(KVPairTest, getValue)
+  TEST_F(KvPairTest, getValue)
   {
-    ls_std::KVPair pair{"port", "13088"};
+    ls_std::KvPair pair{"port", "13088"};
     ASSERT_STREQ("13088", pair.getValue().c_str());
   }
 
-  TEST_F(KVPairTest, setValue)
+  TEST_F(KvPairTest, setValue)
   {
-    ls_std::KVPair pair{"port", "13088"};
+    ls_std::KvPair pair{"port", "13088"};
     ASSERT_STREQ("13088", pair.getValue().c_str());
 
     pair.setValue("8080");

+ 13 - 13
test/cases/io/kv/KVParserTest.cpp → test/cases/io/kv/KvParserTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,12 +12,12 @@
 
 namespace
 {
-  class KVParserTest : public ::testing::Test
+  class KvParserTest : public ::testing::Test
   {
     protected:
 
-      KVParserTest() = default;
-      ~KVParserTest() override = default;
+      KvParserTest() = default;
+      ~KvParserTest() override = default;
 
       void SetUp() override
       {}
@@ -26,16 +26,16 @@ namespace
       {}
   };
 
-  TEST_F(KVParserTest, getDocument)
+  TEST_F(KvParserTest, getDocument)
   {
-    ls_std::KVParser parser{std::make_shared<ls_std::KVDocument>()};
+    ls_std::KvParser parser{std::make_shared<ls_std::KvDocument>()};
     ASSERT_TRUE(parser.getDocument() != nullptr);
   }
 
-  TEST_F(KVParserTest, parse)
+  TEST_F(KvParserTest, parse)
   {
-    std::shared_ptr<ls_std::KVDocument> document = std::make_shared<ls_std::KVDocument>();
-    ls_std::KVParser parser{document};
+    std::shared_ptr<ls_std::KvDocument> document = std::make_shared<ls_std::KvDocument>();
+    ls_std::KvParser parser{document};
     ls_std::byte_field data = "# starting comment\n\nport=8080; # some comment\nhost=localhost;\nservice-name=deamon;";
     parser.parse(data);
 
@@ -49,12 +49,12 @@ namespace
     ASSERT_STREQ("deamon", document->getPairs().at("service-name").getValue().c_str());
   }
 
-  TEST_F(KVParserTest, setDocument)
+  TEST_F(KvParserTest, setDocument)
   {
-    std::shared_ptr<ls_std::KVDocument> document1 = std::make_shared<ls_std::KVDocument>();
-    std::shared_ptr<ls_std::KVDocument> document2 = std::make_shared<ls_std::KVDocument>();
+    std::shared_ptr<ls_std::KvDocument> document1 = std::make_shared<ls_std::KvDocument>();
+    std::shared_ptr<ls_std::KvDocument> document2 = std::make_shared<ls_std::KvDocument>();
 
-    ls_std::KVParser parser{document1};
+    ls_std::KvParser parser{document1};
     ASSERT_TRUE(parser.getDocument() == document1);
 
     parser.setDocument(document2);

+ 13 - 13
test/cases/io/kv/KVReaderTest.cpp → test/cases/io/kv/KvReaderTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -13,12 +13,12 @@
 
 namespace
 {
-  class KVReaderTest : public ::testing::Test
+  class KvReaderTest : public ::testing::Test
   {
     protected:
 
-      KVReaderTest() = default;
-      ~KVReaderTest() override = default;
+      KvReaderTest() = default;
+      ~KvReaderTest() override = default;
 
       void SetUp() override
       {}
@@ -27,19 +27,19 @@ namespace
       {}
   };
 
-  TEST_F(KVReaderTest, getDocument)
+  TEST_F(KvReaderTest, getDocument)
   {
     std::string kvPath = TestHelper::getResourcesFolderLocation() + "server_settings.kv";
-    ls_std::KVReader reader{std::make_shared<ls_std::KVDocument>(), kvPath};
+    ls_std::KvReader reader{std::make_shared<ls_std::KvDocument>(), kvPath};
 
     ASSERT_TRUE(reader.getDocument() != nullptr);
   }
 
-  TEST_F(KVReaderTest, read)
+  TEST_F(KvReaderTest, read)
   {
     std::string kvPath = TestHelper::getResourcesFolderLocation() + "server_settings.kv";
-    std::shared_ptr<ls_std::KVDocument> document = std::make_shared<ls_std::KVDocument>();
-    ls_std::KVReader reader{document, kvPath};
+    std::shared_ptr<ls_std::KvDocument> document = std::make_shared<ls_std::KvDocument>();
+    ls_std::KvReader reader{document, kvPath};
 
     reader.read();
     ASSERT_EQ(3, document->getPairs().size());
@@ -52,13 +52,13 @@ namespace
     ASSERT_STREQ("deamon", document->getPairs().at("service-name").getValue().c_str());
   }
 
-  TEST_F(KVReaderTest, setDocument)
+  TEST_F(KvReaderTest, setDocument)
   {
     std::string kvPath = TestHelper::getResourcesFolderLocation() + "server_settings.kv";
-    std::shared_ptr<ls_std::KVDocument> document1 = std::make_shared<ls_std::KVDocument>();
-    std::shared_ptr<ls_std::KVDocument> document2 = std::make_shared<ls_std::KVDocument>();
+    std::shared_ptr<ls_std::KvDocument> document1 = std::make_shared<ls_std::KvDocument>();
+    std::shared_ptr<ls_std::KvDocument> document2 = std::make_shared<ls_std::KvDocument>();
 
-    ls_std::KVReader reader{document1, kvPath};
+    ls_std::KvReader reader{document1, kvPath};
     ASSERT_TRUE(reader.getDocument() == document1);
 
     reader.setDocument(document2);