Renaming serialization methods based on boost and fixing copyright noticey

Author: Gabriele Gaetano Fronzé

Common/Utils/include/CommonUtils/BoostSerializer.h

@@ -69,7 +69,7 @@ class is_boost_serializable
 template <typename ContT>
 typename std::enable_if<check::is_boost_serializable<ContT, boost::archive::binary_oarchive>::value
                         && std::is_class<typename ContT::value_type>::value, std::ostringstream>::type
-  SerializeContainer(const ContT& dataSet)
+  BoostSerialize(const ContT &dataSet)
 {
   static_assert(check::is_boost_serializable<typename ContT::value_type, boost::archive::binary_oarchive>::value,
                 "This class doesn't provide a boost serializer.");
@@ -84,7 +84,7 @@ typename std::enable_if<check::is_boost_serializable<ContT, boost::archive::bina
 template <typename ContT, typename ContentT = typename ContT::value_type>
 typename std::enable_if<check::is_boost_serializable<ContT, boost::archive::binary_oarchive>::value
                         && !(std::is_class<ContentT>::value), std::ostringstream>::type
-  SerializeContainer(const ContT& dataSet)
+  BoostSerialize(const ContT &dataSet)
 {
   static_assert(boost::serialization::is_bitwise_serializable<typename ContT::value_type>::value,
                 "This type doesn't provide a boost serializer.");
@@ -99,7 +99,7 @@ typename std::enable_if<check::is_boost_serializable<ContT, boost::archive::bina
 template <typename ContT>
 typename std::enable_if<check::is_boost_serializable<ContT, boost::archive::binary_iarchive>::value
                         && std::is_class<typename ContT::value_type>::value, ContT>::type
-  DeserializeContainer(std::string& msgStr)
+  BoostDeserialize(std::string &msgStr)
 {
   static_assert(check::is_boost_serializable<typename ContT::value_type, boost::archive::binary_oarchive>::value,
                 "This class doesn't provide a boost deserializer.");
@@ -114,7 +114,7 @@ typename std::enable_if<check::is_boost_serializable<ContT, boost::archive::bina
 template <typename ContT, typename ContentT = typename ContT::value_type>
 typename std::enable_if<check::is_boost_serializable<ContT, boost::archive::binary_iarchive>::value
                         && !(std::is_class<ContentT>::value), ContT>::type
-  DeserializeContainer(std::string& msgStr)
+  BoostDeserialize(std::string &msgStr)
 {
   static_assert(boost::serialization::is_bitwise_serializable<typename ContT::value_type>::value,
                 "This type doesn't provide a boost serializer.");
@@ -125,6 +125,21 @@ typename std::enable_if<check::is_boost_serializable<ContT, boost::archive::bina
   inputArchive >> output;
   return std::move(output);
 }
+
+template <typename T>
+struct has_serializer
+{
+  template <class, class> class checker;
+
+  template <typename C>
+  static std::true_type test(checker<C, decltype(&o2::utils::BoostSerialize<C>)> *);
+
+  template <typename C>
+  static std::false_type test(...);
+
+  typedef decltype(test<T>(nullptr)) type;
+  static const bool value = std::is_same<std::true_type, decltype(test<T>(nullptr))>::value;
+};
 } // namespace utils
 } // namespace o2
 

Common/Utils/test/testBoostSerializer.cxx

@@ -1,9 +1,8 @@
-//
 // Copyright CERN and copyright holders of ALICE O2. This software is
 // distributed under the terms of the GNU General Public License v3 (GPL
 // Version 3), copied verbatim in the file "COPYING".
 //
-// See https://alice-o2.web.cern.ch/ for full licensing information.
+// See http://alice-o2.web.cern.ch/license for full licensing information.
 //
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
@@ -32,8 +31,8 @@ BOOST_AUTO_TEST_CASE(testTrivialTypeVect)
 
   contType inputV{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
-  auto msgStr = SerializeContainer(inputV).str();
-  auto inputV2 = DeserializeContainer<contType>(msgStr);
+  auto msgStr = BoostSerialize(inputV).str();
+  auto inputV2 = BoostDeserialize<contType>(msgStr);
 
   BOOST_TEST(inputV.size() == inputV2.size());
 
@@ -50,8 +49,8 @@ BOOST_AUTO_TEST_CASE(testTrivialTypeArray)
 
   contType inputV{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
-  auto msgStr = SerializeContainer(inputV).str();
-  auto inputV2 = DeserializeContainer<contType>(msgStr);
+  auto msgStr = BoostSerialize(inputV).str();
+  auto inputV2 = BoostDeserialize<contType>(msgStr);
 
   BOOST_TEST(inputV.size() == inputV2.size());
 
@@ -68,8 +67,8 @@ BOOST_AUTO_TEST_CASE(testTrivialTypeList)
 
   contType inputV{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
-  auto msgStr = SerializeContainer(inputV).str();
-  auto inputV2 = DeserializeContainer<contType>(msgStr);
+  auto msgStr = BoostSerialize(inputV).str();
+  auto inputV2 = BoostDeserialize<contType>(msgStr);
 
   BOOST_TEST(inputV.size() == inputV2.size());
 
@@ -92,8 +91,8 @@ BOOST_AUTO_TEST_CASE(testBoostSerialisedType)
     inputV.emplace_back(o2::mid::Cluster2D{ (uint8_t)i, 0.3f * iFloat, 0.5f * iFloat, 0.7f / iFloat, 0.9f / iFloat });
   }
 
-  auto msgStr = SerializeContainer(inputV).str();
-  auto inputV2 = DeserializeContainer<contType>(msgStr);
+  auto msgStr = BoostSerialize(inputV).str();
+  auto inputV2 = BoostDeserialize<contType>(msgStr);
 
   BOOST_TEST(inputV.size() == inputV2.size());
 
@@ -108,4 +107,4 @@ BOOST_AUTO_TEST_CASE(testBoostSerialisedType)
   }
 }
 
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END()