Make the configuration manager public

src/autowiring/CoreContext.cpp

@@ -969,11 +969,3 @@ std::shared_ptr<CoreContext> CoreContext::SetCurrent(void) {
 void CoreContext::EvictCurrent(void) {
   autoCurrentContext.reset();
 }
-
-void CoreContext::ConfigSet(std::string name, std::string value) {
-  m_cfgManager.Set(std::move(name), std::move(value));
-}
-
-const std::string& CoreContext::ConfigGet(std::string name) const {
-  return m_cfgManager.Get(std::move(name));
-}

src/autowiring/CoreContext.h

@@ -134,6 +134,9 @@ class CoreContext:
   // Asserted any time a new object is added to the context
   autowiring::signal<void(const CoreObjectDescriptor&)> newObject;
 
+  // The one and only configuration manager type
+  autowiring::ConfigManager Config;
+
   virtual ~CoreContext(void);
 
   /// <summary>
@@ -215,9 +218,6 @@ class CoreContext:
   std::vector<ContextMember*> m_contextMembers;
   std::vector<ExceptionFilter*> m_filters;
 
-  // The one and only configuration manager type
-  autowiring::ConfigManager m_cfgManager;
-
   // Context members from other contexts that have snooped this context
   std::set<AnySharedPointer> m_snoopers;
 
@@ -616,7 +616,7 @@ class CoreContext:
     // value of pConfigDesc because it's a little faster and one necessarily follows the other
     // We also want this to happen before the AutoInit call is made
     if(autowiring::has_getconfigdescriptor<T>::value)
-      m_cfgManager.Register(static_cast<T*>(retVal.get()), *objDesc.pConfigDesc);
+      Config.Register(static_cast<T*>(retVal.get()), *objDesc.pConfigDesc);
 
     // AutoInit if sensible to do so:
     CallAutoInit(*retVal, has_autoinit<T>());
@@ -970,16 +970,6 @@ class CoreContext:
     memo.onSatisfied += std::forward<Fn&&>(listener);
   }
 
-  /// <summary>
-  /// Sets a single configuration value from the context
-  /// </summary>
-  void ConfigSet(std::string name, std::string value);
-
-  /// <summary>
-  /// Gets a configuration value from the context
-  /// </summary>
-  const std::string& ConfigGet(std::string name) const;
-
   /// <summary>
   /// Adds a teardown notifier which receives a pointer to this context on destruction
   /// </summary>

src/autowiring/test/AutoConfigTest.cpp

@@ -136,7 +136,7 @@ TEST_F(AutoConfigTest, Configurable) {
 
   ASSERT_TRUE(c->cfg.clear_dirty()) << "Dirty flag was not set on a value that should have been dirty";
   ASSERT_FALSE(c->cfg.is_dirty());
-  ctxt->ConfigSet("cfg", "888");
+  ctxt->Config.Set("cfg", "888");
   ASSERT_TRUE(c->cfg.is_dirty()) << "Dirty flag not set correctly after being updated in configuration";
   ASSERT_TRUE(c->cfg.clear_dirty());
   ASSERT_EQ(888, c->cfg);
@@ -146,13 +146,13 @@ TEST_F(AutoConfigTest, ContextSetSimple) {
   AutoCurrentContext ctxt;
   AutoRequired<MyConfigurableClass> mcc;
 
-  ctxt->ConfigSet("b", "1029");
+  ctxt->Config.Set("b", "1029");
   ASSERT_EQ(mcc->b, 1029);
 }
 
 TEST_F(AutoConfigTest, ContextSetAfter) {
   AutoCurrentContext ctxt;
-  ctxt->ConfigSet("b", "10442");
+  ctxt->Config.Set("b", "10442");
 
   AutoRequired<MyConfigurableClass> mcc;
   ASSERT_EQ(mcc->b, 10442);