OpenAPITools · wing328 · Feb 10, 2019 · Oct 25, 2018 · Nov 6, 2018 · Nov 7, 2018
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -804,7 +804,7 @@ protected File writeInputStreamToFile(String filename, InputStream in, String te
             IOUtils.copy(in, out);
             out.close();
         } else {
-            LOGGER.error("can't open '" + templateFile + "' for input, can not write '" + filename + "'");
+            LOGGER.error("can't open '" + templateFile + "' for input; cannot write '" + filename + "'");
         }
         return outputFile;
     }

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
@@ -775,8 +775,8 @@ public String toDefaultValue(Schema p) {
                     return p.getDefault().toString() + "F";
                 } else if (ModelUtils.isDoubleSchema(p)) { // double
                     return p.getDefault().toString() + "D";
-                } else {
-                    return p.getDefault().toString();
+                } else {    // decimal
+                    return p.getDefault().toString() + "M";
                 }
             }
         } else if (ModelUtils.isIntegerSchema(p)) {

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
@@ -401,9 +401,6 @@ public static boolean isFloatSchema(Schema schema) {
     }
 
     public static boolean isDoubleSchema(Schema schema) {
-        if (schema instanceof NumberSchema) {
-            return true;
-        }
         if (SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType())
                 && SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat())) { // format: double
             return true;

diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
@@ -222,7 +222,7 @@ namespace Example
         public void main()
         {
             var apiInstance = new FakeApi();
-            var body = 1.2D;  // decimal? | Input number as post body (optional) 
+            var body = 8.14;  // decimal? | Input number as post body (optional) 
 
             try
             {

diff --git a/samples/client/petstore/go/go-petstore/api/openapi.yaml b/samples/client/petstore/go/go-petstore/api/openapi.yaml
@@ -1634,7 +1634,7 @@ components:
     OuterComposite:
       example:
         my_string: my_string
-        my_number: 0.80082819046101150206595775671303272247314453125
+        my_number: 0.8008281904610115
         my_boolean: true
       properties:
         my_number:

diff --git a/samples/client/petstore/haskell-http-client/openapi.yaml b/samples/client/petstore/haskell-http-client/openapi.yaml
@@ -1634,7 +1634,7 @@ components:
     OuterComposite:
       example:
         my_string: my_string
-        my_number: 0.80082819046101150206595775671303272247314453125
+        my_number: 0.8008281904610115
         my_boolean: true
       properties:
         my_number:

diff --git a/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml
@@ -1708,7 +1708,7 @@ components:
     OuterComposite:
       example:
         my_string: my_string
-        my_number: 0.80082819046101150206595775671303272247314453125
+        my_number: 0.8008281904610115
         my_boolean: true
       properties:
         my_number:

diff --git a/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml
@@ -1708,7 +1708,7 @@ components:
     OuterComposite:
       example:
         my_string: my_string
-        my_number: 0.80082819046101150206595775671303272247314453125
+        my_number: 0.8008281904610115
         my_boolean: true
       properties:
         my_number:

diff --git a/...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/...store/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
@@ -1501,7 +1501,7 @@ components:
     OuterComposite:
       example:
         my_string: my_string
-        my_number: 0.80082819046101150206595775671303272247314453125
+        my_number: 0.8008281904610115
         my_boolean: true
       properties:
         my_number:

diff --git a/...ore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client.rs b/...ore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client.rs
@@ -138,7 +138,7 @@ fn main() {
          },
 
         Some("FakeOuterNumberSerialize") => {
-            let result = core.run(client.fake_outer_number_serialize(Some(1.2)));
+            let result = core.run(client.fake_outer_number_serialize(Some(8.14)));
             println!("{:?} (X-Span-ID: {:?})", result, (client.context() as &Has<XSpanIdString>).get().clone());
          },
 

diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
@@ -81,7 +81,7 @@ default CompletableFuture<ResponseEntity<OuterComposite>> fakeOuterCompositeSeri
             getRequest().ifPresent(request -> {
                 for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                     if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                        ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                        ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                         break;
                     }
                 }

diff --git a/...rver/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/...rver/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
@@ -79,7 +79,7 @@ default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(@ApiParam(val
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                 if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                     break;
                 }
             }

diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java
@@ -54,7 +54,7 @@ public ResponseEntity<Boolean> fakeOuterBooleanSerialize(@ApiParam(value = "Inpu
     public ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body"  )  @Valid @RequestBody OuterComposite body) {
         for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
             if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                 break;
             }
         }

diff --git a/...store/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/...store/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java
@@ -54,7 +54,7 @@ public ResponseEntity<Boolean> fakeOuterBooleanSerialize(@ApiParam(value = "Inpu
     public ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body"  )  @Valid @RequestBody OuterComposite body) {
         for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
             if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                 break;
             }
         }

diff --git a/...r/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/...r/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -56,7 +56,7 @@ default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(OuterComposit
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                 if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                     break;
                 }
             }

diff --git a/...erver/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/...erver/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -85,7 +85,7 @@ default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(@ApiParam(val
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                 if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                     break;
                 }
             }

diff --git a/...rver/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/...rver/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -67,7 +67,7 @@ default Mono<ResponseEntity<OuterComposite>> fakeOuterCompositeSerialize(Mono<Ou
         exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
         for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
             if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                result = ApiUtil.getExampleResponse(exchange, "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                result = ApiUtil.getExampleResponse(exchange, "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                 break;
             }
         }

diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
@@ -1768,7 +1768,7 @@ components:
     OuterComposite:
       example:
         my_string: my_string
-        my_number: 0.80082819046101150206595775671303272247314453125
+        my_number: 0.8008281904610115
         my_boolean: true
       properties:
         my_number:

diff --git a/...es/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/...es/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -79,7 +79,7 @@ default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(@ApiParam(val
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                 if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                     break;
                 }
             }

diff --git a/...r/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/...r/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
@@ -85,7 +85,7 @@ default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(@ApiParam(val
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                 if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                     break;
                 }
             }

diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
@@ -79,7 +79,7 @@ default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(@ApiParam(val
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                 if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
-                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.80082819046101150206595775671303272247314453125,  \"my_boolean\" : true}");
+                    ApiUtil.setExampleResponse(request, "*/*", "{  \"my_string\" : \"my_string\",  \"my_number\" : 0.8008281904610115,  \"my_boolean\" : true}");
                     break;
                 }
             }