Bläddra i källkod

Rename SerializableFactory class

Patrick-Christopher Mattulat 3 år sedan
förälder
incheckning
efa7a7ed91

+ 1 - 1
CMakeLists.txt

@@ -98,7 +98,7 @@ set(SOURCE_FILES
         ${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/SerializableFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/SerializableJSONFactory.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/boxing/SerializableJSONBooleanFactory.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/boxing/SerializableJSONDoubleFactory.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/factory/serialization/boxing/SerializableJSONFloatFactory.cpp

+ 6 - 6
include/ls_std/factory/serialization/SerializableFactory.hpp → include/ls_std/factory/serialization/SerializableJSONFactory.hpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-04-24
+ * Changed:         2021-04-25
  *
  * */
 
-#ifndef LS_STD_SERIALIZABLE_FACTORY_HPP
-#define LS_STD_SERIALIZABLE_FACTORY_HPP
+#ifndef LS_STD_SERIALIZABLE_JSON_FACTORY_HPP
+#define LS_STD_SERIALIZABLE_JSON_FACTORY_HPP
 
 #include <ls_std/base/Class.hpp>
 #include <map>
@@ -18,12 +18,12 @@
 
 namespace ls_std
 {
-  class SerializableFactory : public ls_std::Class
+  class SerializableJSONFactory : public ls_std::Class
   {
     public:
 
-      SerializableFactory();
-      ~SerializableFactory() override = default;
+      SerializableJSONFactory();
+      ~SerializableJSONFactory() override = default;
 
       bool addFactory(const std::pair<std::string, std::shared_ptr<ls_std::IFactory>> &_factoryInsertion);
       std::shared_ptr<ls_std::Class> build(const std::string &_relatedObjectName);

+ 2 - 2
include/ls_std/ls_std.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-10-29
- * Changed:         2021-04-24
+ * Changed:         2021-04-25
  *
  * */
 
@@ -92,7 +92,7 @@
 #include "event/EventManager.hpp"
 
 #include "factory/IFactory.hpp"
-#include "factory/serialization/SerializableFactory.hpp"
+#include "factory/serialization/SerializableJSONFactory.hpp"
 #include "factory/serialization/boxing/SerializableJSONBooleanFactory.hpp"
 #include "factory/serialization/boxing/SerializableJSONDoubleFactory.hpp"
 #include "factory/serialization/boxing/SerializableJSONFloatFactory.hpp"

+ 10 - 10
source/ls_std/factory/serialization/SerializableFactory.cpp → source/ls_std/factory/serialization/SerializableJSONFactory.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-04-24
+ * Changed:         2021-04-25
  *
  * */
 
-#include <ls_std/factory/serialization/SerializableFactory.hpp>
+#include <ls_std/factory/serialization/SerializableJSONFactory.hpp>
 #include <ls_std/boxing/Boolean.hpp>
 #include <ls_std/boxing/Double.hpp>
 #include <ls_std/boxing/Float.hpp>
@@ -23,12 +23,12 @@
 #include <ls_std/exception/IllegalArgumentException.hpp>
 #include <ls_std/exception/NullPointerException.hpp>
 
-ls_std::SerializableFactory::SerializableFactory() : ls_std::Class("SerializableFactory")
+ls_std::SerializableJSONFactory::SerializableJSONFactory() : ls_std::Class("SerializableJSONFactory")
 {
   this->_init();
 }
 
-bool ls_std::SerializableFactory::addFactory(const std::pair<std::string, std::shared_ptr<ls_std::IFactory>> &_factoryInsertion)
+bool ls_std::SerializableJSONFactory::addFactory(const std::pair<std::string, std::shared_ptr<ls_std::IFactory>> &_factoryInsertion)
 {
   bool hasFactory{};
 
@@ -50,7 +50,7 @@ bool ls_std::SerializableFactory::addFactory(const std::pair<std::string, std::s
   return hasFactory;
 }
 
-std::shared_ptr<ls_std::Class> ls_std::SerializableFactory::build(const std::string &_relatedObjectName)
+std::shared_ptr<ls_std::Class> ls_std::SerializableJSONFactory::build(const std::string &_relatedObjectName)
 {
   std::shared_ptr<ls_std::Class> requestedObject{};
 
@@ -62,18 +62,18 @@ std::shared_ptr<ls_std::Class> ls_std::SerializableFactory::build(const std::str
   return requestedObject;
 }
 
-bool ls_std::SerializableFactory::clear()
+bool ls_std::SerializableJSONFactory::clear()
 {
   this->factories.clear();
   return factories.empty();
 }
 
-bool ls_std::SerializableFactory::hasFactory(const std::string &_relatedObjectName)
+bool ls_std::SerializableJSONFactory::hasFactory(const std::string &_relatedObjectName)
 {
   return this->_hasFactory(_relatedObjectName);
 }
 
-bool ls_std::SerializableFactory::removeFactory(const std::string &_relatedObjectName)
+bool ls_std::SerializableJSONFactory::removeFactory(const std::string &_relatedObjectName)
 {
   bool wasRemoved{};
 
@@ -86,12 +86,12 @@ bool ls_std::SerializableFactory::removeFactory(const std::string &_relatedObjec
   return wasRemoved;
 }
 
-bool ls_std::SerializableFactory::_hasFactory(const std::string &_relatedObjectName)
+bool ls_std::SerializableJSONFactory::_hasFactory(const std::string &_relatedObjectName)
 {
   return this->factories.find(_relatedObjectName) != this->factories.end();
 }
 
-void ls_std::SerializableFactory::_init()
+void ls_std::SerializableJSONFactory::_init()
 {
   this->factories.insert({ls_std::Boolean{}.getClassName(), std::make_shared<ls_std::SerializableJSONBooleanFactory>()});
   this->factories.insert({ls_std::Double{}.getClassName(), std::make_shared<ls_std::SerializableJSONDoubleFactory>()});

+ 12 - 12
test/cases/factory/serialization/SerializableFactoryTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-04-24
+ * Changed:         2021-04-25
  *
  * */
 
@@ -30,7 +30,7 @@ namespace
   TEST_F(SerializableFactoryTest, addFactory)
   {
     std::shared_ptr<ls_std_test::SerializableTestFactory> serializableTestFactory = std::make_shared<ls_std_test::SerializableTestFactory>();
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
 
     ASSERT_TRUE(serializableFactory.addFactory({"TestClass", serializableTestFactory}));
   }
@@ -38,7 +38,7 @@ namespace
   TEST_F(SerializableFactoryTest, addFactory_emptyKey)
   {
     std::shared_ptr<ls_std_test::SerializableTestFactory> serializableTestFactory = std::make_shared<ls_std_test::SerializableTestFactory>();
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
 
     EXPECT_THROW({
                    try
@@ -56,7 +56,7 @@ namespace
   TEST_F(SerializableFactoryTest, addFactory_nullPointerValueForFactory)
   {
     std::shared_ptr<ls_std_test::SerializableTestFactory> serializableTestFactory{};
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
 
     EXPECT_THROW({
                    try
@@ -74,7 +74,7 @@ namespace
   TEST_F(SerializableFactoryTest, addFactory_dublicatedElement)
   {
     std::shared_ptr<ls_std_test::SerializableTestFactory> serializableTestFactory = std::make_shared<ls_std_test::SerializableTestFactory>();
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
 
     ASSERT_TRUE(serializableFactory.addFactory({"TestClass", serializableTestFactory}));
     ASSERT_FALSE(serializableFactory.addFactory({"TestClass", serializableTestFactory}));
@@ -82,7 +82,7 @@ namespace
 
   TEST_F(SerializableFactoryTest, build)
   {
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
     std::shared_ptr<ls_std::Class> serializable = serializableFactory.build(ls_std::Boolean{}.getClassName());
 
     ASSERT_TRUE(serializable != nullptr);
@@ -91,7 +91,7 @@ namespace
 
   TEST_F(SerializableFactoryTest, build_factoryNotAvailable)
   {
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
     std::shared_ptr<ls_std::Class> serializable = serializableFactory.build(ls_std_test::GossipNewsAgency{}.getClassName());
 
     ASSERT_FALSE(serializable != nullptr);
@@ -99,13 +99,13 @@ namespace
 
   TEST_F(SerializableFactoryTest, clear)
   {
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
     ASSERT_TRUE(serializableFactory.clear());
   }
 
   TEST_F(SerializableFactoryTest, hasFactory_ofBoxingPackage)
   {
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
     ASSERT_TRUE(serializableFactory.hasFactory(ls_std::Boolean{}.getClassName()));
     ASSERT_TRUE(serializableFactory.hasFactory(ls_std::Double{}.getClassName()));
     ASSERT_TRUE(serializableFactory.hasFactory(ls_std::Float{}.getClassName()));
@@ -116,19 +116,19 @@ namespace
 
   TEST_F(SerializableFactoryTest, hasFactory_factoryNotAvailable)
   {
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
     ASSERT_FALSE(serializableFactory.hasFactory(ls_std_test::GossipNewsAgency{}.getClassName()));
   }
 
   TEST_F(SerializableFactoryTest, removeFactory)
   {
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
     ASSERT_TRUE(serializableFactory.removeFactory(ls_std::Boolean{}.getClassName()));
   }
 
   TEST_F(SerializableFactoryTest, removeFactory_factoryNotAvailable)
   {
-    ls_std::SerializableFactory serializableFactory{};
+    ls_std::SerializableJSONFactory serializableFactory{};
     ASSERT_FALSE(serializableFactory.removeFactory(ls_std_test::GossipNewsAgency{}.getClassName()));
   }
 }