Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

swagger-api · Jul 13, 2017 · 2a5913c · 2a5913c
2 parents d8bae71 + 21d33c4
commit 2a5913c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/csharp/modelGeneric.mustache b/modules/swagger-codegen/src/main/resources/csharp/modelGeneric.mustache
@@ -241,13 +241,15 @@ this.{{name}} = {{name}};
 
  {{/minimum}}
  {{#pattern}}
+ {{^isByteArray}}
  // {{{name}}} ({{{datatype}}}) pattern
  Regex regex{{{name}}} = new Regex(@"{{{vendorExtensions.x-regex}}}"{{#vendorExtensions.x-modifiers}}{{#-first}}, {{/-first}}RegexOptions.{{{.}}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}});
  if (false == regex{{{name}}}.Match(this.{{{name}}}).Success)
  {
- yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for {{{name}}}, must match a pattern of {{{pattern}}}.", new [] { "{{{name}}}" });
+ yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for {{{name}}}, must match a pattern of " + regex{{{name}}}, new [] { "{{{name}}}" });
  }
 
+ {{/isByteArray}}
  {{/pattern}}
  {{/hasValidation}}
  {{/vars}}

diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs
@@ -415,7 +415,7 @@ IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatable
  Regex regex_String = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
  if (false == regex_String.Match(this._String).Success)
  {
- yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for _String, must match a pattern of /[a-z]/i.", new [] { "_String" });
+ yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for _String, must match a pattern of " + regex_String, new [] { "_String" });
  }
 
  // _Byte (byte[]) pattern

diff --git a/...lient/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/Model/FormatTest.cs b/...lient/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/Model/FormatTest.cs
@@ -438,7 +438,7 @@ IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatable
  Regex regex_String = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
  if (false == regex_String.Match(this._String).Success)
  {
- yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for _String, must match a pattern of /[a-z]/i.", new [] { "_String" });
+ yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for _String, must match a pattern of " + regex_String, new [] { "_String" });
  }
 
  // _Byte (byte[]) pattern