Don't generate Error ResponseStatus Types in Swift which are now included in JsonServiceClient.swift

mythz · mythz · commit d96544fec4ef · 2015-09-21T15:57:56.000-07:00
diff --git a/src/ServiceStack/NativeTypes/Java/JavaGenerator.cs b/src/ServiceStack/NativeTypes/Java/JavaGenerator.cs
@@ -11,11 +11,13 @@ namespace ServiceStack.NativeTypes.Java
     public class JavaGenerator
     {
         readonly MetadataTypesConfig Config;
+        readonly List<MetadataType> AllTypes;
         List<string> conflictTypeNames = new List<string>();
 
         public JavaGenerator(MetadataTypesConfig config)
         {
             Config = config;
+            AllTypes = new List<MetadataType>();
         }
 
         public static string DefaultGlobalNamespace = "dto";
@@ -143,20 +145,18 @@ public string GetCode(MetadataTypes metadata, IRequest request, INativeTypesMeta
                 .Select(x => x.Response).ToHashSet();
             var types = metadata.Types.ToHashSet();
 
-            var allTypes = new List<MetadataType>();
-            allTypes.AddRange(types);
-            allTypes.AddRange(responseTypes);
-            allTypes.AddRange(requestTypes);
-            allTypes.RemoveAll(x => x.IgnoreType(Config));
+            AllTypes.AddRange(requestTypes);
+            AllTypes.AddRange(responseTypes);
+            AllTypes.AddRange(types);
 
             //TypeScript doesn't support reusing same type name with different generic airity
-            var conflictPartialNames = allTypes.Map(x => x.Name).Distinct()
+            var conflictPartialNames = AllTypes.Map(x => x.Name).Distinct()
                 .GroupBy(g => g.SplitOnFirst('`')[0])
                 .Where(g => g.Count() > 1)
                 .Select(g => g.Key)
                 .ToList();
 
-            this.conflictTypeNames = allTypes
+            this.conflictTypeNames = AllTypes
                 .Where(x => conflictPartialNames.Any(name => x.Name.StartsWith(name)))
                 .Map(x => x.Name);
 
@@ -167,7 +167,7 @@ public string GetCode(MetadataTypes metadata, IRequest request, INativeTypesMeta
             sb.AppendLine("{");
 
             //ServiceStack core interfaces
-            foreach (var type in allTypes)
+            foreach (var type in AllTypes)
             {
                 var fullTypeName = type.GetFullName();
                 if (requestTypes.Contains(type))
diff --git a/src/ServiceStack/NativeTypes/Swift/SwiftGenerator.cs b/src/ServiceStack/NativeTypes/Swift/SwiftGenerator.cs
@@ -52,7 +52,7 @@ public SwiftGenerator(MetadataTypesConfig config)
         public string GetCode(MetadataTypes metadata, IRequest request)
         {
             var typeNamespaces = new HashSet<string>();
-            metadata.RemoveIgnoredTypes(Config);
+            RemoveIgnoredTypes(metadata);
             metadata.Types.Each(x => typeNamespaces.Add(x.Namespace));
             metadata.Operations.Each(x => typeNamespaces.Add(x.Request.Namespace));
 
@@ -97,9 +97,9 @@ public string GetCode(MetadataTypes metadata, IRequest request)
                 .Select(x => x.Response).ToHashSet();
             var types = metadata.Types.ToHashSet();
 
-            AllTypes.AddRange(types);
-            AllTypes.AddRange(responseTypes);
             AllTypes.AddRange(requestTypes);
+            AllTypes.AddRange(responseTypes);
+            AllTypes.AddRange(types);
 
             //Swift doesn't support reusing same type name with different generic airity
             var conflictPartialNames = AllTypes.Map(x => x.Name).Distinct()
@@ -185,6 +185,20 @@ public string GetCode(MetadataTypes metadata, IRequest request)
             return sb.ToString();
         }
 
+        //Use built-in types already in net.servicestack.client package
+        public static HashSet<string> IgnoreTypeNames = new HashSet<string>
+        {
+            typeof(ResponseStatus).Name,
+            typeof(ResponseError).Name,
+            typeof(ErrorResponse).Name,
+        };
+
+        private void RemoveIgnoredTypes(MetadataTypes metadata)
+        {
+            metadata.RemoveIgnoredTypes(Config);
+            metadata.Types.RemoveAll(x => IgnoreTypeNames.Contains(x.Name));
+        }
+
         private string AppendType(ref StringBuilderWrapper sb, ref StringBuilderWrapper sbExt, MetadataType type, string lastNS,
             CreateTypeOptions options)
         {
diff --git a/tests/Check.ServiceInterface/NativeTypesTestService.cs b/tests/Check.ServiceInterface/NativeTypesTestService.cs
@@ -82,6 +82,11 @@ public object Any(HelloAllTypes request)
             };
         }
 
+        public object Any(AllTypes request)
+        {
+            return request;
+        }
+
         public object Any(HelloString request)
         {
             return request.Name;
diff --git a/tests/Check.ServiceModel/CodeGenTestTypes.cs b/tests/Check.ServiceModel/CodeGenTestTypes.cs
@@ -292,7 +292,7 @@ public class HelloWithTypeResponse
 
 namespace Check.ServiceModel.Types
 {
-    public class AllTypes
+    public class AllTypes : IReturn<AllTypes>
     {
         public int Id { get; set; }
         public int? NullableId { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,11 @@ public object Any(HelloAllTypes request)`
`82`	`82`	`};`
`83`	`83`	`}`
`84`	`84`
	`85`	`+ public object Any(AllTypes request)`
	`86`	`+ {`
	`87`	`+ return request;`
	`88`	`+ }`
	`89`	`+`
`85`	`90`	`public object Any(HelloString request)`
`86`	`91`	`{`
`87`	`92`	`return request.Name;`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ public class HelloWithTypeResponse`
`292`	`292`
`293`	`293`	`namespace Check.ServiceModel.Types`
`294`	`294`	`{`
`295`		`- public class AllTypes`
	`295`	`+ public class AllTypes : IReturn<AllTypes>`
`296`	`296`	`{`
`297`	`297`	`public int Id { get; set; }`
`298`	`298`	`public int? NullableId { get; set; }`