Remove SS.Text restrictions

Author: mythz

src/ServiceStack.Text/Json/JsonReader.Generic.cs

@@ -65,7 +65,7 @@ public static ParseStringDelegate GetParseFn()
 
         public static object Parse(string value)
         {
-            TypeConfig<T>.AssertValidUsage();
+            TypeConfig<T>.Init();
 
             if (ReadFn == null)
             {

src/ServiceStack.Text/Json/JsonWriter.Generic.cs

@@ -194,7 +194,7 @@ public static void WriteObject(TextWriter writer, object value)
 #if __IOS__
 			if (writer == null) return;
 #endif
-            TypeConfig<T>.AssertValidUsage();
+            TypeConfig<T>.Init();
 
             try
             {
@@ -218,7 +218,7 @@ public static void WriteRootObject(TextWriter writer, object value)
 #if __IOS__
 			if (writer == null) return;
 #endif
-            TypeConfig<T>.AssertValidUsage();
+            TypeConfig<T>.Init();
 
             JsState.Depth = 0;
             CacheFn(writer, value);

src/ServiceStack.Text/Jsv/JsvReader.Generic.cs

@@ -65,7 +65,7 @@ public static ParseStringDelegate GetParseFn()
 
         public static object Parse(string value)
         {
-            TypeConfig<T>.AssertValidUsage();
+            TypeConfig<T>.Init();
 
             if (ReadFn == null)
             {

src/ServiceStack.Text/Jsv/JsvWriter.Generic.cs

@@ -137,7 +137,7 @@ public static void WriteObject(TextWriter writer, object value)
 #if __IOS__
 			if (writer == null) return;
 #endif
-            TypeConfig<T>.AssertValidUsage();
+            TypeConfig<T>.Init();
 
             try
             {
@@ -161,15 +161,7 @@ public static void WriteRootObject(TextWriter writer, object value)
 #if __IOS__
 			if (writer == null) return;
 #endif
-            try
-            {
-                TypeConfig<T>.AssertValidUsage();
-            }
-            catch (Exception ex)
-            {
-                var inner = ex.GetInnerMostException();
-                throw inner;
-            }
+            TypeConfig<T>.Init();
 
             JsState.Depth = 0;
             CacheFn(writer, value);

src/ServiceStack.Text/LicenseUtils.cs

@@ -131,7 +131,6 @@ public static void Init()
         public static class ErrorMessages
         {
             private const string UpgradeInstructions = " Please see https://servicestack.net to upgrade to a commercial license or visit https://github.com/ServiceStackV3/ServiceStackV3 to revert back to the free ServiceStack v3.";
-            internal const string ExceededTextTypes = "The free-quota limit on '{0} ServiceStack.Text Types' has been reached." + UpgradeInstructions;
             internal const string ExceededRedisTypes = "The free-quota limit on '{0} Redis Types' has been reached." + UpgradeInstructions;
             internal const string ExceededRedisRequests = "The free-quota limit on '{0} Redis requests per hour' has been reached." + UpgradeInstructions;
             internal const string ExceededOrmLiteTables = "The free-quota limit on '{0} OrmLite Tables' has been reached." + UpgradeInstructions;
@@ -146,7 +145,6 @@ public static class FreeQuotas
         {
             public const int ServiceStackOperations = 10;
             public const int TypeFields = 20;
-            public const int TextTypes = 80;
             public const int RedisTypes = 20;
             public const int RedisRequestPerHour = 6000;
             public const int OrmLiteTables = 10;
@@ -254,15 +252,6 @@ public static void AssertValidUsage(LicenseFeature feature, QuotaType quotaType,
             //Free Quotas
             switch (feature)
             {
-                case LicenseFeature.Text:
-                    switch (quotaType)
-                    {
-                        case QuotaType.Types:
-                            ApprovedUsage(licensedFeatures, feature, FreeQuotas.TextTypes, count, ErrorMessages.ExceededTextTypes);
-                            return;
-                    }
-                    break;
-
                 case LicenseFeature.Redis:
                     switch (quotaType)
                     {
@@ -446,6 +435,7 @@ static class _approved
             };
         }
 
+        [Obsolete("Should no longer be needed")]
         public static IDisposable RequestAccess(object accessToken, LicenseFeature srcFeature, LicenseFeature requestedAccess)
         {
             var accessType = accessToken.GetType();

src/ServiceStack.Text/TypeConfig.cs

@@ -13,13 +13,6 @@ internal class TypeConfig
         internal Func<object, string, object, object> OnDeserializing;
         internal bool IsUserType { get; set; }
 
-        internal void AssertValidUsage()
-        {
-            if (!IsUserType) return;
-
-            LicenseUtils.AssertValidUsage(LicenseFeature.Text, QuotaType.Types, JsConfig.__uniqueTypesCount);
-        }
-
         internal TypeConfig(Type type)
         {
             Type = type;
@@ -37,7 +30,7 @@ public static class TypeConfig<T>
 
         static TypeConfig Config
         {
-            get { return config ?? (config = Init()); }
+            get { return config ?? (config = Create()); }
         }
 
         public static PropertyInfo[] Properties
@@ -66,7 +59,15 @@ public static bool IsUserType
 
         static TypeConfig()
         {
-            config = Init();
+            Init();
+        }
+
+        internal static void Init()
+        {
+            if (config == null)
+            {
+                Create();
+            }
         }
 
         public static Func<object, string, object, object> OnDeserializing
@@ -75,7 +76,7 @@ public static Func<object, string, object, object> OnDeserializing
             set { config.OnDeserializing = value; }
         }
 
-        static TypeConfig Init()
+        static TypeConfig Create()
         {
             config = new TypeConfig(typeof(T));
 
@@ -107,10 +108,5 @@ internal static TypeConfig GetState()
         {
             return Config;
         }
-
-        internal static void AssertValidUsage()
-        {
-            Config.AssertValidUsage();
-        }
     }
 }

tests/ServiceStack.Text.Tests/LicensingTests.cs

@@ -35,7 +35,6 @@ public class LicensingTests
         const string TestIndie2013Text = "1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBJbmRpZSxUeXBlOkluZGllLEhhc2g6UGJyTWlRL205YkpCN3NoUGFBelZKVkppZERHRjQwK2JiVWpvOWtrLzgrTUF3UmZZOE0rUkNHMTRYZ055S2ZFT29aNDY4c0FXS2dLRGlVZzEvVmViNjN5M2FpNTh5T2JTZ3RIL2tEdzhDL1VFOEZrazRhMEMrdEtNVU4xQlFxVHBEU21HQUZESUxuOHQ1M2lFWE9tK014MWZCNFEvbitFQUJTMVhvbjBlUE1zPSxFeHBpcnk6MjAxNC0wMS0wMX0=";
         readonly LicenseKey TestIndie2013 = new LicenseKey { Ref = "1001", Name = "Test Indie", Type = LicenseType.Indie, Expiry = new DateTime(2014, 01, 01) };
         const string TestText2013Text = "1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBUZXh0LFR5cGU6VGV4dEluZGllLEhhc2g6V3liaFpUejZiMWgxTGhCcmRRSzlNc09FVUsya3Z6Z2E5VDBaRCtEWnlBd0JxM1dabVFVanNaelgwTWR5OXJMSTlmbzJ0dVVOMk9iZ2srcmswdVZGeit6Q1dreTk3SFE5OHhkOGtDRkx0LzQxR2RiU054SnFIVUlmR1hMdS9CQTVOR0lKanN3SjhXTjdyY0R0VmYyTllKK2dEaFd1RzZ4cnB1ZXhYa01WSXFrPSxFeHBpcnk6MjAxMy0wMS0wMX0=";
-        readonly LicenseKey TestText2013 = new LicenseKey { Ref = "1001", Name = "Test Text", Type = LicenseType.TextIndie, Expiry = new DateTime(2013, 01, 01) };
 
         const string TestTrial2001Text = "TRIAL302001-e1JlZjpUUklBTDMwMjAwMSxOYW1lOlRyaWFsIFRlc3QsVHlwZTpUcmlhbCxIYXNoOlRGRlNVQTRHYWtiY2tmYlpsOHpsbXhVZUpLZ0pORkxaQ1pJckxwSEJpdTVtSXAzWEx4NGFmd0ZGa2duYzNkZTlUUjczR3hKdVdjMkVnQXF0dzdERVNxVWQwOTBFQ09UOXZ3eGNsMjR4V3BXSkwvM1A5TW1RN283bGp1ckJzV2wvL3AzVFpXajlmeTIzcVA0T3B5YmEzTzhLcmhoTXNnZ3k3c0dGL0JOVmdjbz0sRXhwaXJ5OjIwMDEtMDEtMDF9";
         readonly LicenseKey TestTrial2001 = new LicenseKey { Ref = "TRIAL302001", Name = "Trial Test", Type = LicenseType.Trial, Expiry = new DateTime(2001, 01, 01) };
@@ -48,7 +47,6 @@ public IEnumerable AllLicenseUseCases
             {
                 return new[]
                 {
-                    new LicenseUseCase(LicenseFeature.Text, QuotaType.Types, LicenseUtils.FreeQuotas.TextTypes),
                     new LicenseUseCase(LicenseFeature.Redis, QuotaType.Types, LicenseUtils.FreeQuotas.RedisTypes),
                     new LicenseUseCase(LicenseFeature.OrmLite, QuotaType.Tables, LicenseUtils.FreeQuotas.OrmLiteTables),
                     new LicenseUseCase(LicenseFeature.Aws, QuotaType.Tables, LicenseUtils.FreeQuotas.AwsTables),
@@ -186,7 +184,6 @@ public void Can_deserialize_all_license_key()
             AssertKey(TestIndie2000Text, TestIndie2000);
             AssertKey(TestBusiness2013Text, TestBusiness2013);
             AssertKey(TestIndie2013Text, TestIndie2013);
-            AssertKey(TestText2013Text, TestText2013);
             AssertKey(TestTrial2001Text, TestTrial2001);
             AssertKey(TestTrial2016Text, TestTrial2016);
         }