QPR-11568 align bond factory behaviour

Author: pcaspers

OREData/ored/portfolio/bond.cpp

@@ -325,13 +325,13 @@ BondBuilder::Result BondFactory::build(const boost::shared_ptr<EngineFactory>& e
                "data and that there is a builder for the reference data type.");
 }
 
-void BondFactory::addBuilder(const std::string& referenceDataType, const boost::shared_ptr<BondBuilder>& builder) {
+void BondFactory::addBuilder(const std::string& referenceDataType, const boost::shared_ptr<BondBuilder>& builder,
+                             const bool allowOverwrite) {
     boost::unique_lock<boost::shared_mutex> lock(mutex_);
-    builders_[referenceDataType] = builder;
+    QL_REQUIRE(builders_.insert(std::make_pair(referenceDataType, builder)).second || allowOverwrite,
+               "BondFactory::addBuilder(" << referenceDataType << "): builder for key already exists.");
 }
 
-BondBuilderRegister<VanillaBondBuilder> VanillaBondBuilder::reg_("Bond");
-
 BondBuilder::Result VanillaBondBuilder::build(const boost::shared_ptr<EngineFactory>& engineFactory,
                                               const boost::shared_ptr<ReferenceDataManager>& referenceData,
                                               const std::string& securityId) const {

OREData/ored/portfolio/bond.hpp

@@ -207,17 +207,11 @@ class BondFactory : public QuantLib::Singleton<BondFactory, std::integral_consta
     BondBuilder::Result build(const boost::shared_ptr<EngineFactory>& engineFactory,
                               const boost::shared_ptr<ReferenceDataManager>& referenceData,
                               const std::string& securityId) const;
-    void addBuilder(const std::string& referenceDataType, const boost::shared_ptr<BondBuilder>& builder);
-};
-
-template <typename T> struct BondBuilderRegister {
-    BondBuilderRegister<T>(const std::string& referenceDataType) {
-        BondFactory::instance().addBuilder(referenceDataType, boost::make_shared<T>());
-    }
+    void addBuilder(const std::string& referenceDataType, const boost::shared_ptr<BondBuilder>& builder,
+                    const bool allowOverwrite = false);
 };
 
 struct VanillaBondBuilder : public BondBuilder {
-    static BondBuilderRegister<VanillaBondBuilder> reg_;
     virtual Result build(const boost::shared_ptr<EngineFactory>& engineFactory,
                          const boost::shared_ptr<ReferenceDataManager>& referenceData,
                          const std::string& securityId) const override;