Better tests for string (number) (OpenAPITools#3953)

* beter test for string (number) * fix mapping * fix mapping in csharp generators
Jesse0Michael · Oct 3, 2019 · 0a549e5 · 0a549e5
1 parent 85a6d56
commit 0a549e5
Show file tree

Hide file tree

Showing 119 changed files with 1,693 additions and 136 deletions.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -1068,8 +1068,7 @@ public DefaultCodegen() {
         typeMapping.put("file", "File");
         typeMapping.put("UUID", "UUID");
         typeMapping.put("URI", "URI");
-        typeMapping.put("BigDecimal", "BigDecimal"); //TODO need the mapping?
-
+        typeMapping.put("BigDecimal", "BigDecimal");
 
         instantiationTypes = new HashMap<String, String>();
 

diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -181,6 +181,7 @@ public AbstractCSharpCodegen() {
         typeMapping.put("long", "long?");
         typeMapping.put("double", "double?");
         typeMapping.put("number", "decimal?");
+        typeMapping.put("BigDecimal", "decimal?");
         typeMapping.put("DateTime", "DateTime?");
         typeMapping.put("date", "DateTime?");
         typeMapping.put("file", "System.IO.Stream");

diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -96,6 +96,7 @@ public AbstractGoCodegen() {
         typeMapping.put("number", "float32");
         typeMapping.put("float", "float32");
         typeMapping.put("double", "float64");
+        typeMapping.put("BigDecimal", "float64");
         typeMapping.put("boolean", "bool");
         typeMapping.put("string", "string");
         typeMapping.put("UUID", "string");

diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -95,6 +95,7 @@ public CSharpClientCodegen() {
         typeMapping.put("long", "long");
         typeMapping.put("double", "double");
         typeMapping.put("number", "decimal");
+        typeMapping.put("BigDecimal", "decimal");
         typeMapping.put("DateTime", "DateTime");
         typeMapping.put("date", "DateTime");
         typeMapping.put("UUID", "Guid");

diff --git a/...enerator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/...enerator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
@@ -94,6 +94,7 @@ public CSharpNetCoreClientCodegen() {
         typeMapping.put("long", "long");
         typeMapping.put("double", "double");
         typeMapping.put("number", "decimal");
+        typeMapping.put("BigDecimal", "decimal");
         typeMapping.put("DateTime", "DateTime");
         typeMapping.put("date", "DateTime");
         typeMapping.put("file", "System.IO.Stream");

diff --git a/...-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/...-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
@@ -222,6 +222,7 @@ public HaskellHttpClientCodegen() {
         typeMapping.put("float", "Float");
         typeMapping.put("double", "Double");
         typeMapping.put("number", "Double");
+        typeMapping.put("BigDecimal", "Double");
         typeMapping.put("integer", "Int");
         typeMapping.put("file", "FilePath");
         // lib

diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
@@ -171,6 +171,7 @@ public HaskellServantCodegen() {
         typeMapping.put("file", "FilePath");
         typeMapping.put("binary", "FilePath");
         typeMapping.put("number", "Double");
+        typeMapping.put("BigDecimal", "Double");
         typeMapping.put("any", "Value");
         typeMapping.put("UUID", "UUID");
         typeMapping.put("URI", "Text");

diff --git a/...i-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/...i-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
@@ -144,6 +144,7 @@ public JavascriptClientCodegen() {
         typeMapping.put("int", "Number");
         typeMapping.put("float", "Number");
         typeMapping.put("number", "Number");
+        typeMapping.put("BigDecimal", "Number");
         typeMapping.put("DateTime", "Date");
         typeMapping.put("date", "Date");
         typeMapping.put("long", "Number");

diff --git a/...api-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/...api-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1403,6 +1403,9 @@ definitions:
         format: password
         maxLength: 64
         minLength: 10
+      BigDecimal:
+        type: string
+        format: number
   EnumClass:
     type: string
     default: '-efg'

diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md
@@ -16,6 +16,7 @@ Name | Type | Description | Notes
 **DateTime** | **DateTime** |  | [optional] 
 **Uuid** | **Guid** |  | [optional] 
 **Password** | **string** |  | 
+**BigDecimal** | **decimal** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/...les/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/...les/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -53,7 +53,8 @@ public partial class FormatTest :  IEquatable<FormatTest>, IValidatableObject
         /// <param name="dateTime">dateTime.</param>
         /// <param name="uuid">uuid.</param>
         /// <param name="password">password (required).</param>
-        public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string))
+        /// <param name="bigDecimal">bigDecimal.</param>
+        public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), decimal bigDecimal = default(decimal))
         {
             // to ensure "number" is required (not null)
             if (number == null)
@@ -104,6 +105,7 @@ public FormatTest(int integer = default(int), int int32 = default(int), long int
             this.Binary = binary;
             this.DateTime = dateTime;
             this.Uuid = uuid;
+            this.BigDecimal = bigDecimal;
         }
 
         /// <summary>
@@ -185,6 +187,12 @@ public FormatTest(int integer = default(int), int int32 = default(int), long int
         [DataMember(Name="password", EmitDefaultValue=false)]
         public string Password { get; set; }
 
+        /// <summary>
+        /// Gets or Sets BigDecimal
+        /// </summary>
+        [DataMember(Name="BigDecimal", EmitDefaultValue=false)]
+        public decimal BigDecimal { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -206,6 +214,7 @@ public override string ToString()
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
             sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  BigDecimal: ").Append(BigDecimal).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -268,6 +277,7 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Uuid.GetHashCode();
                 if (this.Password != null)
                     hashCode = hashCode * 59 + this.Password.GetHashCode();
+                hashCode = hashCode * 59 + this.BigDecimal.GetHashCode();
                 return hashCode;
             }
         }

diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md
@@ -16,6 +16,7 @@ Name | Type | Description | Notes
 **DateTime** | **DateTime** |  | [optional] 
 **Uuid** | **Guid** |  | [optional] 
 **Password** | **string** |  | 
+**BigDecimal** | **decimal** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/...client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/...client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -53,7 +53,8 @@ public partial class FormatTest :  IEquatable<FormatTest>, IValidatableObject
         /// <param name="dateTime">dateTime.</param>
         /// <param name="uuid">uuid.</param>
         /// <param name="password">password (required).</param>
-        public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string))
+        /// <param name="bigDecimal">bigDecimal.</param>
+        public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), decimal bigDecimal = default(decimal))
         {
             // to ensure "number" is required (not null)
             if (number == null)
@@ -104,6 +105,7 @@ public FormatTest(int integer = default(int), int int32 = default(int), long int
             this.Binary = binary;
             this.DateTime = dateTime;
             this.Uuid = uuid;
+            this.BigDecimal = bigDecimal;
         }
 
         /// <summary>
@@ -185,6 +187,12 @@ public FormatTest(int integer = default(int), int int32 = default(int), long int
         [DataMember(Name="password", EmitDefaultValue=false)]
         public string Password { get; set; }
 
+        /// <summary>
+        /// Gets or Sets BigDecimal
+        /// </summary>
+        [DataMember(Name="BigDecimal", EmitDefaultValue=false)]
+        public decimal BigDecimal { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -206,6 +214,7 @@ public override string ToString()
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
             sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  BigDecimal: ").Append(BigDecimal).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -268,6 +277,7 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Uuid.GetHashCode();
                 if (this.Password != null)
                     hashCode = hashCode * 59 + this.Password.GetHashCode();
+                hashCode = hashCode * 59 + this.BigDecimal.GetHashCode();
                 return hashCode;
             }
         }

diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md
@@ -18,6 +18,7 @@ Name | Type | Description | Notes
 **DateTime** | **DateTime** |  | [optional] 
 **Uuid** | **Guid** |  | [optional] 
 **Password** | **string** |  | 
+**BigDecimal** | **decimal** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models)
 [[Back to API list]](../README.md#documentation-for-api-endpoints)

diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -51,7 +51,8 @@ public partial class FormatTest :  IEquatable<FormatTest>, IValidatableObject
         /// <param name="dateTime">dateTime.</param>
         /// <param name="uuid">uuid.</param>
         /// <param name="password">password (required).</param>
-        public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string))
+        /// <param name="bigDecimal">bigDecimal.</param>
+        public FormatTest(int integer = default(int), int int32 = default(int), long int64 = default(long), decimal number = default(decimal), float _float = default(float), double _double = default(double), string _string = default(string), byte[] _byte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), decimal bigDecimal = default(decimal))
         {
             // to ensure "number" is required (not null)
             if (number == null)
@@ -102,6 +103,7 @@ public FormatTest(int integer = default(int), int int32 = default(int), long int
             this.Binary = binary;
             this.DateTime = dateTime;
             this.Uuid = uuid;
+            this.BigDecimal = bigDecimal;
         }
 
         /// <summary>
@@ -183,6 +185,12 @@ public FormatTest(int integer = default(int), int int32 = default(int), long int
         [DataMember(Name="password", EmitDefaultValue=false)]
         public string Password { get; set; }
 
+        /// <summary>
+        /// Gets or Sets BigDecimal
+        /// </summary>
+        [DataMember(Name="BigDecimal", EmitDefaultValue=false)]
+        public decimal BigDecimal { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -204,6 +212,7 @@ public override string ToString()
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
             sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  BigDecimal: ").Append(BigDecimal).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -302,6 +311,11 @@ public bool Equals(FormatTest input)
                     this.Password == input.Password ||
                     (this.Password != null &&
                     this.Password.Equals(input.Password))
+                ) && 
+                (
+                    this.BigDecimal == input.BigDecimal ||
+                    (this.BigDecimal != null &&
+                    this.BigDecimal.Equals(input.BigDecimal))
                 );
         }
 
@@ -340,6 +354,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Uuid.GetHashCode();
                 if (this.Password != null)
                     hashCode = hashCode * 59 + this.Password.GetHashCode();
+                if (this.BigDecimal != null)
+                    hashCode = hashCode * 59 + this.BigDecimal.GetHashCode();
                 return hashCode;
             }
         }

diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/format_test.ex
@@ -21,7 +21,8 @@ defmodule OpenapiPetstore.Model.FormatTest do
     :"date",
     :"dateTime",
     :"uuid",
-    :"password"
+    :"password",
+    :"BigDecimal"
   ]
 
   @type t :: %__MODULE__{
@@ -37,7 +38,8 @@ defmodule OpenapiPetstore.Model.FormatTest do
     :"date" => Date.t,
     :"dateTime" => DateTime.t | nil,
     :"uuid" => String.t | nil,
-    :"password" => String.t
+    :"password" => String.t,
+    :"BigDecimal" => String.t | nil
   }
 end
 
@@ -46,6 +48,7 @@ defimpl Poison.Decoder, for: OpenapiPetstore.Model.FormatTest do
   def decode(value, options) do
     value
     |> deserialize(:"date", :date, nil, options)
+    |> deserialize(:"BigDecimal", :struct, OpenapiPetstore.Model.String.t, options)
   end
 end
 
diff --git a/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml b/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml
@@ -1491,6 +1491,9 @@ components:
           maxLength: 64
           minLength: 10
           type: string
+        BigDecimal:
+          format: number
+          type: string
       required:
       - byte
       - date

diff --git a/samples/client/petstore/go/go-petstore-withXml/docs/FormatTest.md b/samples/client/petstore/go/go-petstore-withXml/docs/FormatTest.md
@@ -17,6 +17,7 @@ Name | Type | Description | Notes
 **DateTime** | [**time.Time**](time.Time.md) |  | [optional] 
 **Uuid** | **string** |  | [optional] 
 **Password** | **string** |  | 
+**BigDecimal** | **float64** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/petstore/go/go-petstore-withXml/model_format_test_.go b/samples/client/petstore/go/go-petstore-withXml/model_format_test_.go
diff --git a/samples/client/petstore/go/go-petstore/api/openapi.yaml b/samples/client/petstore/go/go-petstore/api/openapi.yaml
@@ -1491,6 +1491,9 @@ components:
           maxLength: 64
           minLength: 10
           type: string
+        BigDecimal:
+          format: number
+          type: string
       required:
       - byte
       - date

diff --git a/samples/client/petstore/go/go-petstore/docs/FormatTest.md b/samples/client/petstore/go/go-petstore/docs/FormatTest.md
@@ -17,6 +17,7 @@ Name | Type | Description | Notes
 **DateTime** | [**time.Time**](time.Time.md) |  | [optional] 
 **Uuid** | **string** |  | [optional] 
 **Password** | **string** |  | 
+**BigDecimal** | **float64** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/petstore/go/go-petstore/model_format_test_.go b/samples/client/petstore/go/go-petstore/model_format_test_.go
@@ -27,4 +27,5 @@ type FormatTest struct {
 	DateTime time.Time `json:"dateTime,omitempty"`
 	Uuid string `json:"uuid,omitempty"`
 	Password string `json:"password"`
+	BigDecimal float64 `json:"BigDecimal,omitempty"`
 }
diff --git a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/Model.hs b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/Model.hs
@@ -1075,6 +1075,7 @@ data FormatTest = FormatTest
   , formatTestDateTime :: !(Maybe DateTime) -- ^ "dateTime"
   , formatTestUuid :: !(Maybe Text) -- ^ "uuid"
   , formatTestPassword :: !(Text) -- ^ /Required/ "password"
+  , formatTestBigDecimal :: !(Maybe Double) -- ^ "BigDecimal"
   } deriving (P.Show, P.Eq, P.Typeable)
 
 -- | FromJSON FormatTest
@@ -1094,6 +1095,7 @@ instance A.FromJSON FormatTest where
       <*> (o .:? "dateTime")
       <*> (o .:? "uuid")
       <*> (o .:  "password")
+      <*> (o .:? "BigDecimal")
 
 -- | ToJSON FormatTest
 instance A.ToJSON FormatTest where
@@ -1112,6 +1114,7 @@ instance A.ToJSON FormatTest where
       , "dateTime" .= formatTestDateTime
       , "uuid" .= formatTestUuid
       , "password" .= formatTestPassword
+      , "BigDecimal" .= formatTestBigDecimal
       ]
 
 
@@ -1137,6 +1140,7 @@ mkFormatTest formatTestNumber formatTestByte formatTestDate formatTestPassword =
   , formatTestDateTime = Nothing
   , formatTestUuid = Nothing
   , formatTestPassword
+  , formatTestBigDecimal = Nothing
   }
 
 -- ** HasOnlyReadOnly

diff --git a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/ModelLens.hs b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/ModelLens.hs
@@ -487,6 +487,11 @@ formatTestPasswordL :: Lens_' FormatTest (Text)
 formatTestPasswordL f FormatTest{..} = (\formatTestPassword -> FormatTest { formatTestPassword, ..} ) <$> f formatTestPassword
 {-# INLINE formatTestPasswordL #-}
 
+-- | 'formatTestBigDecimal' Lens
+formatTestBigDecimalL :: Lens_' FormatTest (Maybe Double)
+formatTestBigDecimalL f FormatTest{..} = (\formatTestBigDecimal -> FormatTest { formatTestBigDecimal, ..} ) <$> f formatTestBigDecimal
+{-# INLINE formatTestBigDecimalL #-}
+
 
 
 -- * HasOnlyReadOnly

diff --git a/samples/client/petstore/haskell-http-client/openapi.yaml b/samples/client/petstore/haskell-http-client/openapi.yaml
@@ -1491,6 +1491,9 @@ components:
           maxLength: 64
           minLength: 10
           type: string
+        BigDecimal:
+          format: number
+          type: string
       required:
       - byte
       - date

diff --git a/samples/client/petstore/haskell-http-client/tests/Instances.hs b/samples/client/petstore/haskell-http-client/tests/Instances.hs
@@ -354,6 +354,7 @@ genFormatTest n =
     <*> arbitraryReducedMaybe n -- formatTestDateTime :: Maybe DateTime
     <*> arbitraryReducedMaybe n -- formatTestUuid :: Maybe Text
     <*> arbitrary -- formatTestPassword :: Text
+    <*> arbitraryReducedMaybe n -- formatTestBigDecimal :: Maybe Double
 
 instance Arbitrary HasOnlyReadOnly where
   arbitrary = sized genHasOnlyReadOnly