From 9d1ae0dd29ce591f22cff926004a0068b4838615 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 9 Apr 2018 01:14:51 +0800 Subject: [PATCH] fix bigdecimal in default codegen --- .../main/java/org/openapitools/codegen/DefaultCodegen.java | 5 +++-- .../client/petstore/ruby/docs/ArrayOfArrayOfNumberOnly.md | 2 +- samples/client/petstore/ruby/docs/ArrayOfNumberOnly.md | 2 +- samples/client/petstore/ruby/docs/FormatTest.md | 2 +- samples/client/petstore/ruby/docs/NumberOnly.md | 2 +- .../lib/petstore/models/array_of_array_of_number_only.rb | 2 +- .../ruby/lib/petstore/models/array_of_number_only.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/format_test.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/number_only.rb | 2 +- 9 files changed, 11 insertions(+), 10 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 index 1d530d859fd..fe231cc1007 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -1139,7 +1139,7 @@ public class DefaultCodegen implements CodegenConfig { } else if (SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat())) { datatype = SchemaTypeUtil.DOUBLE_FORMAT; } else { // without format - datatype = "BigDecimal"; + datatype = schema.getType(); // number } } else if (schema instanceof IntegerSchema || SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType())) { if (SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat())) { @@ -4155,7 +4155,8 @@ public class DefaultCodegen implements CodegenConfig { codegenProperty = codegenProperty.items; } } else { - LOGGER.warn("Scheme type " + schema.getType() + "not handled in reqeust body"); + // TODO need to handle primitive type in this block + LOGGER.warn("Scheme type " + schema.getType() + " not handled in reqeust body"); } // set the parameter's example value diff --git a/samples/client/petstore/ruby/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/ruby/docs/ArrayOfArrayOfNumberOnly.md index 6858436e420..003cf9a8d6d 100644 --- a/samples/client/petstore/ruby/docs/ArrayOfArrayOfNumberOnly.md +++ b/samples/client/petstore/ruby/docs/ArrayOfArrayOfNumberOnly.md @@ -3,6 +3,6 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**array_array_number** | **Array<Array<BigDecimal>>** | | [optional] +**array_array_number** | **Array<Array<Float>>** | | [optional] diff --git a/samples/client/petstore/ruby/docs/ArrayOfNumberOnly.md b/samples/client/petstore/ruby/docs/ArrayOfNumberOnly.md index 52487399a4f..c2b9fada4f8 100644 --- a/samples/client/petstore/ruby/docs/ArrayOfNumberOnly.md +++ b/samples/client/petstore/ruby/docs/ArrayOfNumberOnly.md @@ -3,6 +3,6 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**array_number** | [**Array<BigDecimal>**](BigDecimal.md) | | [optional] +**array_number** | **Array<Float>** | | [optional] diff --git a/samples/client/petstore/ruby/docs/FormatTest.md b/samples/client/petstore/ruby/docs/FormatTest.md index e1b4cf345a3..79cf9b5a866 100644 --- a/samples/client/petstore/ruby/docs/FormatTest.md +++ b/samples/client/petstore/ruby/docs/FormatTest.md @@ -6,7 +6,7 @@ Name | Type | Description | Notes **integer** | **Integer** | | [optional] **int32** | **Integer** | | [optional] **int64** | **Integer** | | [optional] -**number** | [**BigDecimal**](BigDecimal.md) | | +**number** | **Float** | | **float** | **Float** | | [optional] **double** | **Float** | | [optional] **string** | **String** | | [optional] diff --git a/samples/client/petstore/ruby/docs/NumberOnly.md b/samples/client/petstore/ruby/docs/NumberOnly.md index b493d92b913..4be8a12a79d 100644 --- a/samples/client/petstore/ruby/docs/NumberOnly.md +++ b/samples/client/petstore/ruby/docs/NumberOnly.md @@ -3,6 +3,6 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**just_number** | [**BigDecimal**](BigDecimal.md) | | [optional] +**just_number** | **Float** | | [optional] diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb index bfb5d39c5c5..df47cecca8b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb @@ -26,7 +26,7 @@ module Petstore # Attribute type mapping. def self.swagger_types { - :'array_array_number' => :'Array>' + :'array_array_number' => :'Array>' } end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb index 1cb80da7e58..e4f51d61bcc 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb @@ -26,7 +26,7 @@ module Petstore # Attribute type mapping. def self.swagger_types { - :'array_number' => :'Array' + :'array_number' => :'Array' } end diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb index 6933ae5f74d..a8ffaf1b416 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb @@ -65,7 +65,7 @@ module Petstore :'integer' => :'Integer', :'int32' => :'Integer', :'int64' => :'Integer', - :'number' => :'BigDecimal', + :'number' => :'Float', :'float' => :'Float', :'double' => :'Float', :'string' => :'String', diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb index a55ffa92130..b84989631bb 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb @@ -26,7 +26,7 @@ module Petstore # Attribute type mapping. def self.swagger_types { - :'just_number' => :'BigDecimal' + :'just_number' => :'Float' } end