Ser/De: Arrays. Refactor method names.

Author: lganzzzo

src/oatpp-postgresql/mapping/Deserializer.cpp

@@ -64,9 +64,9 @@ Deserializer::Deserializer() {
   setDeserializerMethod(data::mapping::type::__class::AbstractObject::CLASS_ID, nullptr);
   setDeserializerMethod(data::mapping::type::__class::AbstractEnum::CLASS_ID, &Deserializer::deserializeEnum);
 
-  setDeserializerMethod(data::mapping::type::__class::AbstractVector::CLASS_ID, &Deserializer::deserializeArray2<oatpp::AbstractVector>);
-  setDeserializerMethod(data::mapping::type::__class::AbstractList::CLASS_ID, &Deserializer::deserializeArray2<oatpp::AbstractList>);
-  setDeserializerMethod(data::mapping::type::__class::AbstractUnorderedSet::CLASS_ID, &Deserializer::deserializeArray2<oatpp::AbstractUnorderedSet>);
+  setDeserializerMethod(data::mapping::type::__class::AbstractVector::CLASS_ID, &Deserializer::deserializeArray<oatpp::AbstractVector>);
+  setDeserializerMethod(data::mapping::type::__class::AbstractList::CLASS_ID, &Deserializer::deserializeArray<oatpp::AbstractList>);
+  setDeserializerMethod(data::mapping::type::__class::AbstractUnorderedSet::CLASS_ID, &Deserializer::deserializeArray<oatpp::AbstractUnorderedSet>);
 
   setDeserializerMethod(data::mapping::type::__class::AbstractPairList::CLASS_ID, nullptr);
   setDeserializerMethod(data::mapping::type::__class::AbstractUnorderedMap::CLASS_ID, nullptr);

src/oatpp-postgresql/mapping/Deserializer.hpp

@@ -33,9 +33,9 @@
 #include <libpq-fe.h>
 
 #if defined(WIN32) || defined(_WIN32)
-#include <WinSock2.h>
+  #include <WinSock2.h>
 #else
-#include <arpa/inet.h>
+  #include <arpa/inet.h>
 #endif
 
 namespace oatpp { namespace postgresql { namespace mapping {
@@ -212,7 +212,7 @@ class Deserializer {
   }
 
   template<class Collection>
-  static oatpp::Void deserializeArray2(const Deserializer* _this, const InData& data, const Type* type) {
+  static oatpp::Void deserializeArray(const Deserializer* _this, const InData& data, const Type* type) {
 
     if(data.isNull) {
       return oatpp::Void(nullptr, type);

src/oatpp-postgresql/mapping/Serializer.cpp

@@ -65,9 +65,9 @@ void Serializer::setSerializerMethods() {
 
   setSerializerMethod(data::mapping::type::__class::AbstractEnum::CLASS_ID, &Serializer::serializeEnum);
 
-  setSerializerMethod(data::mapping::type::__class::AbstractVector::CLASS_ID, &Serializer::serializeArray2<oatpp::AbstractVector>);
-  setSerializerMethod(data::mapping::type::__class::AbstractList::CLASS_ID, &Serializer::serializeArray2<oatpp::AbstractList>);
-  setSerializerMethod(data::mapping::type::__class::AbstractUnorderedSet::CLASS_ID, &Serializer::serializeArray2<oatpp::AbstractUnorderedSet>);
+  setSerializerMethod(data::mapping::type::__class::AbstractVector::CLASS_ID, &Serializer::serializeArray<oatpp::AbstractVector>);
+  setSerializerMethod(data::mapping::type::__class::AbstractList::CLASS_ID, &Serializer::serializeArray<oatpp::AbstractList>);
+  setSerializerMethod(data::mapping::type::__class::AbstractUnorderedSet::CLASS_ID, &Serializer::serializeArray<oatpp::AbstractUnorderedSet>);
 
   ////
 

src/oatpp-postgresql/mapping/Serializer.hpp

@@ -30,6 +30,12 @@
 
 #include <libpq-fe.h>
 
+#if defined(WIN32) || defined(_WIN32)
+  #include <WinSock2.h>
+#else
+  #include <arpa/inet.h>
+#endif
+
 namespace oatpp { namespace postgresql { namespace mapping {
 
 /**
@@ -172,7 +178,7 @@ class Serializer {
   }
 
   template<class Collection>
-  static void serializeArray2(const Serializer* _this, OutputData& outData, const oatpp::Void& polymorph) {
+  static void serializeArray(const Serializer* _this, OutputData& outData, const oatpp::Void& polymorph) {
 
     if(!polymorph) {
       serNull(outData);
@@ -183,7 +189,7 @@ class Serializer {
     const oatpp::Type* itemType = getArrayItemTypeAndDimensions(polymorph, meta.dimensions);
 
     if(meta.dimensions.empty()) {
-      throw std::runtime_error("[oatpp::postgresql::mapping::Serializer::serializeArray2()]: Error. "
+      throw std::runtime_error("[oatpp::postgresql::mapping::Serializer::serializeArray()]: Error. "
                                "Invalid array.");
     }