QPR-11568 align behaviour of factories

Author: pcaspers

OREData/ored/model/calibrationinstrumentfactory.cpp

@@ -33,10 +33,11 @@ boost::shared_ptr<CalibrationInstrument> CalibrationInstrumentFactory::build(con
 }
 
 void CalibrationInstrumentFactory::addBuilder(const string& instrumentType,
-    function<boost::shared_ptr<CalibrationInstrument>()> builder) {
+                                              function<boost::shared_ptr<CalibrationInstrument>()> builder,
+                                              const bool allowOverwrite) {
     boost::unique_lock<boost::shared_mutex> lock(mutex_);
-    map_[instrumentType] = builder;
+    QL_REQUIRE(map_.insert(std::make_pair(instrumentType, builder)).second,
+               "CalibrationInstrumentFactory::addBuilder(" << instrumentType << "): builder for key already exists.");
 }
-
 }
 }

OREData/ored/model/calibrationinstrumentfactory.hpp

@@ -87,7 +87,8 @@ class CalibrationInstrumentFactory
     /*! Add a builder function \p builder for a given \p instrumentType
      */
     void addBuilder(const std::string& instrumentType,
-                    std::function<boost::shared_ptr<CalibrationInstrument>()> builder);
+                    std::function<boost::shared_ptr<CalibrationInstrument>()> builder,
+                    const bool allowOverwrite = false);
 
 private:
     boost::shared_mutex mutex_;

OREData/ored/portfolio/legdatafactory.cpp

@@ -18,6 +18,8 @@
 
 #include <ored/portfolio/legdatafactory.hpp>
 
+#include <ql/errors.hpp>
+
 using std::function;
 using std::string;
 
@@ -32,9 +34,11 @@ boost::shared_ptr<LegAdditionalData> LegDataFactory::build(const string& legType
     return it->second();
 }
 
-void LegDataFactory::addBuilder(const string& legType, function<boost::shared_ptr<LegAdditionalData>()> builder) {
+void LegDataFactory::addBuilder(const string& legType, function<boost::shared_ptr<LegAdditionalData>()> builder,
+                                const bool allowOverwrite) {
     boost::unique_lock<boost::shared_mutex> lock(mutex_);
-    map_[legType] = builder;
+    QL_REQUIRE(map_.insert(std::make_pair(legType, builder)).second || allowOverwrite,
+               "LegDataFactory::addBuilder(" << legType << "): builder for key already exists.");
 }
 
 } // namespace data

OREData/ored/portfolio/legdatafactory.hpp

@@ -82,41 +82,13 @@ class LegDataFactory : public QuantLib::Singleton<LegDataFactory, std::integral_
 
     /*! Add a builder function \p builder for a given \p legType
      */
-    void addBuilder(const std::string& legType, std::function<boost::shared_ptr<LegAdditionalData>()> builder);
+    void addBuilder(const std::string& legType, std::function<boost::shared_ptr<LegAdditionalData>()> builder,
+                    const bool allowOverwrite = false);
 
 private:
     boost::shared_mutex mutex_;
     map_type map_;
 };
 
-/*! Leg data registration class
-
-    This class is used in any class derived from \c LegAdditionalData to register itself with the \c LegDataFactory so
-    that it can be built via a call to <code>LegDataFactory::instance().build(const std::string& legType)</code>
-
-    As a concrete example, a \c FixedLegData class derived from \c LegAdditionalData should have the following form
-    in order to register it with the \c LegDataFactory:
-
-    In fixedlegdata.hpp
-    \code{.cpp}
-    class FixedLegData : public LegAdditionalData {
-    public:
-    private:
-        static LegDataRegister<FixedLegData> reg_;
-    }
-    \endcode
-
-    In fixedlegdata.cpp
-    \code{.cpp}
-    LegDataRegister<FixedLegData> FixedLegData::reg_("Fixed");
-    \endcode
-
-    \ingroup portfolio
-*/
-template <class T> struct LegDataRegister {
-public:
-    LegDataRegister(const std::string& legType) { LegDataFactory::instance().addBuilder(legType, &createLegData<T>); }
-};
-
 } // namespace data
 } // namespace ore

OREData/ored/portfolio/referencedatafactory.cpp

@@ -18,6 +18,8 @@
 
 #include <ored/portfolio/referencedatafactory.hpp>
 
+#include <ql/errors.hpp>
+
 using std::string;
 
 namespace ore {
@@ -32,9 +34,11 @@ boost::shared_ptr<ReferenceDatum> ReferenceDatumFactory::build(const string& ref
 }
 
 void ReferenceDatumFactory::addBuilder(const string& refDatumType,
-                                       std::function<boost::shared_ptr<AbstractReferenceDatumBuilder>()> builder) {
+                                       std::function<boost::shared_ptr<AbstractReferenceDatumBuilder>()> builder,
+                                       const bool allowOverwrite) {
     boost::unique_lock<boost::shared_mutex> lock(mutex_);
-    map_[refDatumType] = builder;
+    QL_REQUIRE(map_.insert(std::make_pair(refDatumType, builder)).second,
+               "ReferenceDatumFactory::addBuilder(" << refDatumType << "): builder for key already exists.");
 }
 
 } // namespace data

OREData/ored/portfolio/referencedatafactory.hpp

@@ -59,7 +59,8 @@ class ReferenceDatumFactory : public QuantLib::Singleton<ReferenceDatumFactory,
     boost::shared_ptr<ReferenceDatum> build(const std::string& refDatumType);
 
     void addBuilder(const std::string& refDatumType,
-                    std::function<boost::shared_ptr<AbstractReferenceDatumBuilder>()> builder);
+                    std::function<boost::shared_ptr<AbstractReferenceDatumBuilder>()> builder,
+                    const bool allowOverwrite = false);
 
 private:
     boost::shared_mutex mutex_;