From 6e349546774097e06d925ef8c832044f222da403 Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Thu, 17 Jun 2021 16:21:28 +0200
Subject: [PATCH] Factory: Rename Builder class to Creator, since it's not 100%
 builder pattern

---
 .../cxx_include/esp_modem_dce_factory.hpp     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/esp_modem/include/cxx_include/esp_modem_dce_factory.hpp b/components/esp_modem/include/cxx_include/esp_modem_dce_factory.hpp
index cbd65d8a0..0050df278 100644
--- a/components/esp_modem/include/cxx_include/esp_modem_dce_factory.hpp
+++ b/components/esp_modem/include/cxx_include/esp_modem_dce_factory.hpp
@@ -57,30 +57,30 @@ public:
 };
 
 /**
- * @brief Builder class for building a DCE_T<Module> in a specific way, either from a Module object or by default from the DTE and netif
+ * @brief Creator class for building a DCE_T<Module> in a specific way, either from a Module object or by default from the DTE and netif
  *
  * @throws
  *      - esp_modem::esp_err_exception on invalid arguments
  *      - std::bad_alloc if failed to allocate
  */
 template<typename T_Module>
-class Builder {
+class Creator {
     static_assert(std::is_base_of<ModuleIf, T_Module>::value, "Builder must be used only for Module classes");
 public:
-    Builder(std::shared_ptr<DTE> dte, esp_netif_t *esp_netif): dte(std::move(dte)), device(nullptr), netif(esp_netif)
+    Creator(std::shared_ptr<DTE> dte, esp_netif_t *esp_netif): dte(std::move(dte)), device(nullptr), netif(esp_netif)
     {
         throw_if_false(netif != nullptr, "Null netif");
     }
 
-    Builder(std::shared_ptr<DTE> dte, esp_netif_t *esp_netif, std::shared_ptr<T_Module> dev): dte(std::move(dte)), device(std::move(dev)), netif(esp_netif)
+    Creator(std::shared_ptr<DTE> dte, esp_netif_t *esp_netif, std::shared_ptr<T_Module> dev): dte(std::move(dte)), device(std::move(dev)), netif(esp_netif)
     {
         throw_if_false(netif != nullptr, "Null netif");
     }
 
-    ~Builder()
+    ~Creator()
     {
-        if (device == nullptr) {
-            ESP_LOGE("dce_factory::~Builder", "module was captured or created but never used");
+        if (device != nullptr) {
+            ESP_LOGE("dce_factory::~Creator", "module was captured or created but never used");
         }
     }
 
@@ -233,16 +233,16 @@ protected:
     template <typename T_Module, typename Ptr = std::shared_ptr<T_Module>, typename ...Args>
     static Ptr build_module_T(const config *cfg, Args && ... args)
     {
-        Builder<T_Module> b(std::forward<Args>(args)...);
-        return b.template create_module<Ptr>(cfg);
+        Creator<T_Module> creator(std::forward<Args>(args)...);
+        return creator.template create_module<Ptr>(cfg);
     }
 
 
     template <typename T_Module, typename T_Dce = DCE_T<T_Module>, typename T_DcePtr = T_Dce *,  typename ...Args>
     static auto build_generic_DCE(const config *cfg, Args && ... args) -> T_DcePtr
     {
-        Builder<T_Module> b(std::forward<Args>(args)...);
-        return b.template create<T_Dce, T_DcePtr>(cfg);
+        Creator<T_Module> creator(std::forward<Args>(args)...);
+        return creator.template create<T_Dce, T_DcePtr>(cfg);
     }
 };