Retain backward compatibility with old AppSettings behavior

mythz · mythz · commit b09512c5a30e · 2012-12-06T03:36:55.000-05:00
diff --git a/src/ServiceStack/Configuration/AppSettings.cs b/src/ServiceStack/Configuration/AppSettings.cs
@@ -16,6 +16,16 @@ public string Get(string key)
         }
 
         public AppSettings() : base(new ConfigurationManagerWrapper()) {}
+
+        /// <summary>
+        /// Returns string if exists, otherwise null
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public override string GetString(string name) //Keeping backwards compatible
+        {
+            return base.GetNullableString(name); 
+        }
     }
 
     public class ConfigurationResourceManager : AppSettings {}
diff --git a/src/ServiceStack/Configuration/AppSettingsBase.cs b/src/ServiceStack/Configuration/AppSettingsBase.cs
@@ -15,15 +15,14 @@ public AppSettingsBase(ISettings settings)
             _settings = settings;
         }
 
-        public string GetNullableString(string name)
+        public virtual string GetNullableString(string name)
         {
             return _settings.Get(name);
         }
 
-        public string GetString(string name)
+        public virtual string GetString(string name)
         {
             var value = GetNullableString(name);
-
             if (value == null)
             {
                 throw new ConfigurationErrorsException(String.Format(ErrorAppsettingNotFound, name));
@@ -32,13 +31,13 @@ public string GetString(string name)
             return value;
         }
 
-        public IList<string> GetList(string key)
+        public virtual IList<string> GetList(string key)
         {
             var value = GetString(key);
             return ConfigUtils.GetListFromAppSettingValue(value);
         }
 
-        public IDictionary<string, string> GetDictionary(string key)
+        public virtual IDictionary<string, string> GetDictionary(string key)
         {
             var value = GetString(key);
             try
@@ -55,7 +54,7 @@ public IDictionary<string, string> GetDictionary(string key)
             }
         }
 
-        public T Get<T>(string name, T defaultValue)
+        public virtual T Get<T>(string name, T defaultValue)
         {
             var stringValue = GetNullableString(name);
 

Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,14 @@ public AppSettingsBase(ISettings settings)`
`15`	`15`	`_settings = settings;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public string GetNullableString(string name)`
	`18`	`+ public virtual string GetNullableString(string name)`
`19`	`19`	`{`
`20`	`20`	`return _settings.Get(name);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public string GetString(string name)`
	`23`	`+ public virtual string GetString(string name)`
`24`	`24`	`{`
`25`	`25`	`var value = GetNullableString(name);`
`26`		`-`
`27`	`26`	`if (value == null)`
`28`	`27`	`{`
`29`	`28`	`throw new ConfigurationErrorsException(String.Format(ErrorAppsettingNotFound, name));`
`@@ -32,13 +31,13 @@ public string GetString(string name)`
`32`	`31`	`return value;`
`33`	`32`	`}`
`34`	`33`
`35`		`- public IList<string> GetList(string key)`
	`34`	`+ public virtual IList<string> GetList(string key)`
`36`	`35`	`{`
`37`	`36`	`var value = GetString(key);`
`38`	`37`	`return ConfigUtils.GetListFromAppSettingValue(value);`
`39`	`38`	`}`
`40`	`39`
`41`		`- public IDictionary<string, string> GetDictionary(string key)`
	`40`	`+ public virtual IDictionary<string, string> GetDictionary(string key)`
`42`	`41`	`{`
`43`	`42`	`var value = GetString(key);`
`44`	`43`	`try`
`@@ -55,7 +54,7 @@ public IDictionary<string, string> GetDictionary(string key)`
`55`	`54`	`}`
`56`	`55`	`}`
`57`	`56`
`58`		`- public T Get<T>(string name, T defaultValue)`
	`57`	`+ public virtual T Get<T>(string name, T defaultValue)`
`59`	`58`	`{`
`60`	`59`	`var stringValue = GetNullableString(name);`
`61`	`60`