Skip to content

[C#][Nancy] return collections as arrays to response negotiator #4107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 5 commits into from
Nov 2, 2016
Merged

[C#][Nancy] return collections as arrays to response negotiator #4107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60eb299
Added switch to config to toggle use of yaml base path as module paths
simo9000 Oct 23, 2016
f6dc3ec
NancyFX template updated to return collections as array to allow fram…
simo9000 Oct 24, 2016
773c5b5
Added some more parser fixes for NancyFX
simo9000 Oct 26, 2016
70f11ba
Refactored collection parsers in Parameters.cs and changed some to re…
simo9000 Oct 27, 2016
3ba6b03
re-ran petstore build
simo9000 Nov 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/nancyfx/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace {{packageName}}.{{packageContext}}.Modules
{{/hasMore}}{{/isBodyParam}}{{/allParams}}{{#allParams}}{{#required}}
Preconditions.IsNotNull({{paramName}}, "Required parameter: '{{paramName}}' is missing at '{{operationId}}'");
{{/required}}{{/allParams}}
{{#returnType}}return {{/returnType}}service.{{operationId}}(Context{{#allParams.0}}, {{/allParams.0}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{^returnType}}
{{#returnType}}return {{/returnType}}service.{{operationId}}(Context{{#allParams.0}}, {{/allParams.0}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}{{#isListContainer}}.ToArray(){{/isListContainer}}{{/returnType}};{{^returnType}}
return new Response { ContentType = "{{produces.0.mediaType}}"};{{/returnType}}
};
{{/operation}}
Expand Down
183 changes: 106 additions & 77 deletions modules/swagger-codegen/src/main/resources/nancyfx/parameters.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,26 +166,27 @@ namespace {{packageName}}.{{packageContext}}.Utils
parsers.Put(typeof(LocalTime), SafeParse(ParseLocalTime));
parsers.Put(typeof(LocalTime?), SafeParse(ParseLocalTime));

parsers.Put(typeof(IEnumerable<string>), value => value);
parsers.Put(typeof(ICollection<string>), value => value);
parsers.Put(typeof(IList<string>), value => value);
parsers.Put(typeof(List<string>), value => value);
parsers.Put(typeof(ISet<string>), value => value);
parsers.Put(typeof(HashSet<string>), value => value);

parsers.Put(typeof(IEnumerable<bool>), ImmutableListParse(bool.Parse));
parsers.Put(typeof(ICollection<bool>), ImmutableListParse(bool.Parse));
parsers.Put(typeof(IList<bool>), ImmutableListParse(bool.Parse));
parsers.Put(typeof(List<bool>), ListParse(bool.Parse));
parsers.Put(typeof(ISet<bool>), ImmutableSetParse(bool.Parse));
parsers.Put(typeof(HashSet<bool>), SetParse(bool.Parse));
parsers.Put(typeof(IEnumerable<string>), ImmutableListParse(value => value));
parsers.Put(typeof(ICollection<string>), ImmutableListParse(value => value));
parsers.Put(typeof(IList<string>), ImmutableListParse(value => value));
parsers.Put(typeof(List<string>), ListParse(value => value));
parsers.Put(typeof(ISet<string>), ImmutableListParse(value => value));
parsers.Put(typeof(HashSet<string>), SetParse(value => value));

parsers.Put(typeof(IEnumerable<bool?>), NullableImmutableListParse(bool.Parse));
parsers.Put(typeof(ICollection<bool?>), NullableImmutableListParse(bool.Parse));
parsers.Put(typeof(IList<bool?>), NullableImmutableListParse(bool.Parse));
parsers.Put(typeof(List<bool?>), NullableListParse(bool.Parse));
parsers.Put(typeof(ISet<bool?>), NullableImmutableSetParse(bool.Parse));
parsers.Put(typeof(HashSet<bool?>), NullableSetParse(bool.Parse));

parsers.Put(typeof(IEnumerable<byte>), ImmutableListParse(byte.Parse));
parsers.Put(typeof(ICollection<byte>), ImmutableListParse(byte.Parse));
parsers.Put(typeof(IList<byte>), ImmutableListParse(byte.Parse));
parsers.Put(typeof(List<byte>), ListParse(byte.Parse));
parsers.Put(typeof(ISet<byte>), ImmutableSetParse(byte.Parse));
parsers.Put(typeof(HashSet<byte>), SetParse(byte.Parse));

parsers.Put(typeof(IEnumerable<sbyte>), ImmutableListParse(sbyte.Parse));
parsers.Put(typeof(ICollection<sbyte>), ImmutableListParse(sbyte.Parse));
parsers.Put(typeof(IList<sbyte>), ImmutableListParse(sbyte.Parse));
Expand All @@ -199,67 +200,69 @@ namespace {{packageName}}.{{packageContext}}.Utils
parsers.Put(typeof(List<short>), ListParse(short.Parse));
parsers.Put(typeof(ISet<short>), ImmutableSetParse(short.Parse));
parsers.Put(typeof(HashSet<short>), SetParse(short.Parse));

parsers.Put(typeof(IEnumerable<ushort>), ImmutableListParse(ushort.Parse));
parsers.Put(typeof(ICollection<ushort>), ImmutableListParse(ushort.Parse));
parsers.Put(typeof(IList<ushort>), ImmutableListParse(ushort.Parse));
parsers.Put(typeof(List<ushort>), ListParse(ushort.Parse));
parsers.Put(typeof(ISet<ushort>), ImmutableSetParse(ushort.Parse));
parsers.Put(typeof(HashSet<ushort>), SetParse(ushort.Parse));

parsers.Put(typeof(IEnumerable<int>), ImmutableListParse(int.Parse));
parsers.Put(typeof(ICollection<int>), ImmutableListParse(int.Parse));
parsers.Put(typeof(IList<int>), ImmutableListParse(int.Parse));
parsers.Put(typeof(List<int>), ListParse(int.Parse));
parsers.Put(typeof(ISet<int>), ImmutableSetParse(int.Parse));
parsers.Put(typeof(HashSet<int>), SetParse(int.Parse));
parsers.Put(typeof(IEnumerable<int?>), NullableImmutableListParse(int.Parse));
parsers.Put(typeof(ICollection<int?>), NullableImmutableListParse(int.Parse));
parsers.Put(typeof(IList<int?>), NullableImmutableListParse(int.Parse));
parsers.Put(typeof(List<int?>), NullableListParse(int.Parse));
parsers.Put(typeof(ISet<int?>), NullableImmutableSetParse(int.Parse));
parsers.Put(typeof(HashSet<int?>), NullableSetParse(int.Parse));

parsers.Put(typeof(IEnumerable<uint>), ImmutableListParse(uint.Parse));
parsers.Put(typeof(ICollection<uint>), ImmutableListParse(uint.Parse));
parsers.Put(typeof(IList<uint>), ImmutableListParse(uint.Parse));
parsers.Put(typeof(List<uint>), ListParse(uint.Parse));
parsers.Put(typeof(ISet<uint>), ImmutableSetParse(uint.Parse));
parsers.Put(typeof(HashSet<uint>), SetParse(uint.Parse));

parsers.Put(typeof(IEnumerable<long>), ImmutableListParse(long.Parse));
parsers.Put(typeof(ICollection<long>), ImmutableListParse(long.Parse));
parsers.Put(typeof(IList<long>), ImmutableListParse(long.Parse));
parsers.Put(typeof(List<long>), ListParse(long.Parse));
parsers.Put(typeof(ISet<long>), ImmutableSetParse(long.Parse));
parsers.Put(typeof(HashSet<long>), SetParse(long.Parse));
parsers.Put(typeof(IEnumerable<long?>), NullableImmutableListParse(long.Parse));
parsers.Put(typeof(ICollection<long?>), NullableImmutableListParse(long.Parse));
parsers.Put(typeof(IList<long?>), NullableImmutableListParse(long.Parse));
parsers.Put(typeof(List<long?>), NullableListParse(long.Parse));
parsers.Put(typeof(ISet<long?>), NullableImmutableSetParse(long.Parse));
parsers.Put(typeof(HashSet<long?>), NullableSetParse(long.Parse));

parsers.Put(typeof(IEnumerable<ulong>), ImmutableListParse(ulong.Parse));
parsers.Put(typeof(ICollection<ulong>), ImmutableListParse(ulong.Parse));
parsers.Put(typeof(IList<ulong>), ImmutableListParse(ulong.Parse));
parsers.Put(typeof(List<ulong>), ListParse(ulong.Parse));
parsers.Put(typeof(ISet<ulong>), ImmutableSetParse(ulong.Parse));
parsers.Put(typeof(HashSet<ulong>), SetParse(ulong.Parse));

parsers.Put(typeof(IEnumerable<float>), ImmutableListParse(float.Parse));
parsers.Put(typeof(ICollection<float>), ImmutableListParse(float.Parse));
parsers.Put(typeof(IList<float>), ImmutableListParse(float.Parse));
parsers.Put(typeof(List<float>), ListParse(float.Parse));
parsers.Put(typeof(ISet<float>), ImmutableSetParse(float.Parse));
parsers.Put(typeof(HashSet<float>), SetParse(float.Parse));

parsers.Put(typeof(IEnumerable<double>), ImmutableListParse(double.Parse));
parsers.Put(typeof(ICollection<double>), ImmutableListParse(double.Parse));
parsers.Put(typeof(IList<double>), ImmutableListParse(double.Parse));
parsers.Put(typeof(List<double>), ListParse(double.Parse));
parsers.Put(typeof(ISet<double>), ImmutableSetParse(double.Parse));
parsers.Put(typeof(HashSet<double>), SetParse(double.Parse));

parsers.Put(typeof(IEnumerable<decimal>), ImmutableListParse(decimal.Parse));
parsers.Put(typeof(ICollection<decimal>), ImmutableListParse(decimal.Parse));
parsers.Put(typeof(IList<decimal>), ImmutableListParse(decimal.Parse));
parsers.Put(typeof(List<decimal>), ListParse(decimal.Parse));
parsers.Put(typeof(ISet<decimal>), ImmutableSetParse(decimal.Parse));
parsers.Put(typeof(HashSet<decimal>), SetParse(decimal.Parse));


parsers.Put(typeof(IEnumerable<DateTime>), ImmutableListParse(DateTime.Parse));
parsers.Put(typeof(ICollection<DateTime>), ImmutableListParse(DateTime.Parse));
parsers.Put(typeof(IList<DateTime>), ImmutableListParse(DateTime.Parse));
parsers.Put(typeof(List<DateTime>), ListParse(DateTime.Parse));
parsers.Put(typeof(ISet<DateTime>), ImmutableSetParse(DateTime.Parse));
parsers.Put(typeof(HashSet<DateTime>), SetParse(DateTime.Parse));
parsers.Put(typeof(IEnumerable<float?>), NullableImmutableListParse(float.Parse));
parsers.Put(typeof(ICollection<float?>), NullableImmutableListParse(float.Parse));
parsers.Put(typeof(IList<float?>), NullableImmutableListParse(float.Parse));
parsers.Put(typeof(List<float?>), NullableListParse(float.Parse));
parsers.Put(typeof(ISet<float?>), NullableImmutableSetParse(float.Parse));
parsers.Put(typeof(HashSet<float?>), NullableSetParse(float.Parse));

parsers.Put(typeof(IEnumerable<double?>), NullableImmutableListParse(double.Parse));
parsers.Put(typeof(ICollection<double?>), NullableImmutableListParse(double.Parse));
parsers.Put(typeof(IList<double?>), NullableImmutableListParse(double.Parse));
parsers.Put(typeof(List<double?>), NullableListParse(double.Parse));
parsers.Put(typeof(ISet<double?>), NullableImmutableSetParse(double.Parse));
parsers.Put(typeof(HashSet<double?>), NullableSetParse(double.Parse));

parsers.Put(typeof(IEnumerable<decimal?>), NullableImmutableListParse(decimal.Parse));
parsers.Put(typeof(ICollection<decimal?>), NullableImmutableListParse(decimal.Parse));
parsers.Put(typeof(IList<decimal?>), NullableImmutableListParse(decimal.Parse));
parsers.Put(typeof(List<decimal?>), NullableListParse(decimal.Parse));
parsers.Put(typeof(ISet<decimal?>), NullableImmutableSetParse(decimal.Parse));
parsers.Put(typeof(HashSet<decimal?>), NullableSetParse(decimal.Parse));

parsers.Put(typeof(IEnumerable<DateTime?>), NullableImmutableListParse(DateTime.Parse));
parsers.Put(typeof(ICollection<DateTime?>), NullableImmutableListParse(DateTime.Parse));
parsers.Put(typeof(IList<DateTime?>), NullableImmutableListParse(DateTime.Parse));
parsers.Put(typeof(List<DateTime?>), NullableListParse(DateTime.Parse));
parsers.Put(typeof(ISet<DateTime?>), NullableImmutableSetParse(DateTime.Parse));
parsers.Put(typeof(HashSet<DateTime?>), NullableSetParse(DateTime.Parse));

parsers.Put(typeof(IEnumerable<TimeSpan>), ImmutableListParse(TimeSpan.Parse));
parsers.Put(typeof(ICollection<TimeSpan>), ImmutableListParse(TimeSpan.Parse));
Expand Down Expand Up @@ -295,6 +298,11 @@ namespace {{packageName}}.{{packageContext}}.Utils
};
}

private static Func<Parameter, object> NullableListParse<T>(Func<string, T> itemParser) where T: struct
{
return ListParse(it => it.ToNullable(itemParser));
}

private static Func<Parameter, object> ListParse<T>(Func<string, T> itemParser)
{
return parameter =>
Expand All @@ -303,15 +311,15 @@ namespace {{packageName}}.{{packageContext}}.Utils
{
return new List<T>();
}
var results = parameter.Value.Split(new[] { ',' }, StringSplitOptions.None)
.Where(it => it != null)
.Select(it => it.Trim())
.Select(itemParser)
.ToList();
return results;
return ParseCollection(parameter.Value, itemParser).ToList();
};
}

private static Func<Parameter, object> NullableImmutableListParse<T>(Func<string, T> itemParser) where T: struct
{
return ImmutableListParse(it => it.ToNullable(itemParser));
}

private static Func<Parameter, object> ImmutableListParse<T>(Func<string, T> itemParser)
{
return parameter =>
Expand All @@ -320,15 +328,15 @@ namespace {{packageName}}.{{packageContext}}.Utils
{
return Lists.EmptyList<T>();
}
var results = parameter.Value.Split(new[] { ',' }, StringSplitOptions.None)
.Where(it => it != null)
.Select(it => it.Trim())
.Select(itemParser)
.ToImmutableList();
return results;
return ParseCollection(parameter.Value, itemParser).ToImmutableList();
};
}

private static Func<Parameter, object> NullableSetParse<T>(Func<string, T> itemParser) where T: struct
{
return SetParse(it => it.ToNullable(itemParser));
}

private static Func<Parameter, object> SetParse<T>(Func<string, T> itemParser)
{
return parameter =>
Expand All @@ -337,15 +345,15 @@ namespace {{packageName}}.{{packageContext}}.Utils
{
return new HashSet<T>();
}
var results = parameter.Value.Split(new[] { ',' }, StringSplitOptions.None)
.Where(it => it != null)
.Select(it => it.Trim())
.Select(itemParser)
.ToSet();
return results;
return ParseCollection(parameter.Value, itemParser).ToSet();
};
}

private static Func<Parameter, object> NullableImmutableSetParse<T>(Func<string, T> itemParser) where T: struct
{
return ImmutableSetParse(it => it.ToNullable(itemParser));
}

private static Func<Parameter, object> ImmutableSetParse<T>(Func<string, T> itemParser)
{
return parameter =>
Expand All @@ -354,12 +362,7 @@ namespace {{packageName}}.{{packageContext}}.Utils
{
return Sets.EmptySet<T>();
}
var results = parameter.Value.Split(new[] { ',' }, StringSplitOptions.None)
.Where(it => it != null)
.Select(it => it.Trim())
.Select(itemParser)
.ToImmutableHashSet();
return results;
return ParseCollection(parameter.Value, itemParser).ToImmutableHashSet();
};
}

Expand All @@ -386,6 +389,32 @@ namespace {{packageName}}.{{packageContext}}.Utils
parameter.Name, parameter.Value, type));
}

private static IEnumerable<T> ParseCollection<T>(string value, Func<string, T> itemParser)
{
var results = value.Split(new[] { ',' }, StringSplitOptions.None)
.Where(it => it != null)
.Select(it => it.Trim())
.Select(itemParser);
return results;
}

public static T? ToNullable<T>(this string s, Func<string, T> itemParser) where T : struct
{
T? result = new T?();
try
{
if (!string.IsNullOrEmpty(s) && s.Trim().Length > 0)
{
result = itemParser(s);
}
}
catch (Exception e)
{
throw new InvalidOperationException(Strings.Format("Unable to parse value: '{0}' to nullable: '{1}'", s, typeof(T).ToString()), e);
}
return result;
}

private class Parameter
{
internal string Name { get; private set; }
Expand Down
19 changes: 6 additions & 13 deletions samples/server/petstore/nancyfx/IO.Swagger.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
VisualStudioVersion = 12.0.0.0
MinimumVisualStudioVersion = 10.0.0.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{7D50D142-14E1-4E99-842B-18D3AF159948}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{3B55ED13-A471-44B1-A8D5-C158723C0A0C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
<<<<<<< HEAD
{7D50D142-14E1-4E99-842B-18D3AF159948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D50D142-14E1-4E99-842B-18D3AF159948}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D50D142-14E1-4E99-842B-18D3AF159948}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D50D142-14E1-4E99-842B-18D3AF159948}.Release|Any CPU.Build.0 = Release|Any CPU
=======
{1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}.Release|Any CPU.Build.0 = Release|Any CPU
>>>>>>> 92c474b2c235f4635e4be43a97c7941fec64dc82
{3B55ED13-A471-44B1-A8D5-C158723C0A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B55ED13-A471-44B1-A8D5-C158723C0A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B55ED13-A471-44B1-A8D5-C158723C0A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B55ED13-A471-44B1-A8D5-C158723C0A0C}.Release|Any CPU.Build.0 = Release|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -29,4 +22,4 @@ EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
EndGlobal
3 changes: 2 additions & 1 deletion samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7D50D142-14E1-4E99-842B-18D3AF159948}</ProjectGuid>
<ProjectGuid>{3B55ED13-A471-44B1-A8D5-C158723C0A0C}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IO.Swagger.v2</RootNamespace>
Expand Down Expand Up @@ -63,3 +63,4 @@
</ItemGroup>
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets"/>
</Project>

Loading