From fc7dda8db9d880639d3de04d3a610d03a241c1a0 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 21 Apr 2020 10:04:42 +0800 Subject: [PATCH] update more samples --- .../.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../src/Org.OpenAPITools/Model/FormatTest.cs | 16 +++++++++++++++- .../.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../src/Org.OpenAPITools/Model/FormatTest.cs | 16 +++++++++++++++- .../javascript-apollo/.openapi-generator/VERSION | 2 +- samples/meta-codegen/lib/pom.xml | 4 ---- .../usage/.openapi-generator/VERSION | 4 ---- .../php-slim4/.openapi-generator/VERSION | 6 +----- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientNet35/.openapi-generator/VERSION index ad755aed74e..d99e7162d01 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -5.0.0-SNAPSHOT -======= -4.3.1-SNAPSHOT ->>>>>>> origin/master +5.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientNet40/.openapi-generator/VERSION index ad755aed74e..d99e7162d01 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -5.0.0-SNAPSHOT -======= -4.3.1-SNAPSHOT ->>>>>>> origin/master +5.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FormatTest.cs index 31193ac3960..eedd4b6236e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FormatTest.cs @@ -367,6 +367,8 @@ namespace Org.OpenAPITools.Model /// Validation Result IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { + + // Integer (int) maximum if(this.Integer > (int)100) { @@ -379,6 +381,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" }); } + + // Int32 (int) maximum if(this.Int32 > (int)200) { @@ -391,6 +395,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" }); } + + // Number (decimal) maximum if(this.Number > (decimal)543.2) { @@ -403,6 +409,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" }); } + + // Float (float) maximum if(this.Float > (float)987.6) { @@ -415,6 +423,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } + + // Double (double) maximum if(this.Double > (double)123.4) { @@ -427,6 +437,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } + + // String (string) pattern Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexString.Match(this.String).Success) @@ -434,6 +446,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } + + // Password (string) maxLength if(this.Password != null && this.Password.Length > 64) { @@ -445,7 +459,7 @@ namespace Org.OpenAPITools.Model { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" }); } - + yield break; } } diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION index ad755aed74e..d99e7162d01 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -5.0.0-SNAPSHOT -======= -4.3.1-SNAPSHOT ->>>>>>> origin/master +5.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION index ad755aed74e..d99e7162d01 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -5.0.0-SNAPSHOT -======= -4.3.1-SNAPSHOT ->>>>>>> origin/master +5.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FormatTest.cs index d8452eb07cb..b3ebc9f373b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FormatTest.cs @@ -390,6 +390,8 @@ namespace Org.OpenAPITools.Model /// Validation Result IEnumerable IValidatableObject.Validate(ValidationContext validationContext) { + + // Integer (int) maximum if(this.Integer > (int)100) { @@ -402,6 +404,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" }); } + + // Int32 (int) maximum if(this.Int32 > (int)200) { @@ -414,6 +418,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" }); } + + // Number (decimal) maximum if(this.Number > (decimal)543.2) { @@ -426,6 +432,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" }); } + + // Float (float) maximum if(this.Float > (float)987.6) { @@ -438,6 +446,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" }); } + + // Double (double) maximum if(this.Double > (double)123.4) { @@ -450,6 +460,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" }); } + + // String (string) pattern Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase); if (false == regexString.Match(this.String).Success) @@ -457,6 +469,8 @@ namespace Org.OpenAPITools.Model yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" }); } + + // Password (string) maxLength if(this.Password != null && this.Password.Length > 64) { @@ -468,7 +482,7 @@ namespace Org.OpenAPITools.Model { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" }); } - + yield break; } } diff --git a/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION b/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION index bfbf77eb7fa..d99e7162d01 100644 --- a/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-apollo/.openapi-generator/VERSION @@ -1 +1 @@ -4.3.0-SNAPSHOT \ No newline at end of file +5.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml index eb78b5f61bf..f4411133f5f 100644 --- a/samples/meta-codegen/lib/pom.xml +++ b/samples/meta-codegen/lib/pom.xml @@ -121,11 +121,7 @@ UTF-8 -<<<<<<< HEAD 5.0.0-SNAPSHOT -======= - 4.3.1-SNAPSHOT ->>>>>>> origin/master 1.0.0 4.8.1 diff --git a/samples/meta-codegen/usage/.openapi-generator/VERSION b/samples/meta-codegen/usage/.openapi-generator/VERSION index ad755aed74e..71d2eb1c7fc 100644 --- a/samples/meta-codegen/usage/.openapi-generator/VERSION +++ b/samples/meta-codegen/usage/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD 5.0.0-SNAPSHOT -======= -4.3.1-SNAPSHOT ->>>>>>> origin/master diff --git a/samples/server/petstore/php-slim4/.openapi-generator/VERSION b/samples/server/petstore/php-slim4/.openapi-generator/VERSION index ad755aed74e..d99e7162d01 100644 --- a/samples/server/petstore/php-slim4/.openapi-generator/VERSION +++ b/samples/server/petstore/php-slim4/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -5.0.0-SNAPSHOT -======= -4.3.1-SNAPSHOT ->>>>>>> origin/master +5.0.0-SNAPSHOT \ No newline at end of file