From 96bb5540475dbbddf05e4d76171c97e6537c0dbc Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Mon, 2 Oct 2023 11:54:27 +0200 Subject: [PATCH 1/2] [JAVA][SPRING]: add imports & primitives to reserved words --- docs/generators/groovy.md | 17 +- docs/generators/java-camel.md | 18 ++- docs/generators/java-helidon-client.md | 17 +- docs/generators/java-helidon-server.md | 17 +- docs/generators/java-inflector.md | 17 +- docs/generators/java-micronaut-client.md | 17 +- docs/generators/java-micronaut-server.md | 18 ++- docs/generators/java-msf4j.md | 17 +- docs/generators/java-pkmst.md | 17 +- docs/generators/java-play-framework.md | 17 +- docs/generators/java-undertow-server.md | 17 +- docs/generators/java-vertx-web.md | 17 +- docs/generators/java-vertx.md | 17 +- docs/generators/java.md | 17 +- docs/generators/jaxrs-cxf-cdi.md | 17 +- docs/generators/jaxrs-cxf-client.md | 17 +- docs/generators/jaxrs-cxf-extended.md | 17 +- docs/generators/jaxrs-cxf.md | 17 +- docs/generators/jaxrs-jersey.md | 17 +- docs/generators/jaxrs-resteasy-eap.md | 17 +- docs/generators/jaxrs-resteasy.md | 17 +- docs/generators/jaxrs-spec.md | 17 +- docs/generators/spring.md | 18 ++- .../languages/AbstractJavaCodegen.java | 21 ++- .../languages/GroovyClientCodegen.java | 1 + .../languages/JavaCXFClientCodegen.java | 1 + .../languages/JavaCXFServerCodegen.java | 1 + .../codegen/languages/JavaClientCodegen.java | 1 + .../languages/JavaHelidonClientCodegen.java | 1 + .../languages/JavaHelidonServerCodegen.java | 2 + .../languages/JavaJAXRSSpecServerCodegen.java | 1 + .../JavaMicronautAbstractCodegen.java | 1 + .../languages/JavaMicronautServerCodegen.java | 1 + .../languages/JavaPlayFrameworkCodegen.java | 2 + .../languages/JavaVertXServerCodegen.java | 1 + .../languages/JavaVertXWebServerCodegen.java | 1 + .../codegen/languages/SpringCodegen.java | 15 +- .../java/apache-httpclient/docs/DataQuery.md | 2 +- .../openapitools/client/model/DataQuery.java | 20 +-- .../openapitools/client/model/DataQuery.java | 20 +-- .../echo_api/java/native/docs/DataQuery.md | 2 +- .../openapitools/client/model/DataQuery.java | 20 +-- .../java/okhttp-gson/docs/DataQuery.md | 2 +- .../openapitools/client/model/DataQuery.java | 20 +-- .../java-helidon-client/mp/docs/FakeApi.md | 10 +- .../mp/docs/FooGetDefaultResponse.md | 2 +- .../java-helidon-client/mp/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../mp/docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 2 +- .../client/model/FooGetDefaultResponse.java | 20 +-- .../openapitools/client/model/FormatTest.java | 100 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 64 ++++---- .../model/ObjectWithDeprecatedFields.java | 20 +-- .../java-helidon-client/se/docs/FakeApi.md | 20 +-- .../se/docs/FooGetDefaultResponse.md | 2 +- .../java-helidon-client/se/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../se/docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 10 +- .../openapitools/client/api/FakeApiImpl.java | 34 ++-- .../client/model/FooGetDefaultResponse.java | 20 +-- .../openapitools/client/model/FormatTest.java | 100 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 64 ++++---- .../model/ObjectWithDeprecatedFields.java | 20 +-- .../docs/apis/FakeApi.md | 10 +- .../docs/models/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/apache-httpclient/docs/FakeApi.md | 20 +-- .../docs/FooGetDefaultResponse.md | 2 +- .../java/apache-httpclient/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 38 ++--- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../org/openapitools/client/api/FakeApi.java | 20 +-- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../org/openapitools/client/api/FakeApi.java | 20 +-- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/google-api-client/docs/FakeApi.md | 20 +-- .../java/google-api-client/docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 14 +- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../docs/FakeApi.md | 20 +-- .../docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 38 ++--- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/jersey2-java8/docs/FakeApi.md | 20 +-- .../java/jersey2-java8/docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 38 ++--- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../petstore/java/jersey3/docs/FakeApi.md | 20 +-- .../jersey3/docs/FooGetDefaultResponse.md | 2 +- .../petstore/java/jersey3/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 38 ++--- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/native-async/docs/FakeApi.md | 40 ++--- .../docs/FooGetDefaultResponse.md | 2 +- .../java/native-async/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 42 ++--- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../petstore/java/native/docs/FakeApi.md | 40 ++--- .../java/native/docs/FooGetDefaultResponse.md | 2 +- .../petstore/java/native/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../native/docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 42 ++--- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../docs/FakeApi.md | 20 +-- .../docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 66 ++++---- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../docs/FakeApi.md | 20 +-- .../docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 66 ++++---- .../openapitools/client/model/FormatTest.java | 146 +++++++++--------- ...ropertiesAndAdditionalPropertiesClass.java | 82 +++++----- .../java/okhttp-gson/docs/AnotherFakeApi.md | 8 +- .../petstore/java/okhttp-gson/docs/FakeApi.md | 20 +-- .../okhttp-gson/docs/FooGetDefaultResponse.md | 2 +- .../java/okhttp-gson/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../client/api/AnotherFakeApi.java | 36 ++--- .../org/openapitools/client/api/FakeApi.java | 66 ++++---- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/rest-assured-jackson/docs/FakeApi.md | 10 +- .../rest-assured-jackson/docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 40 ++--- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/rest-assured/docs/FakeApi.md | 10 +- .../java/rest-assured/docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 40 ++--- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../petstore/java/resteasy/docs/FakeApi.md | 20 +-- .../resteasy/docs/FooGetDefaultResponse.md | 2 +- .../petstore/java/resteasy/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 26 ++-- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/resttemplate-withXml/docs/FakeApi.md | 20 +-- .../docs/FooGetDefaultResponse.md | 2 +- .../resttemplate-withXml/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 38 ++--- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/resttemplate/docs/FakeApi.md | 20 +-- .../docs/FooGetDefaultResponse.md | 2 +- .../java/resttemplate/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 38 ++--- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/retrofit2-play26/docs/FakeApi.md | 20 +-- .../java/retrofit2-play26/docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 10 +- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../petstore/java/retrofit2/docs/FakeApi.md | 20 +-- .../java/retrofit2/docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 10 +- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/retrofit2rx2/docs/FakeApi.md | 20 +-- .../java/retrofit2rx2/docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 10 +- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/retrofit2rx3/docs/FakeApi.md | 20 +-- .../java/retrofit2rx3/docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 10 +- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/vertx-no-nullable/docs/FakeApi.md | 20 +-- .../java/vertx-no-nullable/docs/FormatTest.md | 12 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../org/openapitools/client/api/FakeApi.java | 4 +- .../openapitools/client/api/FakeApiImpl.java | 30 ++-- .../client/api/rxjava/FakeApi.java | 48 +++--- .../openapitools/client/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../petstore/java/vertx/docs/FakeApi.md | 20 +-- .../java/vertx/docs/FooGetDefaultResponse.md | 2 +- .../petstore/java/vertx/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../vertx/docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 4 +- .../openapitools/client/api/FakeApiImpl.java | 30 ++-- .../client/api/rxjava/FakeApi.java | 48 +++--- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/webclient-jakarta/docs/FakeApi.md | 20 +-- .../docs/FooGetDefaultResponse.md | 2 +- .../java/webclient-jakarta/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 62 ++++---- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/webclient-swagger2/docs/FakeApi.md | 20 +-- .../docs/FooGetDefaultResponse.md | 2 +- .../webclient-swagger2/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 62 ++++---- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../petstore/java/webclient/docs/FakeApi.md | 20 +-- .../webclient/docs/FooGetDefaultResponse.md | 2 +- .../java/webclient/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 62 ++++---- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/org/openapitools/api/DefaultApi.java | 12 +- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTestDto.java | 122 +++++++-------- ...ertiesAndAdditionalPropertiesClassDto.java | 70 ++++----- .../java/jersey2-java8/docs/FakeApi.md | 20 +-- .../docs/FooGetDefaultResponse.md | 2 +- .../java/jersey2-java8/docs/FormatTest.md | 10 +- ...dPropertiesAndAdditionalPropertiesClass.md | 6 +- .../docs/ObjectWithDeprecatedFields.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 38 ++--- .../client/model/FooGetDefaultResponse.java | 22 +-- .../openapitools/client/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../java/org/openapitools/api/DefaultApi.java | 12 +- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 18 +-- .../org/openapitools/api/FakeApiDelegate.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../openapitools/server/api/FakeService.java | 2 +- .../server/api/FakeServiceImpl.java | 2 +- .../server/model/FooGetDefaultResponse.java | 20 +-- .../openapitools/server/model/FormatTest.java | 100 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 64 ++++---- .../model/ObjectWithDeprecatedFields.java | 20 +-- .../server/model/FooGetDefaultResponse.java | 20 +-- .../openapitools/server/model/FormatTest.java | 100 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 60 +++---- .../model/ObjectWithDeprecatedFields.java | 20 +-- .../java/org/openapitools/api/FakeApi.java | 10 +- .../org/openapitools/api/FakeApiService.java | 8 +- .../org/openapitools/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../api/impl/FakeApiServiceImpl.java | 8 +- .../app/apimodels/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../app/controllers/FakeApiController.java | 42 ++--- .../app/controllers/FakeApiControllerImp.java | 2 +- .../FakeApiControllerImpInterface.java | 6 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../org/openapitools/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 66 ++++---- .../java/org/openapitools/api/FakeApi.java | 6 +- .../org/openapitools/api/FakeApiService.java | 2 +- .../org/openapitools/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../api/impl/FakeApiServiceImpl.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 6 +- .../org/openapitools/api/FakeApiService.java | 2 +- .../model/FooGetDefaultResponse.java | 22 +-- .../org/openapitools/model/FormatTest.java | 102 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../model/ObjectWithDeprecatedFields.java | 22 +-- .../api/impl/FakeApiServiceImpl.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../org/openapitools/model/FormatTest.java | 98 ++++++------ ...ropertiesAndAdditionalPropertiesClass.java | 64 ++++---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../org/openapitools/model/FormatTest.java | 146 +++++++++--------- ...ropertiesAndAdditionalPropertiesClass.java | 88 +++++------ .../java/org/openapitools/api/FakeApi.java | 2 +- .../org/openapitools/model/FormatTest.java | 146 +++++++++--------- ...ropertiesAndAdditionalPropertiesClass.java | 88 +++++------ .../java/org/openapitools/api/FakeApi.java | 2 +- .../org/openapitools/model/FormatTest.java | 146 +++++++++--------- ...ropertiesAndAdditionalPropertiesClass.java | 88 +++++------ .../java/org/openapitools/api/FakeApi.java | 6 +- .../org/openapitools/api/FakeApiService.java | 2 +- .../org/openapitools/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../api/impl/FakeApiServiceImpl.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 6 +- .../org/openapitools/api/FakeApiService.java | 2 +- .../org/openapitools/model/FormatTest.java | 122 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../api/impl/FakeApiServiceImpl.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 18 +-- .../org/openapitools/api/FakeApiDelegate.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 18 +-- .../org/openapitools/api/FakeApiDelegate.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 18 +-- .../org/openapitools/api/FakeApiDelegate.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 18 +-- .../org/openapitools/api/FakeApiDelegate.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 18 +-- .../org/openapitools/api/FakeApiDelegate.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 18 +-- .../org/openapitools/api/FakeApiDelegate.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../openapitools/virtualan/api/FakeApi.java | 16 +- .../virtualan/model/FormatTest.java | 126 +++++++-------- ...ropertiesAndAdditionalPropertiesClass.java | 70 ++++----- .../java/org/openapitools/api/FakeApi.java | 16 +- .../org/openapitools/model/FormatTestDto.java | 126 +++++++-------- ...ertiesAndAdditionalPropertiesClassDto.java | 70 ++++----- 413 files changed, 8252 insertions(+), 7876 deletions(-) diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md index ef327d98124f1..64bb4d037b0f0 100644 --- a/docs/generators/groovy.md +++ b/docs/generators/groovy.md @@ -139,10 +139,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -150,6 +154,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -162,14 +168,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -185,19 +195,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -205,8 +217,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index 84a85a253a234..8194792f0cb21 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -178,10 +178,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -189,26 +193,31 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • else
  • enum
  • extends
  • -
  • file
  • final
  • finally
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -224,19 +233,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -244,8 +255,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-helidon-client.md b/docs/generators/java-helidon-client.md index e7c4f63d0b57f..acae6f22fe181 100644 --- a/docs/generators/java-helidon-client.md +++ b/docs/generators/java-helidon-client.md @@ -132,10 +132,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -143,6 +147,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -155,14 +161,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -178,19 +188,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -198,8 +210,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-helidon-server.md b/docs/generators/java-helidon-server.md index a027e1cee38dc..16a4e3354f951 100644 --- a/docs/generators/java-helidon-server.md +++ b/docs/generators/java-helidon-server.md @@ -134,10 +134,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -145,6 +149,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -157,14 +163,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -180,19 +190,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -200,8 +212,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md index c91aa73e31bd4..9fcc67c3991a9 100644 --- a/docs/generators/java-inflector.md +++ b/docs/generators/java-inflector.md @@ -136,10 +136,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -147,6 +151,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -159,14 +165,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -182,19 +192,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -202,8 +214,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-micronaut-client.md b/docs/generators/java-micronaut-client.md index 76e90328b3f77..86155e94e31ed 100644 --- a/docs/generators/java-micronaut-client.md +++ b/docs/generators/java-micronaut-client.md @@ -158,12 +158,16 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiexception
  • apiresponse
  • application
  • +
  • array
  • +
  • arraylist
  • assert
  • authorization
  • +
  • bigdecimal
  • body
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -173,6 +177,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • const
  • continue
  • cookie
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -186,15 +192,19 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • for
  • format
  • goto
  • +
  • hashmap
  • header
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -210,11 +220,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • pathvariable
  • private
  • @@ -223,9 +233,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • queryparam
  • queryvalue
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -233,8 +245,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-micronaut-server.md b/docs/generators/java-micronaut-server.md index 2366e962c65bf..d62590c657d94 100644 --- a/docs/generators/java-micronaut-server.md +++ b/docs/generators/java-micronaut-server.md @@ -158,21 +158,28 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiexception
  • apiresponse
  • application
  • +
  • array
  • +
  • arraylist
  • assert
  • authorization
  • +
  • bigdecimal
  • body
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • class
  • client
  • +
  • completedfileupload
  • configuration
  • const
  • continue
  • cookie
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -186,15 +193,19 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • for
  • format
  • goto
  • +
  • hashmap
  • header
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -210,11 +221,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • pathvariable
  • private
  • @@ -223,9 +234,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • queryparam
  • queryvalue
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -233,8 +246,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md index 06ba5f7141d76..494712aa30cf7 100644 --- a/docs/generators/java-msf4j.md +++ b/docs/generators/java-msf4j.md @@ -142,10 +142,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -153,6 +157,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -165,14 +171,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -188,19 +198,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -208,8 +220,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md index 56f49ef7d2f17..c0e35a5d614c8 100644 --- a/docs/generators/java-pkmst.md +++ b/docs/generators/java-pkmst.md @@ -143,10 +143,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -154,6 +158,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -166,14 +172,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -189,19 +199,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -209,8 +221,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md index b0205e0a4b3a3..4bbfa059b0d53 100644 --- a/docs/generators/java-play-framework.md +++ b/docs/generators/java-play-framework.md @@ -146,10 +146,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -157,6 +161,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -169,14 +175,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -192,19 +202,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -212,8 +224,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md index 7342fd046e8f6..b1cd5e9ab0cad 100644 --- a/docs/generators/java-undertow-server.md +++ b/docs/generators/java-undertow-server.md @@ -136,10 +136,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -147,6 +151,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -159,14 +165,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -182,19 +192,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -202,8 +214,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md index 2057fefafc983..d4f054ed770cb 100644 --- a/docs/generators/java-vertx-web.md +++ b/docs/generators/java-vertx-web.md @@ -136,10 +136,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -147,6 +151,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -159,14 +165,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -182,19 +192,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -202,8 +214,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md index 57b3b487f73d1..14023a3a591a7 100644 --- a/docs/generators/java-vertx.md +++ b/docs/generators/java-vertx.md @@ -139,10 +139,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -150,6 +154,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -162,14 +168,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -185,19 +195,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -205,8 +217,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/java.md b/docs/generators/java.md index 79cc58568fd4a..812319950db2a 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -168,10 +168,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -179,6 +183,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -191,14 +197,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -214,19 +224,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -234,8 +246,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md index 3c470946b303b..bd5ec69310367 100644 --- a/docs/generators/jaxrs-cxf-cdi.md +++ b/docs/generators/jaxrs-cxf-cdi.md @@ -150,10 +150,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -161,6 +165,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -173,14 +179,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -196,19 +206,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -216,8 +228,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md index d2501c27ed7b8..db4b0d9a9042d 100644 --- a/docs/generators/jaxrs-cxf-client.md +++ b/docs/generators/jaxrs-cxf-client.md @@ -141,10 +141,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -152,6 +156,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -164,14 +170,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -187,19 +197,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -207,8 +219,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md index b5e40fddf862b..e52fdcda0a091 100644 --- a/docs/generators/jaxrs-cxf-extended.md +++ b/docs/generators/jaxrs-cxf-extended.md @@ -164,10 +164,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -175,6 +179,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -187,14 +193,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -210,19 +220,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -230,8 +242,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md index 19cbe9aaa0aca..e337513ad0413 100644 --- a/docs/generators/jaxrs-cxf.md +++ b/docs/generators/jaxrs-cxf.md @@ -159,10 +159,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -170,6 +174,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -182,14 +188,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -205,19 +215,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -225,8 +237,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md index 47bf4126e0739..9e32a23be2ca1 100644 --- a/docs/generators/jaxrs-jersey.md +++ b/docs/generators/jaxrs-jersey.md @@ -142,10 +142,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -153,6 +157,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -165,14 +171,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -188,19 +198,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -208,8 +220,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md index f78b67963026b..8d3d8e4dcc58d 100644 --- a/docs/generators/jaxrs-resteasy-eap.md +++ b/docs/generators/jaxrs-resteasy-eap.md @@ -143,10 +143,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -154,6 +158,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -166,14 +172,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -189,19 +199,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -209,8 +221,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md index 55bb4e75cefbf..1d6223962963c 100644 --- a/docs/generators/jaxrs-resteasy.md +++ b/docs/generators/jaxrs-resteasy.md @@ -142,10 +142,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -153,6 +157,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -165,14 +171,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -188,19 +198,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -208,8 +220,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md index 8c5c3e899c8c3..b3973e664d810 100644 --- a/docs/generators/jaxrs-spec.md +++ b/docs/generators/jaxrs-spec.md @@ -150,10 +150,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -161,6 +165,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • @@ -173,14 +179,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -196,19 +206,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -216,8 +228,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/docs/generators/spring.md b/docs/generators/spring.md index 3b5f5f5f4d0ac..88ea9a4864fa6 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -171,10 +171,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • apiclient
  • apiexception
  • apiresponse
  • +
  • array
  • +
  • arraylist
  • assert
  • +
  • bigdecimal
  • boolean
  • break
  • byte
  • +
  • byte[]
  • case
  • catch
  • char
  • @@ -182,26 +186,31 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • configuration
  • const
  • continue
  • +
  • date
  • +
  • datetime
  • default
  • do
  • double
  • else
  • enum
  • extends
  • -
  • file
  • final
  • finally
  • float
  • for
  • goto
  • +
  • hashmap
  • if
  • implements
  • import
  • instanceof
  • int
  • +
  • integer
  • interface
  • +
  • linkedhashset
  • list
  • localdate
  • +
  • localdatetime
  • localreturntype
  • localtime
  • localvaraccept
  • @@ -217,19 +226,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • localvarpostbody
  • localvarqueryparams
  • long
  • +
  • map
  • native
  • new
  • null
  • object
  • -
  • offsetdatetime
  • package
  • private
  • protected
  • public
  • return
  • +
  • set
  • short
  • static
  • strictfp
  • +
  • string
  • stringutil
  • super
  • switch
  • @@ -237,8 +248,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • this
  • throw
  • throws
  • +
  • timestamp
  • transient
  • try
  • +
  • uri
  • +
  • uuid
  • void
  • volatile
  • while
  • diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index b389a550b01a8..f559444dcb93c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -181,7 +181,7 @@ public AbstractJavaCodegen() { setReservedWordsLowerCase( Arrays.asList( // special words - "object", "list", "file", + "list", "file", // used as internal variables, can collide with parameter names "localVarPath", "localVarQueryParams", "localVarCollectionQueryParams", "localVarHeaderParams", "localVarCookieParams", "localVarFormParams", "localVarPostBody", @@ -191,12 +191,12 @@ public AbstractJavaCodegen() { // language reserved words "abstract", "continue", "for", "new", "switch", "assert", - "default", "if", "package", "synchronized", "boolean", "do", "goto", "private", - "this", "break", "double", "implements", "protected", "throw", "byte", "else", + "default", "if", "package", "synchronized", "do", "goto", "private", + "this", "break", "implements", "protected", "throw", "byte", "else", "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", "catch", "extends", "int", "short", "try", "char", "final", "interface", "static", - "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", - "native", "super", "while", "null", "offsetdatetime", "localdate", "localtime") + "void", "class", "finally", "strictfp", "volatile", "const", + "native", "super", "while", "null") ); languageSpecificPrimitives = Sets.newHashSet("String", @@ -234,6 +234,8 @@ public AbstractJavaCodegen() { importMapping.put("LocalDate", "org.joda.time.*"); importMapping.put("LocalTime", "org.joda.time.*"); + updateReservedWords(); + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC).defaultValue(this.getInvokerPackage())); @@ -650,6 +652,8 @@ public void processOpts() { additionalProperties.put("legacyDates", "true"); } + updateReservedWords(); + if (additionalProperties.containsKey(TEST_OUTPUT)) { setOutputTestFolder(additionalProperties.get(TEST_OUTPUT).toString()); } @@ -728,6 +732,13 @@ protected void applyJakartaPackage() { writePropertyBack(JAVAX_PACKAGE, "jakarta"); } + protected void updateReservedWords() { + final List newReservedWords = new ArrayList<>(reservedWords()); + newReservedWords.addAll(importMapping().keySet()); + newReservedWords.addAll(languageSpecificPrimitives()); + setReservedWordsLowerCase(newReservedWords); + } + @Override public String escapeReservedWord(String name) { if (this.reservedWordsMappings().containsKey(name)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java index 1c0bff0c1be2a..fa977706281ee 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java @@ -69,6 +69,7 @@ public GroovyClientCodegen() { languageSpecificPrimitives.add("File"); languageSpecificPrimitives.add("Map"); languageSpecificPrimitives.add("List"); + updateReservedWords(); // this must not be OS-specific sourceFolder = projectFolder + "/groovy"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java index 032668cee009a..2185938f7e91a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java @@ -87,6 +87,7 @@ public JavaCXFClientCodegen() { typeMapping.put("date", "LocalDate"); importMapping.put("LocalDate", "org.joda.time.LocalDate"); + updateReservedWords(); embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java index 26c99103f236a..cc37f9c1cdf3b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java @@ -101,6 +101,7 @@ public JavaCXFServerCodegen() { typeMapping.put("date", "LocalDate"); importMapping.put("LocalDate", "org.joda.time.LocalDate"); + updateReservedWords(); embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 27561d94fa15a..d4e442f6ddedb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -642,6 +642,7 @@ public void processOpts() { } else if (VERTX.equals(getLibrary())) { typeMapping.put("file", "AsyncFile"); importMapping.put("AsyncFile", "io.vertx.core.file.AsyncFile"); + updateReservedWords(); forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON); apiTemplateFiles.put("apiImpl.mustache", "Impl.java"); apiTemplateFiles.put("rxApiImpl.mustache", ".java"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java index 79ce9f6186cfc..9e3ac9fd919b4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java @@ -204,6 +204,7 @@ public void processOpts() { importMapping.put("StringJoiner", "java.util.StringJoiner"); importMapping.put("WebClientRequestHeaders", "io.helidon.webclient.WebClientRequestHeaders"); importMapping.put("Pair", invokerPackage + ".Pair"); + updateReservedWords(); List modifiable = new ArrayList<>(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java index 990ad8fc5f01a..126e433426c10 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java @@ -159,6 +159,7 @@ public void processOpts() { importMapping.put("ObjectMapper", "com.fasterxml.jackson.databind.ObjectMapper"); importMapping.put("Jsonb", rootJavaEEPackage() + ".json.bind.Jsonb"); importMapping.put("JsonbBuilder", rootJavaEEPackage() + ".json.bind.JsonbBuilder"); + updateReservedWords(); if (additionalProperties.containsKey(USE_ABSTRACT_CLASS)) { useAbstractClass = Boolean.parseBoolean(additionalProperties.get(USE_ABSTRACT_CLASS).toString()); @@ -223,6 +224,7 @@ public void processOpts() { importMapping.put("ByteArrayInputStream", "java.io.ByteArrayInputStream"); } importMapping.put("Handler", "io.helidon.webserver.Handler"); + updateReservedWords(); processSupportingFiles(modifiable, unmodifiable); } else if (isLibrary(HELIDON_NIMA)) { throw new UnsupportedOperationException("Not implemented"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java index d8234cd0b72fb..eb16afcb9dc63 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java @@ -98,6 +98,7 @@ public JavaJAXRSSpecServerCodegen() { typeMapping.put("date", "LocalDate"); importMapping.put("LocalDate", "org.joda.time.LocalDate"); + updateReservedWords(); super.embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "spec"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java index e169a653e8d8b..5301d16750d8e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java @@ -367,6 +367,7 @@ public void processOpts() { importMapping.putIfAbsent("LocalDateTime", "java.time.LocalDateTime"); importMapping.putIfAbsent("OffsetDateTime", "java.time.OffsetDateTime"); importMapping.putIfAbsent("LocalDate", "java.time.LocalDate"); + updateReservedWords(); // Add documentation files modelDocTemplateFiles.clear(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautServerCodegen.java index 7ff2fb2a1f356..ea011b7b2dd3c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautServerCodegen.java @@ -72,6 +72,7 @@ public JavaMicronautServerCodegen() { // It could be also StreamingFileUpload typeMapping.put("file", "CompletedFileUpload"); importMapping.put("CompletedFileUpload", "io.micronaut.http.multipart.CompletedFileUpload"); + updateReservedWords(); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java index 2e652dcfc53ff..1fd1433ab05ac 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java @@ -238,6 +238,8 @@ public void processOpts() { importMapping.put("InputStream", "java.io.InputStream"); typeMapping.put("file", "InputStream"); + + updateReservedWords(); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java index ddff4cf710890..64d6d65aa49dd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java @@ -157,6 +157,7 @@ public void processOpts() { importMapping.put("JsonProperty", "com.fasterxml.jackson.annotation.JsonProperty"); importMapping.put("JsonValue", "com.fasterxml.jackson.annotation.JsonValue"); importMapping.put("MainApiException", rootPackage + ".MainApiException"); + updateReservedWords(); modelDocTemplateFiles.clear(); apiDocTemplateFiles.clear(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXWebServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXWebServerCodegen.java index a7fc895b21536..05e47a16fdadd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXWebServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXWebServerCodegen.java @@ -101,6 +101,7 @@ public void processOpts() { importMapping.put("JsonValue", "com.fasterxml.jackson.annotation.JsonValue"); importMapping.put("FileUpload", "io.vertx.ext.web.FileUpload"); importMapping.put("JsonObject", "io.vertx.core.json.JsonObject"); + updateReservedWords(); modelDocTemplateFiles.clear(); apiDocTemplateFiles.clear(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index 8d10dbd6484db..829e51e247b88 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -335,10 +335,6 @@ public void processOpts() { .map(e -> Pair.of(e.getKey(), e.getValue().toString())).collect(Collectors.toList()); additionalProperties.put("configOptions", configOptions); - // TODO remove "file" from reserved word list as feign client doesn't support using `baseName` - // as the parameter name yet - reservedWords.remove("file"); - // Process java8 option before common java ones to change the default // dateLibrary to java8. LOGGER.info("----------------------------------"); @@ -558,6 +554,7 @@ public void processOpts() { if (isUseSpringBoot3()) { importMapping.put("ParameterObject", "org.springdoc.core.annotations.ParameterObject"); } + updateReservedWords(); if (useOptional) { writePropertyBack(USE_OPTIONAL, useOptional); @@ -737,6 +734,15 @@ public void processOpts() { supportsAdditionalPropertiesWithComposedSchema = true; } + @Override + protected void updateReservedWords() { + super.updateReservedWords(); + + // TODO remove "file" from reserved word list as feign client doesn't support using `baseName` + // as the parameter name yet + reservedWords.remove("file"); + } + private boolean containsEnums() { if (openAPI == null) { return false; @@ -1236,6 +1242,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation // this allows to use a custom Pageable schema without importing Spring Pageable. if (Boolean.TRUE.equals(operation.getExtensions().get("x-spring-paginated"))) { importMapping.put("Pageable", "org.springframework.data.domain.Pageable"); + updateReservedWords(); } CodegenOperation codegenOperation = super.fromOperation(path, httpMethod, operation, servers); diff --git a/samples/client/echo_api/java/apache-httpclient/docs/DataQuery.md b/samples/client/echo_api/java/apache-httpclient/docs/DataQuery.md index 338c467b2d565..35bcc72f1786b 100644 --- a/samples/client/echo_api/java/apache-httpclient/docs/DataQuery.md +++ b/samples/client/echo_api/java/apache-httpclient/docs/DataQuery.md @@ -9,7 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**suffix** | **String** | test suffix | [optional] | |**text** | **String** | Some text containing white spaces | [optional] | -|**date** | **OffsetDateTime** | A date | [optional] | +|**_date** | **OffsetDateTime** | A date | [optional] | diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java index 31a45aa378aa9..41da2a12e4142 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java @@ -48,7 +48,7 @@ public class DataQuery extends Query { private String text; public static final String JSON_PROPERTY_DATE = "date"; - private OffsetDateTime date; + private OffsetDateTime _date; public DataQuery() { @@ -106,29 +106,29 @@ public void setText(String text) { } - public DataQuery date(OffsetDateTime date) { + public DataQuery _date(OffsetDateTime _date) { - this.date = date; + this._date = _date; return this; } /** * A date - * @return date + * @return _date **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDate(OffsetDateTime date) { - this.date = date; + public void setDate(OffsetDateTime _date) { + this._date = _date; } @Override @@ -154,13 +154,13 @@ public boolean equals(Object o) { DataQuery dataQuery = (DataQuery) o; return Objects.equals(this.suffix, dataQuery.suffix) && Objects.equals(this.text, dataQuery.text) && - Objects.equals(this.date, dataQuery.date) && + Objects.equals(this._date, dataQuery._date) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(suffix, text, date, super.hashCode()); + return Objects.hash(suffix, text, _date, super.hashCode()); } @Override @@ -170,7 +170,7 @@ public String toString() { sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" suffix: ").append(toIndentedString(suffix)).append("\n"); sb.append(" text: ").append(toIndentedString(text)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java index dc7ed9215e76d..2405878d4b658 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java @@ -42,7 +42,7 @@ public class DataQuery extends Query { public static final String SERIALIZED_NAME_DATE = "date"; @SerializedName(SERIALIZED_NAME_DATE) - private OffsetDateTime date; + private OffsetDateTime _date; public DataQuery() { @@ -92,25 +92,25 @@ public void setText(String text) { } - public DataQuery date(OffsetDateTime date) { + public DataQuery _date(OffsetDateTime _date) { - this.date = date; + this._date = _date; return this; } /** * A date - * @return date + * @return _date **/ @javax.annotation.Nullable public OffsetDateTime getDate() { - return date; + return _date; } - public void setDate(OffsetDateTime date) { - this.date = date; + public void setDate(OffsetDateTime _date) { + this._date = _date; } @@ -125,13 +125,13 @@ public boolean equals(Object o) { DataQuery dataQuery = (DataQuery) o; return Objects.equals(this.suffix, dataQuery.suffix) && Objects.equals(this.text, dataQuery.text) && - Objects.equals(this.date, dataQuery.date) && + Objects.equals(this._date, dataQuery._date) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(suffix, text, date, super.hashCode()); + return Objects.hash(suffix, text, _date, super.hashCode()); } @Override @@ -141,7 +141,7 @@ public String toString() { sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" suffix: ").append(toIndentedString(suffix)).append("\n"); sb.append(" text: ").append(toIndentedString(text)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/echo_api/java/native/docs/DataQuery.md b/samples/client/echo_api/java/native/docs/DataQuery.md index d61a881571c0f..6ebe4cae40030 100644 --- a/samples/client/echo_api/java/native/docs/DataQuery.md +++ b/samples/client/echo_api/java/native/docs/DataQuery.md @@ -9,7 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**suffix** | **String** | test suffix | [optional] | |**text** | **String** | Some text containing white spaces | [optional] | -|**date** | **Instant** | A date | [optional] | +|**_date** | **Instant** | A date | [optional] | diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java index a96e59e6f3a67..c07ec09cf4aae 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java @@ -49,7 +49,7 @@ public class DataQuery extends Query { private String text; public static final String JSON_PROPERTY_DATE = "date"; - private Instant date; + private Instant _date; public DataQuery() { } @@ -104,28 +104,28 @@ public void setText(String text) { } - public DataQuery date(Instant date) { - this.date = date; + public DataQuery _date(Instant _date) { + this._date = _date; return this; } /** * A date - * @return date + * @return _date **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Instant getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDate(Instant date) { - this.date = date; + public void setDate(Instant _date) { + this._date = _date; } @@ -155,13 +155,13 @@ public boolean equals(Object o) { DataQuery dataQuery = (DataQuery) o; return Objects.equals(this.suffix, dataQuery.suffix) && Objects.equals(this.text, dataQuery.text) && - Objects.equals(this.date, dataQuery.date) && + Objects.equals(this._date, dataQuery._date) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(suffix, text, date, super.hashCode()); + return Objects.hash(suffix, text, _date, super.hashCode()); } @Override @@ -171,7 +171,7 @@ public String toString() { sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" suffix: ").append(toIndentedString(suffix)).append("\n"); sb.append(" text: ").append(toIndentedString(text)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/echo_api/java/okhttp-gson/docs/DataQuery.md b/samples/client/echo_api/java/okhttp-gson/docs/DataQuery.md index 338c467b2d565..35bcc72f1786b 100644 --- a/samples/client/echo_api/java/okhttp-gson/docs/DataQuery.md +++ b/samples/client/echo_api/java/okhttp-gson/docs/DataQuery.md @@ -9,7 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**suffix** | **String** | test suffix | [optional] | |**text** | **String** | Some text containing white spaces | [optional] | -|**date** | **OffsetDateTime** | A date | [optional] | +|**_date** | **OffsetDateTime** | A date | [optional] | diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java index 934f739ee40cc..036f8039becd4 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java @@ -65,7 +65,7 @@ public class DataQuery extends Query { public static final String SERIALIZED_NAME_DATE = "date"; @SerializedName(SERIALIZED_NAME_DATE) - private OffsetDateTime date; + private OffsetDateTime _date; public DataQuery() { } @@ -112,24 +112,24 @@ public void setText(String text) { } - public DataQuery date(OffsetDateTime date) { + public DataQuery _date(OffsetDateTime _date) { - this.date = date; + this._date = _date; return this; } /** * A date - * @return date + * @return _date **/ @javax.annotation.Nullable public OffsetDateTime getDate() { - return date; + return _date; } - public void setDate(OffsetDateTime date) { - this.date = date; + public void setDate(OffsetDateTime _date) { + this._date = _date; } @@ -145,13 +145,13 @@ public boolean equals(Object o) { DataQuery dataQuery = (DataQuery) o; return Objects.equals(this.suffix, dataQuery.suffix) && Objects.equals(this.text, dataQuery.text) && - Objects.equals(this.date, dataQuery.date) && + Objects.equals(this._date, dataQuery._date) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(suffix, text, date, super.hashCode()); + return Objects.hash(suffix, text, _date, super.hashCode()); } @Override @@ -161,7 +161,7 @@ public String toString() { sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" suffix: ").append(toIndentedString(suffix)).append("\n"); sb.append(" text: ").append(toIndentedString(text)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java-helidon-client/mp/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/mp/docs/FakeApi.md index 7f7a569f2b43d..bdd0da8c948b4 100644 --- a/samples/client/petstore/java-helidon-client/mp/docs/FakeApi.md +++ b/samples/client/petstore/java-helidon-client/mp/docs/FakeApi.md @@ -440,7 +440,7 @@ No authorization required ## testEndpointParameters -> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -455,14 +455,14 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java-helidon-client/mp/docs/FooGetDefaultResponse.md b/samples/client/petstore/java-helidon-client/mp/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java-helidon-client/mp/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java-helidon-client/mp/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java-helidon-client/mp/docs/FormatTest.md b/samples/client/petstore/java-helidon-client/mp/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java-helidon-client/mp/docs/FormatTest.md +++ b/samples/client/petstore/java-helidon-client/mp/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java-helidon-client/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java-helidon-client/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java-helidon-client/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java-helidon-client/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java-helidon-client/mp/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java-helidon-client/mp/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java-helidon-client/mp/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java-helidon-client/mp/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/api/FakeApi.java index 533c19442d565..bb0d22193a802 100644 --- a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/api/FakeApi.java @@ -134,7 +134,7 @@ public interface FakeApi { @POST @Consumes({ "application/x-www-form-urlencoded" }) - void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String string, @FormParam("binary") File binary, @FormParam("date") LocalDate date, @FormParam("dateTime") OffsetDateTime dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException; + void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer _integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String _string, @FormParam("binary") File binary, @FormParam("date") LocalDate _date, @FormParam("dateTime") OffsetDateTime _dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException; /** * To test enum parameters diff --git a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 27971dae91689..f1defcba9dd88 100644 --- a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -24,25 +24,25 @@ public class FooGetDefaultResponse { - private Foo string; + private Foo _string; /** - * Get string - * @return string + * Get _string + * @return _string **/ public Foo getString() { - return string; + return _string; } /** - * Set string + * Set _string **/ - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } - public FooGetDefaultResponse string(Foo string) { - this.string = string; + public FooGetDefaultResponse _string(Foo _string) { + this._string = _string; return this; } @@ -55,7 +55,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/FormatTest.java index 6f6b62d497c85..5f1d6b4bee79c 100644 --- a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/FormatTest.java @@ -28,7 +28,7 @@ public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,17 +42,17 @@ public class FormatTest { private BigDecimal decimal; - private String string; + private String _string; private byte[] _byte; private File binary; - private LocalDate date; + private LocalDate _date; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; @@ -67,24 +67,24 @@ public class FormatTest { private String patternWithDigitsAndDelimiter; /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ public Integer getInteger() { - return integer; + return _integer; } /** - * Set integer + * Set _integer **/ - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } @@ -217,22 +217,22 @@ public FormatTest decimal(BigDecimal decimal) { } /** - * Get string - * @return string + * Get _string + * @return _string **/ public String getString() { - return string; + return _string; } /** - * Set string + * Set _string **/ - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } @@ -277,62 +277,62 @@ public FormatTest binary(File binary) { } /** - * Get date - * @return date + * Get _date + * @return _date **/ public LocalDate getDate() { - return date; + return _date; } /** - * Set date + * Set _date **/ - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } /** - * Set dateTime + * Set _dateTime **/ - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public UUID getUuid() { - return uuid; + return _uuid; } /** - * Set uuid + * Set _uuid **/ - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -405,19 +405,19 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index de307d1e28600..5ca52e49a9a66 100644 --- a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,74 +28,74 @@ public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private Map map = null; + private Map _map = null; /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public UUID getUuid() { - return uuid; + return _uuid; } /** - * Set uuid + * Set _uuid **/ - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } /** - * Set dateTime + * Set _dateTime **/ - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ public Map getMap() { - return map; + return _map; } /** - * Set map + * Set _map **/ - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - this.map.put(key, mapItem); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + this._map.put(key, _mapItem); return this; } @@ -108,9 +108,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 254b7df22cb42..29c5809eaab05 100644 --- a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -28,7 +28,7 @@ public class ObjectWithDeprecatedFields { - private String uuid; + private String _uuid; private BigDecimal id; @@ -37,22 +37,22 @@ public class ObjectWithDeprecatedFields { private List bars = null; /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public String getUuid() { - return uuid; + return _uuid; } /** - * Set uuid + * Set _uuid **/ - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } - public ObjectWithDeprecatedFields uuid(String uuid) { - this.uuid = uuid; + public ObjectWithDeprecatedFields _uuid(String _uuid) { + this._uuid = _uuid; return this; } @@ -136,7 +136,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java-helidon-client/se/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/se/docs/FakeApi.md index e442af92c3b70..ce1d1164b38fd 100644 --- a/samples/client/petstore/java-helidon-client/se/docs/FakeApi.md +++ b/samples/client/petstore/java-helidon-client/se/docs/FakeApi.md @@ -811,7 +811,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -843,18 +843,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -875,14 +875,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java-helidon-client/se/docs/FooGetDefaultResponse.md b/samples/client/petstore/java-helidon-client/se/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java-helidon-client/se/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java-helidon-client/se/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java-helidon-client/se/docs/FormatTest.md b/samples/client/petstore/java-helidon-client/se/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java-helidon-client/se/docs/FormatTest.md +++ b/samples/client/petstore/java-helidon-client/se/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java-helidon-client/se/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java-helidon-client/se/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java-helidon-client/se/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java-helidon-client/se/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java-helidon-client/se/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java-helidon-client/se/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java-helidon-client/se/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java-helidon-client/se/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApi.java index dc7a20295b509..4cf623980fc4d 100644 --- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApi.java @@ -86,19 +86,19 @@ public interface FakeApi { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return {@code ApiResponse} */ - ApiResponse testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback); + ApiResponse testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback); /** * To test enum parameters diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java index db9dce74ca310..b72aa18e9b197 100644 --- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -558,13 +558,13 @@ protected ApiResponse testClientModelSubmit(WebClientRequestBuilder webC } @Override - public ApiResponse testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) { + public ApiResponse testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) { Objects.requireNonNull(number, "Required parameter 'number' not specified"); Objects.requireNonNull(_double, "Required parameter '_double' not specified"); Objects.requireNonNull(patternWithoutDelimiter, "Required parameter 'patternWithoutDelimiter' not specified"); Objects.requireNonNull(_byte, "Required parameter '_byte' not specified"); - WebClientRequestBuilder webClientRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); - return testEndpointParametersSubmit(webClientRequestBuilder, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + WebClientRequestBuilder webClientRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); + return testEndpointParametersSubmit(webClientRequestBuilder, number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -575,19 +575,19 @@ public ApiResponse testEndpointParameters(BigDecimal number, Double _doubl * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return WebClientRequestBuilder for testEndpointParameters */ - protected WebClientRequestBuilder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) { + protected WebClientRequestBuilder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) { WebClientRequestBuilder webClientRequestBuilder = apiClient.webClient() .method("POST"); @@ -607,32 +607,32 @@ protected WebClientRequestBuilder testEndpointParametersRequestBuilder(BigDecima * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return {@code ApiResponse} for the submitted request */ - protected ApiResponse testEndpointParametersSubmit(WebClientRequestBuilder webClientRequestBuilder, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) { + protected ApiResponse testEndpointParametersSubmit(WebClientRequestBuilder webClientRequestBuilder, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) { String formParams = new StringJoiner("&") - .add("integer=" + integer) + .add("integer=" + _integer) .add("int32=" + int32) .add("int64=" + int64) .add("number=" + number) .add("float=" + _float) .add("double=" + _double) - .add("string=" + string) + .add("string=" + _string) .add("pattern_without_delimiter=" + patternWithoutDelimiter) .add("byte=" + _byte) .add("binary=" + binary) - .add("date=" + date) - .add("dateTime=" + dateTime) + .add("date=" + _date) + .add("dateTime=" + _dateTime) .add("password=" + password) .add("callback=" + paramCallback) .toString(); diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 27971dae91689..f1defcba9dd88 100644 --- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -24,25 +24,25 @@ public class FooGetDefaultResponse { - private Foo string; + private Foo _string; /** - * Get string - * @return string + * Get _string + * @return _string **/ public Foo getString() { - return string; + return _string; } /** - * Set string + * Set _string **/ - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } - public FooGetDefaultResponse string(Foo string) { - this.string = string; + public FooGetDefaultResponse _string(Foo _string) { + this._string = _string; return this; } @@ -55,7 +55,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/FormatTest.java index 6f6b62d497c85..5f1d6b4bee79c 100644 --- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/FormatTest.java @@ -28,7 +28,7 @@ public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,17 +42,17 @@ public class FormatTest { private BigDecimal decimal; - private String string; + private String _string; private byte[] _byte; private File binary; - private LocalDate date; + private LocalDate _date; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; @@ -67,24 +67,24 @@ public class FormatTest { private String patternWithDigitsAndDelimiter; /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ public Integer getInteger() { - return integer; + return _integer; } /** - * Set integer + * Set _integer **/ - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } @@ -217,22 +217,22 @@ public FormatTest decimal(BigDecimal decimal) { } /** - * Get string - * @return string + * Get _string + * @return _string **/ public String getString() { - return string; + return _string; } /** - * Set string + * Set _string **/ - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } @@ -277,62 +277,62 @@ public FormatTest binary(File binary) { } /** - * Get date - * @return date + * Get _date + * @return _date **/ public LocalDate getDate() { - return date; + return _date; } /** - * Set date + * Set _date **/ - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } /** - * Set dateTime + * Set _dateTime **/ - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public UUID getUuid() { - return uuid; + return _uuid; } /** - * Set uuid + * Set _uuid **/ - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -405,19 +405,19 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index de307d1e28600..5ca52e49a9a66 100644 --- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,74 +28,74 @@ public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private Map map = null; + private Map _map = null; /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public UUID getUuid() { - return uuid; + return _uuid; } /** - * Set uuid + * Set _uuid **/ - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } /** - * Set dateTime + * Set _dateTime **/ - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ public Map getMap() { - return map; + return _map; } /** - * Set map + * Set _map **/ - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - this.map.put(key, mapItem); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + this._map.put(key, _mapItem); return this; } @@ -108,9 +108,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 254b7df22cb42..29c5809eaab05 100644 --- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -28,7 +28,7 @@ public class ObjectWithDeprecatedFields { - private String uuid; + private String _uuid; private BigDecimal id; @@ -37,22 +37,22 @@ public class ObjectWithDeprecatedFields { private List bars = null; /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public String getUuid() { - return uuid; + return _uuid; } /** - * Set uuid + * Set _uuid **/ - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } - public ObjectWithDeprecatedFields uuid(String uuid) { - this.uuid = uuid; + public ObjectWithDeprecatedFields _uuid(String _uuid) { + this._uuid = _uuid; return this; } @@ -136,7 +136,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java-micronaut-client/docs/apis/FakeApi.md b/samples/client/petstore/java-micronaut-client/docs/apis/FakeApi.md index 50260b878f48c..d940111b5a1a5 100644 --- a/samples/client/petstore/java-micronaut-client/docs/apis/FakeApi.md +++ b/samples/client/petstore/java-micronaut-client/docs/apis/FakeApi.md @@ -247,7 +247,7 @@ To test \"client\" model # **testEndpointParameters** ```java -Mono FakeApi.testEndpointParameters(number_doublepatternWithoutDelimiter_byteintegerint32int64_floatstringbinarydatedateTimepasswordparamCallback) +Mono FakeApi.testEndpointParameters(number_doublepatternWithoutDelimiter_byte_integerint32int64_float_stringbinary_date_dateTimepasswordparamCallback) ``` Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -261,14 +261,14 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイ | **_double** | `Double`| None | | | **patternWithoutDelimiter** | `String`| None | | | **_byte** | `byte[]`| None | | -| **integer** | `Integer`| None | [optional parameter] | +| **_integer** | `Integer`| None | [optional parameter] | | **int32** | `Integer`| None | [optional parameter] | | **int64** | `Long`| None | [optional parameter] | | **_float** | `Float`| None | [optional parameter] | -| **string** | `String`| None | [optional parameter] | +| **_string** | `String`| None | [optional parameter] | | **binary** | `File`| None | [optional parameter] | -| **date** | `LocalDate`| None | [optional parameter] | -| **dateTime** | `OffsetDateTime`| None | [optional parameter] | +| **_date** | `LocalDate`| None | [optional parameter] | +| **_dateTime** | `OffsetDateTime`| None | [optional parameter] | | **password** | `String`| None | [optional parameter] | | **paramCallback** | `String`| None | [optional parameter] | diff --git a/samples/client/petstore/java-micronaut-client/docs/models/FormatTest.md b/samples/client/petstore/java-micronaut-client/docs/models/FormatTest.md index 420fa584ec3f8..c0fc9dcda0736 100644 --- a/samples/client/petstore/java-micronaut-client/docs/models/FormatTest.md +++ b/samples/client/petstore/java-micronaut-client/docs/models/FormatTest.md @@ -8,20 +8,20 @@ The class is defined in **[FormatTest.java](../../src/main/java/org/openapitools Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**integer** | `Integer` | | [optional property] +**_integer** | `Integer` | | [optional property] **int32** | `Integer` | | [optional property] **int64** | `Long` | | [optional property] **number** | `BigDecimal` | | **_float** | `Float` | | [optional property] **_double** | `Double` | | [optional property] -**string** | `String` | | [optional property] +**_string** | `String` | | [optional property] **_byte** | `byte[]` | | **binary** | `File` | | [optional property] -**date** | `LocalDate` | | -**dateTime** | `OffsetDateTime` | | [optional property] -**uuid** | `UUID` | | [optional property] +**_date** | `LocalDate` | | +**_dateTime** | `OffsetDateTime` | | [optional property] +**_uuid** | `UUID` | | [optional property] **password** | `String` | | -**bigDecimal** | `BigDecimal` | | [optional property] +**_bigDecimal** | `BigDecimal` | | [optional property] diff --git a/samples/client/petstore/java-micronaut-client/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java-micronaut-client/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md index 5eac3d4d078a0..3d49aaa8109e2 100644 --- a/samples/client/petstore/java-micronaut-client/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java-micronaut-client/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md @@ -8,9 +8,9 @@ The class is defined in **[MixedPropertiesAndAdditionalPropertiesClass.java](../ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**uuid** | `UUID` | | [optional property] -**dateTime** | `OffsetDateTime` | | [optional property] -**map** | [`Map<String, Animal>`](Animal.md) | | [optional property] +**_uuid** | `UUID` | | [optional property] +**_dateTime** | `OffsetDateTime` | | [optional property] +**_map** | [`Map<String, Animal>`](Animal.md) | | [optional property] diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java index aa8e4d5fc153a..ad664214f4552 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java @@ -143,14 +143,14 @@ Mono testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) */ @@ -161,14 +161,14 @@ Mono testEndpointParameters( @NotNull @DecimalMin("67.8") @DecimalMax("123.4") Double _double, @NotNull @Pattern(regexp="^[A-Z].*") String patternWithoutDelimiter, @NotNull byte[] _byte, - @Nullable @Min(10) @Max(100) Integer integer, + @Nullable @Min(10) @Max(100) Integer _integer, @Nullable @Min(20) @Max(200) Integer int32, @Nullable Long int64, @Nullable @DecimalMax("987.6") Float _float, - @Nullable @Pattern(regexp="/[a-z]/i") String string, + @Nullable @Pattern(regexp="/[a-z]/i") String _string, @Nullable File binary, - @Nullable @Format("yyyy-MM-dd") LocalDate date, - @Nullable @Format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") OffsetDateTime dateTime, + @Nullable @Format("yyyy-MM-dd") LocalDate _date, + @Nullable @Format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") OffsetDateTime _dateTime, @Nullable @Size(min=10, max=64) String password, @Nullable String paramCallback ); diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java index 1929ddf3f6bfc..7f0c6d8482eba 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java @@ -51,7 +51,7 @@ @Introspected public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -69,7 +69,7 @@ public class FormatTest { private Double _double; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -78,32 +78,32 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @Nullable @Min(10) @@ -111,13 +111,13 @@ public FormatTest integer(Integer integer) { @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -246,27 +246,27 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @Nullable @Pattern(regexp="/[a-z]/i") @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -313,74 +313,74 @@ public void setBinary(File binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @NotNull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -406,26 +406,26 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @Nullable @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -437,45 +437,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 4b0a89e46ec07..66f3efcc881ee 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,90 +39,90 @@ @Introspected public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map _map = null; public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -134,23 +134,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md index e442af92c3b70..ce1d1164b38fd 100644 --- a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md +++ b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md @@ -811,7 +811,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -843,18 +843,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -875,14 +875,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/apache-httpclient/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/apache-httpclient/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/apache-httpclient/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/apache-httpclient/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/apache-httpclient/docs/FormatTest.md b/samples/client/petstore/java/apache-httpclient/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/apache-httpclient/docs/FormatTest.md +++ b/samples/client/petstore/java/apache-httpclient/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/apache-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/apache-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/apache-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/apache-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/apache-httpclient/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/apache-httpclient/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/apache-httpclient/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/apache-httpclient/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java index de6b83f45ac02..e2e4d6a9ed95c 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -929,20 +929,20 @@ public Client testClientModel(Client client, Map additionalHeade * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException if fails to make API call */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - this.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, Collections.emptyMap()); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + this.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, Collections.emptyMap()); } @@ -953,20 +953,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param additionalHeaders additionalHeaders for this call * @throws ApiException if fails to make API call */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Map additionalHeaders) throws ApiException { + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'number' is set @@ -1004,8 +1004,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat localVarHeaderParams.putAll(additionalHeaders); - if (integer != null) - localVarFormParams.put("integer", integer); + if (_integer != null) + localVarFormParams.put("integer", _integer); if (int32 != null) localVarFormParams.put("int32", int32); if (int64 != null) @@ -1016,18 +1016,18 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat localVarFormParams.put("float", _float); if (_double != null) localVarFormParams.put("double", _double); -if (string != null) - localVarFormParams.put("string", string); +if (_string != null) + localVarFormParams.put("string", _string); if (patternWithoutDelimiter != null) localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); if (_byte != null) localVarFormParams.put("byte", _byte); if (binary != null) localVarFormParams.put("binary", binary); -if (date != null) - localVarFormParams.put("date", date); -if (dateTime != null) - localVarFormParams.put("dateTime", dateTime); +if (_date != null) + localVarFormParams.put("date", _date); +if (_dateTime != null) + localVarFormParams.put("dateTime", _dateTime); if (password != null) localVarFormParams.put("password", password); if (paramCallback != null) diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 17121fa9900df..18cb06d1a8779 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -37,34 +37,34 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @Override @@ -76,19 +76,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java index d7e7bb3b9b5be..4a78964718b53 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java @@ -56,7 +56,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -77,7 +77,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -86,13 +86,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -106,31 +106,31 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -298,29 +298,29 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -376,81 +376,81 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -540,19 +540,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -560,26 +560,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 066b0c87fbb8e..37907cf0dcba6 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -42,100 +42,100 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -147,23 +147,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 7c9bb616c5a36..c83e25c1b1820 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -43,7 +43,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -57,29 +57,29 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -183,7 +183,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -191,14 +191,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java index 242ce6070a24f..0529c39702ce0 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java @@ -311,14 +311,14 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) */ @@ -327,7 +327,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { "Content-Type: application/x-www-form-urlencoded", "Accept: application/json", }) - void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback); + void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer _integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String _string, @Param("binary") File binary, @Param("date") LocalDate _date, @Param("dateTime") OffsetDateTime _dateTime, @Param("password") String password, @Param("callback") String paramCallback); /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -337,14 +337,14 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) */ @@ -353,7 +353,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { "Content-Type: application/x-www-form-urlencoded", "Accept: application/json", }) - ApiResponse testEndpointParametersWithHttpInfo(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback); + ApiResponse testEndpointParametersWithHttpInfo(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer _integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String _string, @Param("binary") File binary, @Param("date") LocalDate _date, @Param("dateTime") OffsetDateTime _dateTime, @Param("password") String password, @Param("callback") String paramCallback); diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java index 54561ed8bc30f..bfbc91382083b 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java @@ -52,7 +52,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -70,7 +70,7 @@ public class FormatTest { private Double _double; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -79,48 +79,48 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -262,29 +262,29 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -340,81 +340,81 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -444,29 +444,29 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -479,45 +479,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1b5a969aa145b..8a32b6d24f25c 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -40,100 +40,100 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -146,23 +146,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java index 1d216f59627ac..fe5812dd31c81 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java @@ -485,14 +485,14 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) */ @@ -501,7 +501,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { "Content-Type: application/x-www-form-urlencoded", "Accept: application/json", }) - void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback); + void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer _integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String _string, @Param("binary") File binary, @Param("date") LocalDate _date, @Param("dateTime") OffsetDateTime _dateTime, @Param("password") String password, @Param("callback") String paramCallback); /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -511,14 +511,14 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) */ @@ -527,7 +527,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { "Content-Type: application/x-www-form-urlencoded", "Accept: application/json", }) - ApiResponse testEndpointParametersWithHttpInfo(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback); + ApiResponse testEndpointParametersWithHttpInfo(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer _integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String _string, @Param("binary") File binary, @Param("date") LocalDate _date, @Param("dateTime") OffsetDateTime _dateTime, @Param("password") String password, @Param("callback") String paramCallback); diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 64290b3fa02fc..334d850c21166 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -34,34 +34,34 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @@ -74,19 +74,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java index 0be153739ce68..9ed2886a1d965 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java @@ -53,7 +53,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -74,7 +74,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -83,13 +83,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -103,31 +103,31 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -295,29 +295,29 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -373,81 +373,81 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -538,19 +538,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -558,26 +558,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index b782bb90c2205..ac82beb3b9c22 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,100 +39,100 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -145,23 +145,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 9819758151e4f..e388671e9724f 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -181,7 +181,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -189,14 +189,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/google-api-client/docs/FakeApi.md b/samples/client/petstore/java/google-api-client/docs/FakeApi.md index 627366e41db3d..e8088cb9be260 100644 --- a/samples/client/petstore/java/google-api-client/docs/FakeApi.md +++ b/samples/client/petstore/java/google-api-client/docs/FakeApi.md @@ -548,7 +548,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -580,18 +580,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -612,14 +612,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/google-api-client/docs/FormatTest.md b/samples/client/petstore/java/google-api-client/docs/FormatTest.md index 9c68c3080e13e..7e401945c3bc7 100644 --- a/samples/client/petstore/java/google-api-client/docs/FormatTest.md +++ b/samples/client/petstore/java/google-api-client/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java index e80816d9678c4..b3fd55903d1dc 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java @@ -757,20 +757,20 @@ public HttpResponse testClientModelForHttpResponse(Client body, Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -144,23 +144,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md index d21432dbf3e4e..62d1027300a12 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md @@ -541,7 +541,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -580,18 +580,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - LocalDateTime dateTime = new LocalDateTime(); // LocalDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + LocalDateTime _dateTime = new LocalDateTime(); // LocalDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -612,14 +612,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **LocalDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **LocalDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md index 5c36e3616e7d7..b312d2eefa05e 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **LocalDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **LocalDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md index d8ba815078e3c..bc785b9c5a317 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **LocalDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **LocalDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java index 9fb0bb1af9dfd..e47ca25aee1b4 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java @@ -373,14 +373,14 @@ public ApiResponse testClientModelWithHttpInfo(Client body) throws ApiEx * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException if fails to make API call @@ -391,8 +391,8 @@ public ApiResponse testClientModelWithHttpInfo(Client body) throws ApiEx 404 User not found - */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, LocalDateTime dateTime, String password, String paramCallback) throws ApiException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, LocalDateTime _dateTime, String password, String paramCallback) throws ApiException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -402,14 +402,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return ApiResponse<Void> @@ -421,7 +421,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat 404 User not found - */ - public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, LocalDateTime dateTime, String password, String paramCallback) throws ApiException { + public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, LocalDateTime _dateTime, String password, String paramCallback) throws ApiException { // Check required parameters if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); @@ -438,8 +438,8 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D // Form parameters Map localVarFormParams = new LinkedHashMap<>(); - if (integer != null) { - localVarFormParams.put("integer", integer); + if (_integer != null) { + localVarFormParams.put("integer", _integer); } if (int32 != null) { localVarFormParams.put("int32", int32); @@ -452,19 +452,19 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D localVarFormParams.put("float", _float); } localVarFormParams.put("double", _double); - if (string != null) { - localVarFormParams.put("string", string); + if (_string != null) { + localVarFormParams.put("string", _string); } localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); localVarFormParams.put("byte", _byte); if (binary != null) { localVarFormParams.put("binary", binary); } - if (date != null) { - localVarFormParams.put("date", date); + if (_date != null) { + localVarFormParams.put("date", _date); } - if (dateTime != null) { - localVarFormParams.put("dateTime", dateTime); + if (_dateTime != null) { + localVarFormParams.put("dateTime", _dateTime); } if (password != null) { localVarFormParams.put("password", password); diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java index d38c78d5d24df..92b210f3ada43 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java @@ -54,7 +54,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -72,7 +72,7 @@ public class FormatTest { private Double _double; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -81,47 +81,47 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private LocalDateTime dateTime; + private LocalDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -258,28 +258,28 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -333,78 +333,78 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public LocalDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -433,28 +433,28 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -470,45 +470,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 84ed39d70189c..16b0d7740c064 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -42,97 +42,97 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private LocalDateTime dateTime; + private LocalDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public LocalDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -148,23 +148,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md b/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md index 84167f65462a0..ec43ec6cabedc 100644 --- a/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md +++ b/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md @@ -541,7 +541,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -580,18 +580,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -612,14 +612,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md b/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md index 9c68c3080e13e..7e401945c3bc7 100644 --- a/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md +++ b/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index 597605cede077..41e8c8dbeff31 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -373,14 +373,14 @@ public ApiResponse testClientModelWithHttpInfo(Client body) throws ApiEx * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException if fails to make API call @@ -391,8 +391,8 @@ public ApiResponse testClientModelWithHttpInfo(Client body) throws ApiEx 404 User not found - */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -402,14 +402,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return ApiResponse<Void> @@ -421,7 +421,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat 404 User not found - */ - public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { + public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { // Check required parameters if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); @@ -438,8 +438,8 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D // Form parameters Map localVarFormParams = new LinkedHashMap<>(); - if (integer != null) { - localVarFormParams.put("integer", integer); + if (_integer != null) { + localVarFormParams.put("integer", _integer); } if (int32 != null) { localVarFormParams.put("int32", int32); @@ -452,19 +452,19 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D localVarFormParams.put("float", _float); } localVarFormParams.put("double", _double); - if (string != null) { - localVarFormParams.put("string", string); + if (_string != null) { + localVarFormParams.put("string", _string); } localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); localVarFormParams.put("byte", _byte); if (binary != null) { localVarFormParams.put("binary", binary); } - if (date != null) { - localVarFormParams.put("date", date); + if (_date != null) { + localVarFormParams.put("date", _date); } - if (dateTime != null) { - localVarFormParams.put("dateTime", dateTime); + if (_dateTime != null) { + localVarFormParams.put("dateTime", _dateTime); } if (password != null) { localVarFormParams.put("password", password); diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java index 4094b8e88e6df..2118176397f6c 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java @@ -54,7 +54,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -72,7 +72,7 @@ public class FormatTest { private Double _double; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -81,47 +81,47 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -258,28 +258,28 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -333,78 +333,78 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -433,28 +433,28 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -470,45 +470,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1cefe82183ede..2fda754aef8f9 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -42,97 +42,97 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -148,23 +148,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/jersey3/docs/FakeApi.md b/samples/client/petstore/java/jersey3/docs/FakeApi.md index 83f469863c9af..c680764dd260e 100644 --- a/samples/client/petstore/java/jersey3/docs/FakeApi.md +++ b/samples/client/petstore/java/jersey3/docs/FakeApi.md @@ -597,7 +597,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -637,18 +637,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -669,14 +669,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/jersey3/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/jersey3/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/jersey3/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/jersey3/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/jersey3/docs/FormatTest.md b/samples/client/petstore/java/jersey3/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/jersey3/docs/FormatTest.md +++ b/samples/client/petstore/java/jersey3/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/jersey3/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey3/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/jersey3/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/jersey3/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/jersey3/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/jersey3/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/jersey3/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/jersey3/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java index 9bf3abd9fbe62..6aaed7baedaa5 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java @@ -404,14 +404,14 @@ public ApiResponse testClientModelWithHttpInfo(Client client) throws Api * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException if fails to make API call @@ -422,8 +422,8 @@ public ApiResponse testClientModelWithHttpInfo(Client client) throws Api 404 User not found - */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -433,14 +433,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @return ApiResponse<Void> @@ -452,7 +452,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat 404 User not found - */ - public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { + public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { // Check required parameters if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); @@ -469,8 +469,8 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D // Form parameters Map localVarFormParams = new LinkedHashMap<>(); - if (integer != null) { - localVarFormParams.put("integer", integer); + if (_integer != null) { + localVarFormParams.put("integer", _integer); } if (int32 != null) { localVarFormParams.put("int32", int32); @@ -483,19 +483,19 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D localVarFormParams.put("float", _float); } localVarFormParams.put("double", _double); - if (string != null) { - localVarFormParams.put("string", string); + if (_string != null) { + localVarFormParams.put("string", _string); } localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); localVarFormParams.put("byte", _byte); if (binary != null) { localVarFormParams.put("binary", binary); } - if (date != null) { - localVarFormParams.put("date", date); + if (_date != null) { + localVarFormParams.put("date", _date); } - if (dateTime != null) { - localVarFormParams.put("dateTime", dateTime); + if (_dateTime != null) { + localVarFormParams.put("dateTime", _dateTime); } if (password != null) { localVarFormParams.put("password", password); diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 87ab3b5be230e..8b4af17fd8a79 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -37,33 +37,33 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { - this.string = string; + public FooGetDefaultResponse _string(Foo _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @@ -79,19 +79,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java index 6b11ca62e0bda..2de6ab20aabf6 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java @@ -56,7 +56,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -77,7 +77,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -86,13 +86,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -106,30 +106,30 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -291,28 +291,28 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -366,78 +366,78 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @jakarta.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -528,19 +528,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -548,26 +548,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 8b0ba2af86b6e..0927087ec469b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -42,97 +42,97 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -148,23 +148,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 73931bb93b1fb..087ba695b6e4a 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -42,7 +42,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -56,28 +56,28 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { - this.uuid = uuid; + public ObjectWithDeprecatedFields _uuid(String _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -182,7 +182,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -190,14 +190,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/native-async/docs/FakeApi.md b/samples/client/petstore/java/native-async/docs/FakeApi.md index 5ad79f6eba2cc..6ca16008cfc56 100644 --- a/samples/client/petstore/java/native-async/docs/FakeApi.md +++ b/samples/client/petstore/java/native-async/docs/FakeApi.md @@ -1437,7 +1437,7 @@ No authorization required ## testEndpointParameters -> CompletableFuture testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> CompletableFuture testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -1470,18 +1470,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - CompletableFuture result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + CompletableFuture result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -1502,14 +1502,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | @@ -1535,7 +1535,7 @@ CompletableFuture (empty response body) ## testEndpointParametersWithHttpInfo -> CompletableFuture> testEndpointParameters testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> CompletableFuture> testEndpointParameters testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -1569,18 +1569,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - CompletableFuture> response = apiInstance.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + CompletableFuture> response = apiInstance.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); System.out.println("Status code: " + response.get().getStatusCode()); System.out.println("Response headers: " + response.get().getHeaders()); } catch (InterruptedException | ExecutionException e) { @@ -1610,14 +1610,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/native-async/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/native-async/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/native-async/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/native-async/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/native-async/docs/FormatTest.md b/samples/client/petstore/java/native-async/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/native-async/docs/FormatTest.md +++ b/samples/client/petstore/java/native-async/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/native-async/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/native-async/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/native-async/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/native-async/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java index c3a4b4bbedee1..91f30582c14f1 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1020,22 +1020,22 @@ private HttpRequest.Builder testClientModelRequestBuilder(Client client) throws * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @return CompletableFuture<Void> * @throws ApiException if fails to make API call */ - public CompletableFuture testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { + public CompletableFuture testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { try { - HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); return memberVarHttpClient.sendAsync( localVarRequestBuilder.build(), HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> { @@ -1057,22 +1057,22 @@ public CompletableFuture testEndpointParameters(BigDecimal number, Double * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @return CompletableFuture<ApiResponse<Void>> * @throws ApiException if fails to make API call */ - public CompletableFuture> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { + public CompletableFuture> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { try { - HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); return memberVarHttpClient.sendAsync( localVarRequestBuilder.build(), HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> { @@ -1093,7 +1093,7 @@ public CompletableFuture> testEndpointParametersWithHttpInfo(B } } - private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { + private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { // verify the required parameter 'number' is set if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); @@ -1120,8 +1120,8 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb localVarRequestBuilder.header("Accept", "application/json"); List formValues = new ArrayList<>(); - if (integer != null) { - formValues.add(new BasicNameValuePair("integer", integer.toString())); + if (_integer != null) { + formValues.add(new BasicNameValuePair("integer", _integer.toString())); } if (int32 != null) { formValues.add(new BasicNameValuePair("int32", int32.toString())); @@ -1138,8 +1138,8 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb if (_double != null) { formValues.add(new BasicNameValuePair("double", _double.toString())); } - if (string != null) { - formValues.add(new BasicNameValuePair("string", string.toString())); + if (_string != null) { + formValues.add(new BasicNameValuePair("string", _string.toString())); } if (patternWithoutDelimiter != null) { formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString())); @@ -1150,11 +1150,11 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb if (binary != null) { formValues.add(new BasicNameValuePair("binary", binary.toString())); } - if (date != null) { - formValues.add(new BasicNameValuePair("date", date.toString())); + if (_date != null) { + formValues.add(new BasicNameValuePair("date", _date.toString())); } - if (dateTime != null) { - formValues.add(new BasicNameValuePair("dateTime", dateTime.toString())); + if (_dateTime != null) { + formValues.add(new BasicNameValuePair("dateTime", _dateTime.toString())); } if (password != null) { formValues.add(new BasicNameValuePair("password", password.toString())); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index ec53378ecffbe..4010ba080b22b 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -38,33 +38,33 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { - this.string = string; + public FooGetDefaultResponse _string(Foo _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @@ -80,19 +80,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java index 3b561321f4b38..1dbcdee64cb47 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java @@ -57,7 +57,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -78,7 +78,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -87,13 +87,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -107,30 +107,30 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -292,28 +292,28 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -367,78 +367,78 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -529,19 +529,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -549,26 +549,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0699d6ee0b2ff..259030b2dadd4 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,97 +44,97 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -150,23 +150,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 7a9ec67bf6063..256fd26559287 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -44,7 +44,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -58,28 +58,28 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { - this.uuid = uuid; + public ObjectWithDeprecatedFields _uuid(String _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -184,7 +184,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -192,14 +192,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/native/docs/FakeApi.md b/samples/client/petstore/java/native/docs/FakeApi.md index d741761672da6..6894879261b38 100644 --- a/samples/client/petstore/java/native/docs/FakeApi.md +++ b/samples/client/petstore/java/native/docs/FakeApi.md @@ -1347,7 +1347,7 @@ No authorization required ## testEndpointParameters -> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -1379,18 +1379,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -1411,14 +1411,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | @@ -1444,7 +1444,7 @@ null (empty response body) ## testEndpointParametersWithHttpInfo -> ApiResponse testEndpointParameters testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> ApiResponse testEndpointParameters testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -1477,18 +1477,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - ApiResponse response = apiInstance.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + ApiResponse response = apiInstance.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); System.out.println("Status code: " + response.getStatusCode()); System.out.println("Response headers: " + response.getHeaders()); } catch (ApiException e) { @@ -1511,14 +1511,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/native/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/native/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/native/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/native/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/native/docs/FormatTest.md b/samples/client/petstore/java/native/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/native/docs/FormatTest.md +++ b/samples/client/petstore/java/native/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/native/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/native/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/native/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/native/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java index 8a8b89d22adca..4fbb1ce9bcd42 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java @@ -845,20 +845,20 @@ private HttpRequest.Builder testClientModelRequestBuilder(Client client) throws * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException if fails to make API call */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -868,21 +868,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @return ApiResponse<Void> * @throws ApiException if fails to make API call */ - public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); try { HttpResponse localVarResponse = memberVarHttpClient.send( localVarRequestBuilder.build(), @@ -915,7 +915,7 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D } } - private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { + private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { // verify the required parameter 'number' is set if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); @@ -942,8 +942,8 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb localVarRequestBuilder.header("Accept", "application/json"); List formValues = new ArrayList<>(); - if (integer != null) { - formValues.add(new BasicNameValuePair("integer", integer.toString())); + if (_integer != null) { + formValues.add(new BasicNameValuePair("integer", _integer.toString())); } if (int32 != null) { formValues.add(new BasicNameValuePair("int32", int32.toString())); @@ -960,8 +960,8 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb if (_double != null) { formValues.add(new BasicNameValuePair("double", _double.toString())); } - if (string != null) { - formValues.add(new BasicNameValuePair("string", string.toString())); + if (_string != null) { + formValues.add(new BasicNameValuePair("string", _string.toString())); } if (patternWithoutDelimiter != null) { formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString())); @@ -972,11 +972,11 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb if (binary != null) { formValues.add(new BasicNameValuePair("binary", binary.toString())); } - if (date != null) { - formValues.add(new BasicNameValuePair("date", date.toString())); + if (_date != null) { + formValues.add(new BasicNameValuePair("date", _date.toString())); } - if (dateTime != null) { - formValues.add(new BasicNameValuePair("dateTime", dateTime.toString())); + if (_dateTime != null) { + formValues.add(new BasicNameValuePair("dateTime", _dateTime.toString())); } if (password != null) { formValues.add(new BasicNameValuePair("password", password.toString())); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index ec53378ecffbe..4010ba080b22b 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -38,33 +38,33 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { - this.string = string; + public FooGetDefaultResponse _string(Foo _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @@ -80,19 +80,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java index 3b561321f4b38..1dbcdee64cb47 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java @@ -57,7 +57,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -78,7 +78,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -87,13 +87,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -107,30 +107,30 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -292,28 +292,28 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -367,78 +367,78 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -529,19 +529,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -549,26 +549,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0699d6ee0b2ff..259030b2dadd4 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,97 +44,97 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -150,23 +150,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 7a9ec67bf6063..256fd26559287 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -44,7 +44,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -58,28 +58,28 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { - this.uuid = uuid; + public ObjectWithDeprecatedFields _uuid(String _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -184,7 +184,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -192,14 +192,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md index 98f0b0098b8bf..0d96b99298be9 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md @@ -515,7 +515,7 @@ No authorization required # **testEndpointParameters** -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -546,18 +546,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -577,14 +577,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md index 9c68c3080e13e..7e401945c3bc7 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java index e036975291ef4..5a6eeeb117588 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1113,14 +1113,14 @@ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param _callback Callback for upload/download progress @@ -1133,7 +1133,7 @@ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback 404 User not found - */ - public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1164,8 +1164,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); - if (integer != null) { - localVarFormParams.put("integer", integer); + if (_integer != null) { + localVarFormParams.put("integer", _integer); } if (int32 != null) { @@ -1188,8 +1188,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double localVarFormParams.put("double", _double); } - if (string != null) { - localVarFormParams.put("string", string); + if (_string != null) { + localVarFormParams.put("string", _string); } if (patternWithoutDelimiter != null) { @@ -1204,12 +1204,12 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double localVarFormParams.put("binary", binary); } - if (date != null) { - localVarFormParams.put("date", date); + if (_date != null) { + localVarFormParams.put("date", _date); } - if (dateTime != null) { - localVarFormParams.put("dateTime", dateTime); + if (_dateTime != null) { + localVarFormParams.put("dateTime", _dateTime); } if (password != null) { @@ -1242,7 +1242,7 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double } @SuppressWarnings("rawtypes") - private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { + private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { // verify the required parameter 'number' is set if (number == null) { throw new ApiException("Missing the required parameter 'number' when calling testEndpointParameters(Async)"); @@ -1263,7 +1263,7 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, throw new ApiException("Missing the required parameter '_byte' when calling testEndpointParameters(Async)"); } - return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback); + return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback); } @@ -1274,14 +1274,14 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1292,8 +1292,8 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, 404 User not found - */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -1303,14 +1303,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return ApiResponse<Void> @@ -1322,8 +1322,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat 404 User not found - */ - public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null); + public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null); return localVarApiClient.execute(localVarCall); } @@ -1334,14 +1334,14 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param _callback The callback to be executed when the API call finishes @@ -1354,9 +1354,9 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D 404 User not found - */ - public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback); + okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java index 9f0c736a18235..6fae0a93164e0 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java @@ -58,7 +58,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_INTEGER = "integer"; @SerializedName(SERIALIZED_NAME_INTEGER) - private Integer integer; + private Integer _integer; public static final String SERIALIZED_NAME_INT32 = "int32"; @SerializedName(SERIALIZED_NAME_INT32) @@ -82,7 +82,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_STRING = "string"; @SerializedName(SERIALIZED_NAME_STRING) - private String string; + private String _string; public static final String SERIALIZED_NAME_BYTE = "byte"; @SerializedName(SERIALIZED_NAME_BYTE) @@ -94,15 +94,15 @@ public class FormatTest { public static final String SERIALIZED_NAME_DATE = "date"; @SerializedName(SERIALIZED_NAME_DATE) - private LocalDate date; + private LocalDate _date; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_PASSWORD = "password"; @SerializedName(SERIALIZED_NAME_PASSWORD) @@ -110,31 +110,31 @@ public class FormatTest { public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal"; @SerializedName(SERIALIZED_NAME_BIG_DECIMAL) - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -251,24 +251,24 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -314,66 +314,66 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -398,24 +398,24 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -429,45 +429,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 79f54cca16fad..e86da2b2e6829 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -58,87 +58,87 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -152,23 +152,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md index 98f0b0098b8bf..0d96b99298be9 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md @@ -515,7 +515,7 @@ No authorization required # **testEndpointParameters** -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -546,18 +546,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -577,14 +577,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md index 453c512d61078..4dc8d8b029cf5 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | ## Implemented Interfaces diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md index 67a556da124d5..ca9423c420c44 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | ## Implemented Interfaces diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java index c4f7380e9b8a6..d9dd0f5bd8643 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1049,14 +1049,14 @@ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param _callback Callback for upload/download progress @@ -1069,7 +1069,7 @@ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback 404 User not found - */ - public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1094,8 +1094,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); - if (integer != null) { - localVarFormParams.put("integer", integer); + if (_integer != null) { + localVarFormParams.put("integer", _integer); } if (int32 != null) { @@ -1118,8 +1118,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double localVarFormParams.put("double", _double); } - if (string != null) { - localVarFormParams.put("string", string); + if (_string != null) { + localVarFormParams.put("string", _string); } if (patternWithoutDelimiter != null) { @@ -1134,12 +1134,12 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double localVarFormParams.put("binary", binary); } - if (date != null) { - localVarFormParams.put("date", date); + if (_date != null) { + localVarFormParams.put("date", _date); } - if (dateTime != null) { - localVarFormParams.put("dateTime", dateTime); + if (_dateTime != null) { + localVarFormParams.put("dateTime", _dateTime); } if (password != null) { @@ -1170,7 +1170,7 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double } @SuppressWarnings("rawtypes") - private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { + private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { // verify the required parameter 'number' is set if (number == null) { throw new ApiException("Missing the required parameter 'number' when calling testEndpointParameters(Async)"); @@ -1191,7 +1191,7 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, throw new ApiException("Missing the required parameter '_byte' when calling testEndpointParameters(Async)"); } - return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback); + return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback); } @@ -1202,14 +1202,14 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1220,8 +1220,8 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, 404 User not found - */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -1231,14 +1231,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return ApiResponse<Void> @@ -1250,8 +1250,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat 404 User not found - */ - public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null); + public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null); return localVarApiClient.execute(localVarCall); } @@ -1262,14 +1262,14 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param _callback The callback to be executed when the API call finishes @@ -1282,9 +1282,9 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D 404 User not found - */ - public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback); + okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java index 2aa4ff41826f0..615631bdbe76e 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java @@ -60,7 +60,7 @@ public class FormatTest implements Parcelable { public static final String SERIALIZED_NAME_INTEGER = "integer"; @SerializedName(SERIALIZED_NAME_INTEGER) - private Integer integer; + private Integer _integer; public static final String SERIALIZED_NAME_INT32 = "int32"; @SerializedName(SERIALIZED_NAME_INT32) @@ -84,7 +84,7 @@ public class FormatTest implements Parcelable { public static final String SERIALIZED_NAME_STRING = "string"; @SerializedName(SERIALIZED_NAME_STRING) - private String string; + private String _string; public static final String SERIALIZED_NAME_BYTE = "byte"; @SerializedName(SERIALIZED_NAME_BYTE) @@ -96,15 +96,15 @@ public class FormatTest implements Parcelable { public static final String SERIALIZED_NAME_DATE = "date"; @SerializedName(SERIALIZED_NAME_DATE) - private LocalDate date; + private LocalDate _date; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_PASSWORD = "password"; @SerializedName(SERIALIZED_NAME_PASSWORD) @@ -112,31 +112,31 @@ public class FormatTest implements Parcelable { public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal"; @SerializedName(SERIALIZED_NAME_BIG_DECIMAL) - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -253,24 +253,24 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -316,66 +316,66 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -400,24 +400,24 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -431,45 +431,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } @@ -487,37 +487,37 @@ private String toIndentedString(Object o) { public void writeToParcel(Parcel out, int flags) { - out.writeValue(integer); + out.writeValue(_integer); out.writeValue(int32); out.writeValue(int64); out.writeValue(number); out.writeValue(_float); out.writeValue(_double); - out.writeValue(string); + out.writeValue(_string); out.writeValue(_byte); out.writeValue(binary); - out.writeValue(date); - out.writeValue(dateTime); - out.writeValue(uuid); + out.writeValue(_date); + out.writeValue(_dateTime); + out.writeValue(_uuid); out.writeValue(password); - out.writeValue(bigDecimal); + out.writeValue(_bigDecimal); } FormatTest(Parcel in) { - integer = (Integer)in.readValue(null); + _integer = (Integer)in.readValue(null); int32 = (Integer)in.readValue(null); int64 = (Long)in.readValue(null); number = (BigDecimal)in.readValue(BigDecimal.class.getClassLoader()); _float = (Float)in.readValue(null); _double = (Double)in.readValue(null); - string = (String)in.readValue(null); + _string = (String)in.readValue(null); _byte = (byte[])in.readValue(null); binary = (File)in.readValue(File.class.getClassLoader()); - date = (LocalDate)in.readValue(LocalDate.class.getClassLoader()); - dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader()); - uuid = (UUID)in.readValue(UUID.class.getClassLoader()); + _date = (LocalDate)in.readValue(LocalDate.class.getClassLoader()); + _dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader()); + _uuid = (UUID)in.readValue(UUID.class.getClassLoader()); password = (String)in.readValue(null); - bigDecimal = (BigDecimal)in.readValue(BigDecimal.class.getClassLoader()); + _bigDecimal = (BigDecimal)in.readValue(BigDecimal.class.getClassLoader()); } public int describeContents() { diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index c45274a1b8926..9bc2f028beeef 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -60,87 +60,87 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -154,23 +154,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } @@ -188,15 +188,15 @@ private String toIndentedString(Object o) { public void writeToParcel(Parcel out, int flags) { - out.writeValue(uuid); - out.writeValue(dateTime); - out.writeValue(map); + out.writeValue(_uuid); + out.writeValue(_dateTime); + out.writeValue(_map); } MixedPropertiesAndAdditionalPropertiesClass(Parcel in) { - uuid = (UUID)in.readValue(UUID.class.getClassLoader()); - dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader()); - map = (Map)in.readValue(Animal.class.getClassLoader()); + _uuid = (UUID)in.readValue(UUID.class.getClassLoader()); + _dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader()); + _map = (Map)in.readValue(Animal.class.getClassLoader()); } public int describeContents() { diff --git a/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md index 6cca209c72b1f..6f341075ee6d8 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md @@ -73,7 +73,7 @@ No authorization required # **getParameterArrayNumber** -> getParameterArrayNumber(array) +> getParameterArrayNumber(_array) parameter array number default value @@ -92,9 +92,9 @@ public class Example { defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient); - List array = Arrays.asList(); // List | array integer + List _array = Arrays.asList(); // List | array integer try { - apiInstance.getParameterArrayNumber(array); + apiInstance.getParameterArrayNumber(_array); } catch (ApiException e) { System.err.println("Exception when calling AnotherFakeApi#getParameterArrayNumber"); System.err.println("Status code: " + e.getCode()); @@ -110,7 +110,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **array** | [**List<Integer>**](Integer.md)| array integer | | +| **_array** | [**List<Integer>**](Integer.md)| array integer | | ### Return type diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md index bbfe7c1b97e98..289013689abea 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md @@ -632,7 +632,7 @@ No authorization required # **testEndpointParameters** -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -663,18 +663,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -694,14 +694,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/okhttp-gson/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/okhttp-gson/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md index 71790022c16df..19a7adb36882f 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md +++ b/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**uuidWithDefault** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/okhttp-gson/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/okhttp-gson/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index f7529bc747645..f41b6748e829c 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -198,7 +198,7 @@ public okhttp3.Call call123testSpecialTagsAsync(Client client, final ApiCallback } /** * Build call for getParameterArrayNumber - * @param array array integer (required) + * @param _array array integer (required) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -208,7 +208,7 @@ public okhttp3.Call call123testSpecialTagsAsync(Client client, final ApiCallback 200 OK - */ - public okhttp3.Call getParameterArrayNumberCall(List array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getParameterArrayNumberCall(List _array, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -233,8 +233,8 @@ public okhttp3.Call getParameterArrayNumberCall(List array, final ApiCa Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); - if (array != null) { - localVarHeaderParams.put("array", localVarApiClient.parameterToString(array)); + if (_array != null) { + localVarHeaderParams.put("array", localVarApiClient.parameterToString(_array)); } final String[] localVarAccepts = { @@ -256,20 +256,20 @@ public okhttp3.Call getParameterArrayNumberCall(List array, final ApiCa } @SuppressWarnings("rawtypes") - private okhttp3.Call getParameterArrayNumberValidateBeforeCall(List array, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'array' is set - if (array == null) { - throw new ApiException("Missing the required parameter 'array' when calling getParameterArrayNumber(Async)"); + private okhttp3.Call getParameterArrayNumberValidateBeforeCall(List _array, final ApiCallback _callback) throws ApiException { + // verify the required parameter '_array' is set + if (_array == null) { + throw new ApiException("Missing the required parameter '_array' when calling getParameterArrayNumber(Async)"); } - return getParameterArrayNumberCall(array, _callback); + return getParameterArrayNumberCall(_array, _callback); } /** * parameter array number default value * - * @param array array integer (required) + * @param _array array integer (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -277,14 +277,14 @@ private okhttp3.Call getParameterArrayNumberValidateBeforeCall(List arr
    200 OK -
    */ - public void getParameterArrayNumber(List array) throws ApiException { - getParameterArrayNumberWithHttpInfo(array); + public void getParameterArrayNumber(List _array) throws ApiException { + getParameterArrayNumberWithHttpInfo(_array); } /** * parameter array number default value * - * @param array array integer (required) + * @param _array array integer (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -293,15 +293,15 @@ public void getParameterArrayNumber(List array) throws ApiException { 200 OK - */ - public ApiResponse getParameterArrayNumberWithHttpInfo(List array) throws ApiException { - okhttp3.Call localVarCall = getParameterArrayNumberValidateBeforeCall(array, null); + public ApiResponse getParameterArrayNumberWithHttpInfo(List _array) throws ApiException { + okhttp3.Call localVarCall = getParameterArrayNumberValidateBeforeCall(_array, null); return localVarApiClient.execute(localVarCall); } /** * parameter array number default value (asynchronously) * - * @param array array integer (required) + * @param _array array integer (required) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -311,9 +311,9 @@ public ApiResponse getParameterArrayNumberWithHttpInfo(List array 200 OK - */ - public okhttp3.Call getParameterArrayNumberAsync(List array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getParameterArrayNumberAsync(List _array, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getParameterArrayNumberValidateBeforeCall(array, _callback); + okhttp3.Call localVarCall = getParameterArrayNumberValidateBeforeCall(_array, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index 3f048ddf6a25d..5b3c622c69bd1 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1305,14 +1305,14 @@ public okhttp3.Call testClientModelAsync(Client client, final ApiCallback 404 User not found - */ - public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1350,8 +1350,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); - if (integer != null) { - localVarFormParams.put("integer", integer); + if (_integer != null) { + localVarFormParams.put("integer", _integer); } if (int32 != null) { @@ -1374,8 +1374,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double localVarFormParams.put("double", _double); } - if (string != null) { - localVarFormParams.put("string", string); + if (_string != null) { + localVarFormParams.put("string", _string); } if (patternWithoutDelimiter != null) { @@ -1390,12 +1390,12 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double localVarFormParams.put("binary", binary); } - if (date != null) { - localVarFormParams.put("date", date); + if (_date != null) { + localVarFormParams.put("date", _date); } - if (dateTime != null) { - localVarFormParams.put("dateTime", dateTime); + if (_dateTime != null) { + localVarFormParams.put("dateTime", _dateTime); } if (password != null) { @@ -1426,7 +1426,7 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double } @SuppressWarnings("rawtypes") - private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { + private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { // verify the required parameter 'number' is set if (number == null) { throw new ApiException("Missing the required parameter 'number' when calling testEndpointParameters(Async)"); @@ -1447,7 +1447,7 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, throw new ApiException("Missing the required parameter '_byte' when calling testEndpointParameters(Async)"); } - return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback); + return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback); } @@ -1458,14 +1458,14 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1476,8 +1476,8 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, 404 User not found - */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -1487,14 +1487,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @return ApiResponse<Void> @@ -1506,8 +1506,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat 404 User not found - */ - public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null); + public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null); return localVarApiClient.execute(localVarCall); } @@ -1518,14 +1518,14 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @param _callback The callback to be executed when the API call finishes @@ -1538,9 +1538,9 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D 404 User not found - */ - public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback); + okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 3184c14874df4..dc25dad7223ea 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -54,29 +54,29 @@ public class FooGetDefaultResponse { public static final String SERIALIZED_NAME_STRING = "string"; @SerializedName(SERIALIZED_NAME_STRING) - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable public Foo getString() { - return string; + return _string; } - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } /** @@ -134,20 +134,20 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string)&& + return Objects.equals(this._string, fooGetDefaultResponse._string)&& Objects.equals(this.additionalProperties, fooGetDefaultResponse.additionalProperties); } @Override public int hashCode() { - return Objects.hash(string, additionalProperties); + return Objects.hash(_string, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java index 042d0f6b89b1d..53bbc38a8b154 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java @@ -58,7 +58,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_INTEGER = "integer"; @SerializedName(SERIALIZED_NAME_INTEGER) - private Integer integer; + private Integer _integer; public static final String SERIALIZED_NAME_INT32 = "int32"; @SerializedName(SERIALIZED_NAME_INT32) @@ -86,7 +86,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_STRING = "string"; @SerializedName(SERIALIZED_NAME_STRING) - private String string; + private String _string; public static final String SERIALIZED_NAME_BYTE = "byte"; @SerializedName(SERIALIZED_NAME_BYTE) @@ -98,15 +98,15 @@ public class FormatTest { public static final String SERIALIZED_NAME_DATE = "date"; @SerializedName(SERIALIZED_NAME_DATE) - private LocalDate date; + private LocalDate _date; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_UUID_WITH_DEFAULT = "uuid_with_default"; @SerializedName(SERIALIZED_NAME_UUID_WITH_DEFAULT) @@ -127,26 +127,26 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -284,24 +284,24 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -347,66 +347,66 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -548,19 +548,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.uuidWithDefault, formatTest.uuidWithDefault) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && @@ -570,26 +570,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, uuidWithDefault, password, patternWithDigits, patternWithDigitsAndDelimiter, additionalProperties); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, uuidWithDefault, password, patternWithDigits, patternWithDigitsAndDelimiter, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" uuidWithDefault: ").append(toIndentedString(uuidWithDefault)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index ae108748e6264..6ecbc7c1ec97c 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -58,87 +58,87 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } /** @@ -196,24 +196,24 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map)&& + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map)&& Objects.equals(this.additionalProperties, mixedPropertiesAndAdditionalPropertiesClass.additionalProperties); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map, additionalProperties); + return Objects.hash(_uuid, _dateTime, _map, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 5e68500199483..97f14fb0a80ed 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -57,7 +57,7 @@ public class ObjectWithDeprecatedFields { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private String uuid; + private String _uuid; public static final String SERIALIZED_NAME_ID = "id"; @Deprecated @@ -77,24 +77,24 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public String getUuid() { - return uuid; + return _uuid; } - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -235,7 +235,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars)&& @@ -244,14 +244,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars, additionalProperties); + return Objects.hash(_uuid, id, deprecatedRef, bars, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/FakeApi.md b/samples/client/petstore/java/rest-assured-jackson/docs/FakeApi.md index 969883dc51400..388bb5bb6809c 100644 --- a/samples/client/petstore/java/rest-assured-jackson/docs/FakeApi.md +++ b/samples/client/petstore/java/rest-assured-jackson/docs/FakeApi.md @@ -354,7 +354,7 @@ No authorization required # **testEndpointParameters** -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -386,14 +386,14 @@ api.testEndpointParameters() | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md b/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md index 9c68c3080e13e..7e401945c3bc7 100644 --- a/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md +++ b/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java index 47e5b6b62cdd8..011e7e806fb98 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -710,14 +710,14 @@ public TestClientModelOper respSpec(Consumer respSpecCustom * @see #_doubleForm None (required) * @see #patternWithoutDelimiterForm None (required) * @see #_byteForm None (required) - * @see #integerForm None (optional) + * @see #_integerForm None (optional) * @see #int32Form None (optional) * @see #int64Form None (optional) * @see #_floatForm None (optional) - * @see #stringForm None (optional) + * @see #_stringForm None (optional) * @see #binaryMultiPart None (optional) - * @see #dateForm None (optional) - * @see #dateTimeForm None (optional) + * @see #_dateForm None (optional) + * @see #_dateTimeForm None (optional) * @see #passwordForm None (optional) * @see #paramCallbackForm None (optional) */ @@ -747,14 +747,14 @@ public T execute(Function handler) { return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI)); } - public static final String INTEGER_FORM = "integer"; + public static final String _INTEGER_FORM = "integer"; /** - * @param integer (Integer) None (optional) + * @param _integer (Integer) None (optional) * @return operation */ - public TestEndpointParametersOper integerForm(Object... integer) { - reqSpec.addFormParam(INTEGER_FORM, integer); + public TestEndpointParametersOper _integerForm(Object... _integer) { + reqSpec.addFormParam(_INTEGER_FORM, _integer); return this; } @@ -813,14 +813,14 @@ public TestEndpointParametersOper _doubleForm(Object... _double) { return this; } - public static final String STRING_FORM = "string"; + public static final String _STRING_FORM = "string"; /** - * @param string (String) None (optional) + * @param _string (String) None (optional) * @return operation */ - public TestEndpointParametersOper stringForm(Object... string) { - reqSpec.addFormParam(STRING_FORM, string); + public TestEndpointParametersOper _stringForm(Object... _string) { + reqSpec.addFormParam(_STRING_FORM, _string); return this; } @@ -846,25 +846,25 @@ public TestEndpointParametersOper _byteForm(Object... _byte) { return this; } - public static final String DATE_FORM = "date"; + public static final String _DATE_FORM = "date"; /** - * @param date (LocalDate) None (optional) + * @param _date (LocalDate) None (optional) * @return operation */ - public TestEndpointParametersOper dateForm(Object... date) { - reqSpec.addFormParam(DATE_FORM, date); + public TestEndpointParametersOper _dateForm(Object... _date) { + reqSpec.addFormParam(_DATE_FORM, _date); return this; } - public static final String DATE_TIME_FORM = "dateTime"; + public static final String _DATE_TIME_FORM = "dateTime"; /** - * @param dateTime (OffsetDateTime) None (optional) + * @param _dateTime (OffsetDateTime) None (optional) * @return operation */ - public TestEndpointParametersOper dateTimeForm(Object... dateTime) { - reqSpec.addFormParam(DATE_TIME_FORM, dateTime); + public TestEndpointParametersOper _dateTimeForm(Object... _dateTime) { + reqSpec.addFormParam(_DATE_TIME_FORM, _dateTime); return this; } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java index 24c613991cf17..513b0c888c2ce 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java @@ -54,7 +54,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -72,7 +72,7 @@ public class FormatTest { private Double _double; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -81,34 +81,34 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @Min(10) @Max(100) @@ -116,14 +116,14 @@ public FormatTest integer(Integer integer) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -272,15 +272,15 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @Pattern(regexp="/[a-z]/i") @@ -288,14 +288,14 @@ public FormatTest string(String string) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -355,15 +355,15 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @NotNull @@ -373,26 +373,26 @@ public FormatTest date(LocalDate date) { @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @Valid @@ -401,26 +401,26 @@ public FormatTest dateTime(OffsetDateTime dateTime) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @Valid @@ -429,14 +429,14 @@ public FormatTest uuid(UUID uuid) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -468,15 +468,15 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable @Valid @@ -485,14 +485,14 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -504,45 +504,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index b3e2bf0b0d333..1ba6fe80f1bc2 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -42,26 +42,26 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @Valid @@ -70,26 +70,26 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @Valid @@ -98,34 +98,34 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @Valid @@ -134,14 +134,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -153,23 +153,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/rest-assured/docs/FakeApi.md b/samples/client/petstore/java/rest-assured/docs/FakeApi.md index 969883dc51400..388bb5bb6809c 100644 --- a/samples/client/petstore/java/rest-assured/docs/FakeApi.md +++ b/samples/client/petstore/java/rest-assured/docs/FakeApi.md @@ -354,7 +354,7 @@ No authorization required # **testEndpointParameters** -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -386,14 +386,14 @@ api.testEndpointParameters() | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/rest-assured/docs/FormatTest.md b/samples/client/petstore/java/rest-assured/docs/FormatTest.md index 9c68c3080e13e..7e401945c3bc7 100644 --- a/samples/client/petstore/java/rest-assured/docs/FormatTest.md +++ b/samples/client/petstore/java/rest-assured/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java index 850217b7edc11..9c7bd5c805e98 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java @@ -711,14 +711,14 @@ public TestClientModelOper respSpec(Consumer respSpecCustom * @see #_doubleForm None (required) * @see #patternWithoutDelimiterForm None (required) * @see #_byteForm None (required) - * @see #integerForm None (optional) + * @see #_integerForm None (optional) * @see #int32Form None (optional) * @see #int64Form None (optional) * @see #_floatForm None (optional) - * @see #stringForm None (optional) + * @see #_stringForm None (optional) * @see #binaryMultiPart None (optional) - * @see #dateForm None (optional) - * @see #dateTimeForm None (optional) + * @see #_dateForm None (optional) + * @see #_dateTimeForm None (optional) * @see #passwordForm None (optional) * @see #paramCallbackForm None (optional) */ @@ -748,14 +748,14 @@ public T execute(Function handler) { return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI)); } - public static final String INTEGER_FORM = "integer"; + public static final String _INTEGER_FORM = "integer"; /** - * @param integer (Integer) None (optional) + * @param _integer (Integer) None (optional) * @return operation */ - public TestEndpointParametersOper integerForm(Object... integer) { - reqSpec.addFormParam(INTEGER_FORM, integer); + public TestEndpointParametersOper _integerForm(Object... _integer) { + reqSpec.addFormParam(_INTEGER_FORM, _integer); return this; } @@ -814,14 +814,14 @@ public TestEndpointParametersOper _doubleForm(Object... _double) { return this; } - public static final String STRING_FORM = "string"; + public static final String _STRING_FORM = "string"; /** - * @param string (String) None (optional) + * @param _string (String) None (optional) * @return operation */ - public TestEndpointParametersOper stringForm(Object... string) { - reqSpec.addFormParam(STRING_FORM, string); + public TestEndpointParametersOper _stringForm(Object... _string) { + reqSpec.addFormParam(_STRING_FORM, _string); return this; } @@ -847,25 +847,25 @@ public TestEndpointParametersOper _byteForm(Object... _byte) { return this; } - public static final String DATE_FORM = "date"; + public static final String _DATE_FORM = "date"; /** - * @param date (LocalDate) None (optional) + * @param _date (LocalDate) None (optional) * @return operation */ - public TestEndpointParametersOper dateForm(Object... date) { - reqSpec.addFormParam(DATE_FORM, date); + public TestEndpointParametersOper _dateForm(Object... _date) { + reqSpec.addFormParam(_DATE_FORM, _date); return this; } - public static final String DATE_TIME_FORM = "dateTime"; + public static final String _DATE_TIME_FORM = "dateTime"; /** - * @param dateTime (OffsetDateTime) None (optional) + * @param _dateTime (OffsetDateTime) None (optional) * @return operation */ - public TestEndpointParametersOper dateTimeForm(Object... dateTime) { - reqSpec.addFormParam(DATE_TIME_FORM, dateTime); + public TestEndpointParametersOper _dateTimeForm(Object... _dateTime) { + reqSpec.addFormParam(_DATE_TIME_FORM, _dateTime); return this; } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java index 595f75f15ced1..377602e5ca304 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java @@ -37,7 +37,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_INTEGER = "integer"; @SerializedName(SERIALIZED_NAME_INTEGER) - private Integer integer; + private Integer _integer; public static final String SERIALIZED_NAME_INT32 = "int32"; @SerializedName(SERIALIZED_NAME_INT32) @@ -61,7 +61,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_STRING = "string"; @SerializedName(SERIALIZED_NAME_STRING) - private String string; + private String _string; public static final String SERIALIZED_NAME_BYTE = "byte"; @SerializedName(SERIALIZED_NAME_BYTE) @@ -73,15 +73,15 @@ public class FormatTest { public static final String SERIALIZED_NAME_DATE = "date"; @SerializedName(SERIALIZED_NAME_DATE) - private LocalDate date; + private LocalDate _date; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_PASSWORD = "password"; @SerializedName(SERIALIZED_NAME_PASSWORD) @@ -89,33 +89,33 @@ public class FormatTest { public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal"; @SerializedName(SERIALIZED_NAME_BIG_DECIMAL) - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -244,26 +244,26 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -315,15 +315,15 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @NotNull @@ -331,60 +331,60 @@ public FormatTest date(LocalDate date) { public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @Valid public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @Valid public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -412,27 +412,27 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable @Valid public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -444,45 +444,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 04a283f59693d..1b7eb5e39b07a 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,96 +37,96 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @Valid public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @Valid public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @Valid public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -138,23 +138,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resteasy/docs/FakeApi.md b/samples/client/petstore/java/resteasy/docs/FakeApi.md index e442af92c3b70..ce1d1164b38fd 100644 --- a/samples/client/petstore/java/resteasy/docs/FakeApi.md +++ b/samples/client/petstore/java/resteasy/docs/FakeApi.md @@ -811,7 +811,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -843,18 +843,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -875,14 +875,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/resteasy/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/resteasy/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/resteasy/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/resteasy/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/resteasy/docs/FormatTest.md b/samples/client/petstore/java/resteasy/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/resteasy/docs/FormatTest.md +++ b/samples/client/petstore/java/resteasy/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/resteasy/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/resteasy/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/resteasy/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/resteasy/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java index f9093377f76e8..e0e24cd20ee64 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java @@ -547,19 +547,19 @@ public Client testClientModel(Client client) throws ApiException { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException if fails to make API call */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'number' is set @@ -594,8 +594,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat - if (integer != null) - localVarFormParams.put("integer", integer); + if (_integer != null) + localVarFormParams.put("integer", _integer); if (int32 != null) localVarFormParams.put("int32", int32); if (int64 != null) @@ -606,18 +606,18 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat localVarFormParams.put("float", _float); if (_double != null) localVarFormParams.put("double", _double); -if (string != null) - localVarFormParams.put("string", string); +if (_string != null) + localVarFormParams.put("string", _string); if (patternWithoutDelimiter != null) localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); if (_byte != null) localVarFormParams.put("byte", _byte); if (binary != null) localVarFormParams.put("binary", binary); -if (date != null) - localVarFormParams.put("date", date); -if (dateTime != null) - localVarFormParams.put("dateTime", dateTime); +if (_date != null) + localVarFormParams.put("date", _date); +if (_dateTime != null) + localVarFormParams.put("dateTime", _dateTime); if (password != null) localVarFormParams.put("password", password); if (paramCallback != null) diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 0626a5810e642..18e3120cfd111 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -34,34 +34,34 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @Override @@ -73,19 +73,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java index 1efd4270dd5d1..1f7bd87b32f60 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java @@ -53,7 +53,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -74,7 +74,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -83,13 +83,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -103,31 +103,31 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -295,29 +295,29 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -373,81 +373,81 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -537,19 +537,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -557,26 +557,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index ad65e2d8fc5ae..3ef779ef8bcd2 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,100 +39,100 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -144,23 +144,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 1a3e502685bca..f69f168101d24 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -180,7 +180,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -188,14 +188,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md index e442af92c3b70..ce1d1164b38fd 100644 --- a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md +++ b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md @@ -811,7 +811,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -843,18 +843,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -875,14 +875,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/resttemplate-withXml/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/resttemplate-withXml/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/resttemplate-withXml/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md b/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md +++ b/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/resttemplate-withXml/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/resttemplate-withXml/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/resttemplate-withXml/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index c816078d24802..d7628b1d18ca5 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -614,20 +614,20 @@ public ResponseEntity testClientModelWithHttpInfo(Client client) throws * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @throws RestClientException if an error occurs while attempting to invoke the API */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -639,20 +639,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return ResponseEntity<Void> * @throws RestClientException if an error occurs while attempting to invoke the API */ - public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException { + public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientException { Object localVarPostBody = null; // verify the required parameter 'number' is set @@ -681,8 +681,8 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); - if (integer != null) - localVarFormParams.add("integer", integer); + if (_integer != null) + localVarFormParams.add("integer", _integer); if (int32 != null) localVarFormParams.add("int32", int32); if (int64 != null) @@ -693,18 +693,18 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number localVarFormParams.add("float", _float); if (_double != null) localVarFormParams.add("double", _double); - if (string != null) - localVarFormParams.add("string", string); + if (_string != null) + localVarFormParams.add("string", _string); if (patternWithoutDelimiter != null) localVarFormParams.add("pattern_without_delimiter", patternWithoutDelimiter); if (_byte != null) localVarFormParams.add("byte", _byte); if (binary != null) localVarFormParams.add("binary", new FileSystemResource(binary)); - if (date != null) - localVarFormParams.add("date", date); - if (dateTime != null) - localVarFormParams.add("dateTime", dateTime); + if (_date != null) + localVarFormParams.add("date", _date); + if (_dateTime != null) + localVarFormParams.add("dateTime", _dateTime); if (password != null) localVarFormParams.add("password", password); if (paramCallback != null) diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 104302827b069..ab86f77d367e8 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -42,20 +42,20 @@ public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; @XmlElement(name = "string") - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @@ -63,15 +63,15 @@ public FooGetDefaultResponse string(Foo string) { @JacksonXmlProperty(localName = "string") public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JacksonXmlProperty(localName = "string") - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @Override @@ -83,19 +83,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java index 8caa237960928..4dbbdb4e18fc5 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java @@ -61,7 +61,7 @@ public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; @XmlElement(name = "integer") - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; @XmlElement(name = "int32") @@ -89,7 +89,7 @@ public class FormatTest { public static final String JSON_PROPERTY_STRING = "string"; @XmlElement(name = "string") - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; @XmlElement(name = "byte") @@ -101,16 +101,16 @@ public class FormatTest { public static final String JSON_PROPERTY_DATE = "date"; @XmlElement(name = "date") - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @XmlElement(name = "dateTime") @XmlJavaTypeAdapter(OffsetDateTimeXmlAdapter.class) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; @XmlElement(name = "uuid") - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; @XmlElement(name = "password") @@ -127,17 +127,17 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @@ -145,15 +145,15 @@ public FormatTest integer(Integer integer) { @JacksonXmlProperty(localName = "integer") public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JacksonXmlProperty(localName = "integer") - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -333,15 +333,15 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @@ -349,15 +349,15 @@ public FormatTest string(String string) { @JacksonXmlProperty(localName = "string") public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JacksonXmlProperty(localName = "string") - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -417,15 +417,15 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @@ -433,27 +433,27 @@ public FormatTest date(LocalDate date) { @JacksonXmlProperty(localName = "date") public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @JacksonXmlProperty(localName = "date") - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @@ -461,27 +461,27 @@ public FormatTest dateTime(OffsetDateTime dateTime) { @JacksonXmlProperty(localName = "dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JacksonXmlProperty(localName = "dateTime") - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @@ -489,15 +489,15 @@ public FormatTest uuid(UUID uuid) { @JacksonXmlProperty(localName = "uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JacksonXmlProperty(localName = "uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -593,19 +593,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -613,26 +613,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index a655282974cc5..9c9a9eb3924c6 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,32 +47,32 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; @XmlElement(name = "uuid") - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @XmlElement(name = "dateTime") @XmlJavaTypeAdapter(OffsetDateTimeXmlAdapter.class) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=Animal @XmlElement(name = "inner") - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @@ -80,27 +80,27 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @JacksonXmlProperty(localName = "uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JacksonXmlProperty(localName = "uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @@ -108,35 +108,35 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT @JacksonXmlProperty(localName = "dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JacksonXmlProperty(localName = "dateTime") - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @@ -145,7 +145,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal @JacksonXmlElementWrapper(useWrapping = false) public Map getMap() { - return map; + return _map; } @@ -153,8 +153,8 @@ public Map getMap() { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JacksonXmlProperty(localName = "map") @JacksonXmlElementWrapper(useWrapping = false) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -166,23 +166,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index c2fc96f52f254..929beb4edf1d5 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -48,7 +48,7 @@ public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; @XmlElement(name = "uuid") - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; @XmlElement(name = "id") @@ -68,15 +68,15 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @@ -84,15 +84,15 @@ public ObjectWithDeprecatedFields uuid(String uuid) { @JacksonXmlProperty(localName = "uuid") public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @JacksonXmlProperty(localName = "uuid") - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -204,7 +204,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -212,14 +212,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/resttemplate/docs/FakeApi.md b/samples/client/petstore/java/resttemplate/docs/FakeApi.md index e442af92c3b70..ce1d1164b38fd 100644 --- a/samples/client/petstore/java/resttemplate/docs/FakeApi.md +++ b/samples/client/petstore/java/resttemplate/docs/FakeApi.md @@ -811,7 +811,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -843,18 +843,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -875,14 +875,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/resttemplate/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/resttemplate/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/resttemplate/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/resttemplate/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/resttemplate/docs/FormatTest.md b/samples/client/petstore/java/resttemplate/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/resttemplate/docs/FormatTest.md +++ b/samples/client/petstore/java/resttemplate/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/resttemplate/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/resttemplate/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/resttemplate/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/resttemplate/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index c816078d24802..d7628b1d18ca5 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -614,20 +614,20 @@ public ResponseEntity testClientModelWithHttpInfo(Client client) throws * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @throws RestClientException if an error occurs while attempting to invoke the API */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -639,20 +639,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return ResponseEntity<Void> * @throws RestClientException if an error occurs while attempting to invoke the API */ - public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException { + public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientException { Object localVarPostBody = null; // verify the required parameter 'number' is set @@ -681,8 +681,8 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); - if (integer != null) - localVarFormParams.add("integer", integer); + if (_integer != null) + localVarFormParams.add("integer", _integer); if (int32 != null) localVarFormParams.add("int32", int32); if (int64 != null) @@ -693,18 +693,18 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number localVarFormParams.add("float", _float); if (_double != null) localVarFormParams.add("double", _double); - if (string != null) - localVarFormParams.add("string", string); + if (_string != null) + localVarFormParams.add("string", _string); if (patternWithoutDelimiter != null) localVarFormParams.add("pattern_without_delimiter", patternWithoutDelimiter); if (_byte != null) localVarFormParams.add("byte", _byte); if (binary != null) localVarFormParams.add("binary", new FileSystemResource(binary)); - if (date != null) - localVarFormParams.add("date", date); - if (dateTime != null) - localVarFormParams.add("dateTime", dateTime); + if (_date != null) + localVarFormParams.add("date", _date); + if (_dateTime != null) + localVarFormParams.add("dateTime", _dateTime); if (password != null) localVarFormParams.add("password", password); if (paramCallback != null) diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 0626a5810e642..18e3120cfd111 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -34,34 +34,34 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @Override @@ -73,19 +73,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java index 1efd4270dd5d1..1f7bd87b32f60 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java @@ -53,7 +53,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -74,7 +74,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -83,13 +83,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -103,31 +103,31 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -295,29 +295,29 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -373,81 +373,81 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -537,19 +537,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -557,26 +557,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e90966d864854..86cf76cb59115 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,100 +39,100 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map; + private Map _map; public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -144,23 +144,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 1a3e502685bca..f69f168101d24 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -180,7 +180,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -188,14 +188,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md b/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md index 5722d2acb576f..36ce94a6faea8 100644 --- a/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md @@ -548,7 +548,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -580,18 +580,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -612,14 +612,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md b/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md index 9c68c3080e13e..7e401945c3bc7 100644 --- a/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md +++ b/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java index 6279aae50c8ba..449beda3d982c 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java @@ -136,14 +136,14 @@ CompletionStage> testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Call<Void> @@ -151,7 +151,7 @@ CompletionStage> testClientModel( @retrofit2.http.FormUrlEncoded @POST("fake") CompletionStage> testEndpointParameters( - @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback + @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer _integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String _string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate _date, @retrofit2.http.Field("dateTime") OffsetDateTime _dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback ); /** diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java index 2b21678a0f3a5..f5ecedb865b05 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java @@ -53,7 +53,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -71,7 +71,7 @@ public class FormatTest { private Double _double; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -80,34 +80,34 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @Min(10) @Max(100) @@ -115,14 +115,14 @@ public FormatTest integer(Integer integer) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -271,15 +271,15 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @Pattern(regexp="/[a-z]/i") @@ -287,14 +287,14 @@ public FormatTest string(String string) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -354,15 +354,15 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @NotNull @@ -372,26 +372,26 @@ public FormatTest date(LocalDate date) { @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @Valid @@ -400,26 +400,26 @@ public FormatTest dateTime(OffsetDateTime dateTime) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @Valid @@ -428,14 +428,14 @@ public FormatTest uuid(UUID uuid) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -467,15 +467,15 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable @Valid @@ -484,14 +484,14 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -503,45 +503,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 5c07ddce048fe..5ce50359b74e5 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -41,26 +41,26 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @Valid @@ -69,26 +69,26 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @Valid @@ -97,34 +97,34 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @Valid @@ -133,14 +133,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -152,23 +152,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/retrofit2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2/docs/FakeApi.md index 5722d2acb576f..36ce94a6faea8 100644 --- a/samples/client/petstore/java/retrofit2/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2/docs/FakeApi.md @@ -548,7 +548,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -580,18 +580,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -612,14 +612,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/retrofit2/docs/FormatTest.md b/samples/client/petstore/java/retrofit2/docs/FormatTest.md index 9c68c3080e13e..7e401945c3bc7 100644 --- a/samples/client/petstore/java/retrofit2/docs/FormatTest.md +++ b/samples/client/petstore/java/retrofit2/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java index e00e4eb6812ee..c36a9a65fae6f 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -134,14 +134,14 @@ Call testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Call<Void> @@ -149,7 +149,7 @@ Call testClientModel( @retrofit2.http.FormUrlEncoded @POST("fake") Call testEndpointParameters( - @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback + @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer _integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String _string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate _date, @retrofit2.http.Field("dateTime") OffsetDateTime _dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback ); /** diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java index 4a67a31ec94e4..2ca1e911ac673 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java @@ -34,7 +34,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_INTEGER = "integer"; @SerializedName(SERIALIZED_NAME_INTEGER) - private Integer integer; + private Integer _integer; public static final String SERIALIZED_NAME_INT32 = "int32"; @SerializedName(SERIALIZED_NAME_INT32) @@ -58,7 +58,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_STRING = "string"; @SerializedName(SERIALIZED_NAME_STRING) - private String string; + private String _string; public static final String SERIALIZED_NAME_BYTE = "byte"; @SerializedName(SERIALIZED_NAME_BYTE) @@ -70,15 +70,15 @@ public class FormatTest { public static final String SERIALIZED_NAME_DATE = "date"; @SerializedName(SERIALIZED_NAME_DATE) - private LocalDate date; + private LocalDate _date; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_PASSWORD = "password"; @SerializedName(SERIALIZED_NAME_PASSWORD) @@ -86,32 +86,32 @@ public class FormatTest { public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal"; @SerializedName(SERIALIZED_NAME_BIG_DECIMAL) - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -233,25 +233,25 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -299,69 +299,69 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -387,25 +387,25 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -417,45 +417,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 32e2475348171..ddba0ee176992 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -34,90 +34,90 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -129,23 +129,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md index 5722d2acb576f..36ce94a6faea8 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md @@ -548,7 +548,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -580,18 +580,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -612,14 +612,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md index 9c68c3080e13e..7e401945c3bc7 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java index 6347d08144f28..bb2356896a100 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -135,14 +135,14 @@ Observable testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Completable @@ -150,7 +150,7 @@ Observable testClientModel( @retrofit2.http.FormUrlEncoded @POST("fake") Completable testEndpointParameters( - @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback + @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer _integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String _string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate _date, @retrofit2.http.Field("dateTime") OffsetDateTime _dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback ); /** diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java index 4a67a31ec94e4..2ca1e911ac673 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java @@ -34,7 +34,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_INTEGER = "integer"; @SerializedName(SERIALIZED_NAME_INTEGER) - private Integer integer; + private Integer _integer; public static final String SERIALIZED_NAME_INT32 = "int32"; @SerializedName(SERIALIZED_NAME_INT32) @@ -58,7 +58,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_STRING = "string"; @SerializedName(SERIALIZED_NAME_STRING) - private String string; + private String _string; public static final String SERIALIZED_NAME_BYTE = "byte"; @SerializedName(SERIALIZED_NAME_BYTE) @@ -70,15 +70,15 @@ public class FormatTest { public static final String SERIALIZED_NAME_DATE = "date"; @SerializedName(SERIALIZED_NAME_DATE) - private LocalDate date; + private LocalDate _date; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_PASSWORD = "password"; @SerializedName(SERIALIZED_NAME_PASSWORD) @@ -86,32 +86,32 @@ public class FormatTest { public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal"; @SerializedName(SERIALIZED_NAME_BIG_DECIMAL) - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -233,25 +233,25 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -299,69 +299,69 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -387,25 +387,25 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -417,45 +417,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 32e2475348171..ddba0ee176992 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -34,90 +34,90 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -129,23 +129,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md index 5722d2acb576f..36ce94a6faea8 100644 --- a/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md @@ -548,7 +548,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -580,18 +580,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -612,14 +612,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md index 9c68c3080e13e..7e401945c3bc7 100644 --- a/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md +++ b/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java index 0cabd8162440f..bca2081af477a 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java @@ -135,14 +135,14 @@ Observable testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Completable @@ -150,7 +150,7 @@ Observable testClientModel( @retrofit2.http.FormUrlEncoded @POST("fake") Completable testEndpointParameters( - @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback + @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer _integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String _string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate _date, @retrofit2.http.Field("dateTime") OffsetDateTime _dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback ); /** diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java index 4a67a31ec94e4..2ca1e911ac673 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java @@ -34,7 +34,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_INTEGER = "integer"; @SerializedName(SERIALIZED_NAME_INTEGER) - private Integer integer; + private Integer _integer; public static final String SERIALIZED_NAME_INT32 = "int32"; @SerializedName(SERIALIZED_NAME_INT32) @@ -58,7 +58,7 @@ public class FormatTest { public static final String SERIALIZED_NAME_STRING = "string"; @SerializedName(SERIALIZED_NAME_STRING) - private String string; + private String _string; public static final String SERIALIZED_NAME_BYTE = "byte"; @SerializedName(SERIALIZED_NAME_BYTE) @@ -70,15 +70,15 @@ public class FormatTest { public static final String SERIALIZED_NAME_DATE = "date"; @SerializedName(SERIALIZED_NAME_DATE) - private LocalDate date; + private LocalDate _date; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_PASSWORD = "password"; @SerializedName(SERIALIZED_NAME_PASSWORD) @@ -86,32 +86,32 @@ public class FormatTest { public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal"; @SerializedName(SERIALIZED_NAME_BIG_DECIMAL) - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -233,25 +233,25 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -299,69 +299,69 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -387,25 +387,25 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -417,45 +417,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 32e2475348171..ddba0ee176992 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -34,90 +34,90 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) - private UUID uuid; + private UUID _uuid; public static final String SERIALIZED_NAME_DATE_TIME = "dateTime"; @SerializedName(SERIALIZED_NAME_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -129,23 +129,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md b/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md index efb255c14f267..a1c99f071dced 100644 --- a/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md +++ b/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md @@ -548,7 +548,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -580,18 +580,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None AsyncFile binary = new AsyncFile(); // AsyncFile | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -612,14 +612,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **AsyncFile**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md b/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md index dd441705a182b..586bac60b79e4 100644 --- a/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md +++ b/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md @@ -7,20 +7,20 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **AsyncFile** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | -|**bigDecimal** | **BigDecimal** | | [optional] | +|**_bigDecimal** | **BigDecimal** | | [optional] | diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java index 2a30781bdad8f..767e2c21d7455 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java @@ -50,9 +50,9 @@ public interface FakeApi { void testClientModel(Client body, ApiClient.AuthInfo authInfo, Handler> handler); - void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler> handler); + void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler> handler); - void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> handler); + void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> handler); void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Handler> handler); diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApiImpl.java index 4383f3537d59d..b2f7c68ab9a95 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -424,20 +424,20 @@ public void testClientModel(Client body, ApiClient.AuthInfo authInfo, Handler> resultHandler) { - testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null, resultHandler); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler> resultHandler) { + testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null, resultHandler); } /** @@ -447,20 +447,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param authInfo per call authentication override. * @param resultHandler Asynchronous result handler */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> resultHandler) { + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> resultHandler) { Object localVarBody = null; // verify the required parameter 'number' is set @@ -502,18 +502,18 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat // form params // TODO: sending files within multipart/form-data is not supported yet (because of vertx web-client) Map localVarFormParams = new HashMap<>(); - if (integer != null) localVarFormParams.put("integer", integer); + if (_integer != null) localVarFormParams.put("integer", _integer); if (int32 != null) localVarFormParams.put("int32", int32); if (int64 != null) localVarFormParams.put("int64", int64); if (number != null) localVarFormParams.put("number", number); if (_float != null) localVarFormParams.put("float", _float); if (_double != null) localVarFormParams.put("double", _double); -if (string != null) localVarFormParams.put("string", string); +if (_string != null) localVarFormParams.put("string", _string); if (patternWithoutDelimiter != null) localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); if (_byte != null) localVarFormParams.put("byte", _byte); if (binary != null) localVarFormParams.put("binary", binary); -if (date != null) localVarFormParams.put("date", date); -if (dateTime != null) localVarFormParams.put("dateTime", dateTime); +if (_date != null) localVarFormParams.put("date", _date); +if (_dateTime != null) localVarFormParams.put("dateTime", _dateTime); if (password != null) localVarFormParams.put("password", password); if (paramCallback != null) localVarFormParams.put("callback", paramCallback); diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java index a7388f52cd832..25ce5a86c4636 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java @@ -401,20 +401,20 @@ public Single rxTestClientModel(Client body, ApiClient.AuthInfo authInfo * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param resultHandler Asynchronous result handler */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler> resultHandler) { - delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, resultHandler); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler> resultHandler) { + delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, resultHandler); } /** @@ -424,21 +424,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param authInfo call specific auth overrides * @param resultHandler Asynchronous result handler */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> resultHandler) { - delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, authInfo, resultHandler); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> resultHandler) { + delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, authInfo, resultHandler); } /** @@ -448,21 +448,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Asynchronous result handler (RxJava Single) */ - public Single rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) { + public Single rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) { return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut -> - delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, fut) + delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, fut) )); } @@ -473,22 +473,22 @@ public Single rxTestEndpointParameters(BigDecimal number, Double _double, * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param authInfo call specific auth overrides * @return Asynchronous result handler (RxJava Single) */ - public Single rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo) { + public Single rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo) { return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut -> - delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, authInfo, fut) + delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, authInfo, fut) )); } /** diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java index ce7dc954214c7..43e65e1d9ffdb 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java @@ -51,7 +51,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -69,7 +69,7 @@ public class FormatTest { private Double _double; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -78,48 +78,48 @@ public class FormatTest { private AsyncFile binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -261,29 +261,29 @@ public void setDouble(Double _double) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -339,81 +339,81 @@ public void setBinary(AsyncFile binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -443,29 +443,29 @@ public void setPassword(String password) { } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { - this.bigDecimal = bigDecimal; + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -477,45 +477,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index ad65e2d8fc5ae..3ef779ef8bcd2 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,100 +39,100 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -144,23 +144,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/vertx/docs/FakeApi.md b/samples/client/petstore/java/vertx/docs/FakeApi.md index b9dc1bfbd9283..ac04444a61d18 100644 --- a/samples/client/petstore/java/vertx/docs/FakeApi.md +++ b/samples/client/petstore/java/vertx/docs/FakeApi.md @@ -811,7 +811,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -843,18 +843,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None AsyncFile binary = new AsyncFile(); // AsyncFile | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -875,14 +875,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **AsyncFile**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/vertx/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/vertx/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/vertx/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/vertx/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/vertx/docs/FormatTest.md b/samples/client/petstore/java/vertx/docs/FormatTest.md index 42278d0f3953f..5ecc750ef4e36 100644 --- a/samples/client/petstore/java/vertx/docs/FormatTest.md +++ b/samples/client/petstore/java/vertx/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **AsyncFile** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/vertx/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/vertx/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/vertx/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/vertx/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java index f0768854f8003..898700831a6af 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java @@ -72,9 +72,9 @@ public interface FakeApi { void testClientModel(Client client, ApiClient.AuthInfo authInfo, Handler> handler); - void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler> handler); + void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler> handler); - void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> handler); + void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> handler); void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Handler> handler); diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java index 88734181cfc02..6a13555d8cb3c 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -613,20 +613,20 @@ public void testClientModel(Client client, ApiClient.AuthInfo authInfo, Handler< * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param resultHandler Asynchronous result handler */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler> resultHandler) { - testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null, resultHandler); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler> resultHandler) { + testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null, resultHandler); } /** @@ -636,20 +636,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param authInfo per call authentication override. * @param resultHandler Asynchronous result handler */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> resultHandler) { + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> resultHandler) { Object localVarBody = null; // verify the required parameter 'number' is set @@ -691,18 +691,18 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat // form params // TODO: sending files within multipart/form-data is not supported yet (because of vertx web-client) Map localVarFormParams = new HashMap<>(); - if (integer != null) localVarFormParams.put("integer", integer); + if (_integer != null) localVarFormParams.put("integer", _integer); if (int32 != null) localVarFormParams.put("int32", int32); if (int64 != null) localVarFormParams.put("int64", int64); if (number != null) localVarFormParams.put("number", number); if (_float != null) localVarFormParams.put("float", _float); if (_double != null) localVarFormParams.put("double", _double); -if (string != null) localVarFormParams.put("string", string); +if (_string != null) localVarFormParams.put("string", _string); if (patternWithoutDelimiter != null) localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); if (_byte != null) localVarFormParams.put("byte", _byte); if (binary != null) localVarFormParams.put("binary", binary); -if (date != null) localVarFormParams.put("date", date); -if (dateTime != null) localVarFormParams.put("dateTime", dateTime); +if (_date != null) localVarFormParams.put("date", _date); +if (_dateTime != null) localVarFormParams.put("dateTime", _dateTime); if (password != null) localVarFormParams.put("password", password); if (paramCallback != null) localVarFormParams.put("callback", paramCallback); diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java index f5537a272c92a..70f55401b96e5 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java @@ -587,20 +587,20 @@ public Single rxTestClientModel(Client client, ApiClient.AuthInfo authIn * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param resultHandler Asynchronous result handler */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler> resultHandler) { - delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, resultHandler); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler> resultHandler) { + delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, resultHandler); } /** @@ -610,21 +610,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param authInfo call specific auth overrides * @param resultHandler Asynchronous result handler */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> resultHandler) { - delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, authInfo, resultHandler); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler> resultHandler) { + delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, authInfo, resultHandler); } /** @@ -634,21 +634,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Asynchronous result handler (RxJava Single) */ - public Single rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) { + public Single rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) { return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut -> - delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, fut) + delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, fut) )); } @@ -659,22 +659,22 @@ public Single rxTestEndpointParameters(BigDecimal number, Double _double, * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @param authInfo call specific auth overrides * @return Asynchronous result handler (RxJava Single) */ - public Single rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo) { + public Single rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo) { return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut -> - delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, authInfo, fut) + delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, authInfo, fut) )); } /** diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 0626a5810e642..18e3120cfd111 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -34,34 +34,34 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @Override @@ -73,19 +73,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java index 9589f801ac9e5..0647b6ebd3219 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java @@ -53,7 +53,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -74,7 +74,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -83,13 +83,13 @@ public class FormatTest { private AsyncFile binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -103,31 +103,31 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -295,29 +295,29 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -373,81 +373,81 @@ public void setBinary(AsyncFile binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -537,19 +537,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -557,26 +557,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index ad65e2d8fc5ae..3ef779ef8bcd2 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,100 +39,100 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -144,23 +144,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 1a3e502685bca..f69f168101d24 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -180,7 +180,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -188,14 +188,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md b/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md index e442af92c3b70..ce1d1164b38fd 100644 --- a/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md +++ b/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md @@ -811,7 +811,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -843,18 +843,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -875,14 +875,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/webclient-jakarta/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/webclient-jakarta/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/webclient-jakarta/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/webclient-jakarta/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/webclient-jakarta/docs/FormatTest.md b/samples/client/petstore/java/webclient-jakarta/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/webclient-jakarta/docs/FormatTest.md +++ b/samples/client/petstore/java/webclient-jakarta/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/webclient-jakarta/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/webclient-jakarta/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/webclient-jakarta/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/webclient-jakarta/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/webclient-jakarta/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/webclient-jakarta/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/webclient-jakarta/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/webclient-jakarta/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java index 4eda70f5a0c28..8337a007d0a0b 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java @@ -923,19 +923,19 @@ public ResponseSpec testClientModelWithResponseSpec(Client client) throws WebCli * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { + private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { Object postBody = null; // verify the required parameter 'number' is set if (number == null) { @@ -961,8 +961,8 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (integer != null) - formParams.add("integer", integer); + if (_integer != null) + formParams.add("integer", _integer); if (int32 != null) formParams.add("int32", int32); if (int64 != null) @@ -973,18 +973,18 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do formParams.add("float", _float); if (_double != null) formParams.add("double", _double); - if (string != null) - formParams.add("string", string); + if (_string != null) + formParams.add("string", _string); if (patternWithoutDelimiter != null) formParams.add("pattern_without_delimiter", patternWithoutDelimiter); if (_byte != null) formParams.add("byte", _byte); if (binary != null) formParams.add("binary", new FileSystemResource(binary)); - if (date != null) - formParams.add("date", date); - if (dateTime != null) - formParams.add("dateTime", dateTime); + if (_date != null) + formParams.add("date", _date); + if (_dateTime != null) + formParams.add("dateTime", _dateTime); if (password != null) formParams.add("password", password); if (paramCallback != null) @@ -1012,21 +1012,21 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { + public Mono testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).bodyToMono(localVarReturnType); + return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).bodyToMono(localVarReturnType); } /** @@ -1038,21 +1038,21 @@ public Mono testEndpointParameters(BigDecimal number, Double _double, Stri * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { + public Mono> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).toEntity(localVarReturnType); + return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).toEntity(localVarReturnType); } /** @@ -1064,21 +1064,21 @@ public Mono> testEndpointParametersWithHttpInfo(BigDecimal * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @return ResponseSpec * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { - return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { + return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** * To test enum parameters diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 485a558db5452..c436b9be3fe5c 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -34,34 +34,34 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @Override @@ -73,19 +73,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java index b223a7bbea00b..292e923dab85f 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java @@ -53,7 +53,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -74,7 +74,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -83,13 +83,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -103,31 +103,31 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -295,29 +295,29 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -373,81 +373,81 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @jakarta.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -537,19 +537,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -557,26 +557,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index eb9651ec99293..39184ed0feb8c 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,100 +39,100 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -144,23 +144,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 9dc4c14117022..deae6bce0f1e1 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -40,7 +40,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -180,7 +180,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -188,14 +188,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md b/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md index e442af92c3b70..ce1d1164b38fd 100644 --- a/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md +++ b/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md @@ -811,7 +811,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -843,18 +843,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -875,14 +875,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/webclient-swagger2/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/webclient-swagger2/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/webclient-swagger2/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/webclient-swagger2/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/webclient-swagger2/docs/FormatTest.md b/samples/client/petstore/java/webclient-swagger2/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/webclient-swagger2/docs/FormatTest.md +++ b/samples/client/petstore/java/webclient-swagger2/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/webclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/webclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/webclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/webclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/webclient-swagger2/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/webclient-swagger2/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/webclient-swagger2/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/webclient-swagger2/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java index a7602fbaff3d1..4f933274f7cde 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -923,19 +923,19 @@ public ResponseSpec testClientModelWithResponseSpec(Client client) throws WebCli * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { + private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { Object postBody = null; // verify the required parameter 'number' is set if (number == null) { @@ -961,8 +961,8 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (integer != null) - formParams.add("integer", integer); + if (_integer != null) + formParams.add("integer", _integer); if (int32 != null) formParams.add("int32", int32); if (int64 != null) @@ -973,18 +973,18 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do formParams.add("float", _float); if (_double != null) formParams.add("double", _double); - if (string != null) - formParams.add("string", string); + if (_string != null) + formParams.add("string", _string); if (patternWithoutDelimiter != null) formParams.add("pattern_without_delimiter", patternWithoutDelimiter); if (_byte != null) formParams.add("byte", _byte); if (binary != null) formParams.add("binary", new FileSystemResource(binary)); - if (date != null) - formParams.add("date", date); - if (dateTime != null) - formParams.add("dateTime", dateTime); + if (_date != null) + formParams.add("date", _date); + if (_dateTime != null) + formParams.add("dateTime", _dateTime); if (password != null) formParams.add("password", password); if (paramCallback != null) @@ -1012,21 +1012,21 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { + public Mono testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).bodyToMono(localVarReturnType); + return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).bodyToMono(localVarReturnType); } /** @@ -1038,21 +1038,21 @@ public Mono testEndpointParameters(BigDecimal number, Double _double, Stri * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { + public Mono> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).toEntity(localVarReturnType); + return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).toEntity(localVarReturnType); } /** @@ -1064,21 +1064,21 @@ public Mono> testEndpointParametersWithHttpInfo(BigDecimal * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @return ResponseSpec * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { - return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { + return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** * To test enum parameters diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index efb4ccc1bec3a..76160c3636176 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -35,20 +35,20 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "") @@ -56,14 +56,14 @@ public FooGetDefaultResponse string(Foo string) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @Override @@ -75,19 +75,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java index ac72dce3f118b..1dd7c4b0b8887 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java @@ -54,7 +54,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -75,7 +75,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -84,13 +84,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -104,17 +104,17 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "") @@ -122,14 +122,14 @@ public FormatTest integer(Integer integer) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -303,15 +303,15 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "") @@ -319,14 +319,14 @@ public FormatTest string(String string) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -384,15 +384,15 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "") @@ -400,26 +400,26 @@ public FormatTest date(LocalDate date) { @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "") @@ -427,26 +427,26 @@ public FormatTest dateTime(OffsetDateTime dateTime) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "") @@ -454,14 +454,14 @@ public FormatTest uuid(UUID uuid) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -554,19 +554,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -574,26 +574,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 839cd27ca4991..562323a895843 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -40,26 +40,26 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map; + private Map _map; public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "") @@ -67,26 +67,26 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "") @@ -94,34 +94,34 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "") @@ -129,14 +129,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -148,23 +148,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 3b2b668c136c0..0fff50557f649 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -41,7 +41,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -55,15 +55,15 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "") @@ -71,14 +71,14 @@ public ObjectWithDeprecatedFields uuid(String uuid) { @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -185,7 +185,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -193,14 +193,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/java/webclient/docs/FakeApi.md b/samples/client/petstore/java/webclient/docs/FakeApi.md index e442af92c3b70..ce1d1164b38fd 100644 --- a/samples/client/petstore/java/webclient/docs/FakeApi.md +++ b/samples/client/petstore/java/webclient/docs/FakeApi.md @@ -811,7 +811,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -843,18 +843,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -875,14 +875,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/client/petstore/java/webclient/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/webclient/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/client/petstore/java/webclient/docs/FooGetDefaultResponse.md +++ b/samples/client/petstore/java/webclient/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/client/petstore/java/webclient/docs/FormatTest.md b/samples/client/petstore/java/webclient/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/client/petstore/java/webclient/docs/FormatTest.md +++ b/samples/client/petstore/java/webclient/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/client/petstore/java/webclient/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/webclient/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/client/petstore/java/webclient/docs/ObjectWithDeprecatedFields.md +++ b/samples/client/petstore/java/webclient/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java index a7602fbaff3d1..4f933274f7cde 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -923,19 +923,19 @@ public ResponseSpec testClientModelWithResponseSpec(Client client) throws WebCli * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { + private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { Object postBody = null; // verify the required parameter 'number' is set if (number == null) { @@ -961,8 +961,8 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (integer != null) - formParams.add("integer", integer); + if (_integer != null) + formParams.add("integer", _integer); if (int32 != null) formParams.add("int32", int32); if (int64 != null) @@ -973,18 +973,18 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do formParams.add("float", _float); if (_double != null) formParams.add("double", _double); - if (string != null) - formParams.add("string", string); + if (_string != null) + formParams.add("string", _string); if (patternWithoutDelimiter != null) formParams.add("pattern_without_delimiter", patternWithoutDelimiter); if (_byte != null) formParams.add("byte", _byte); if (binary != null) formParams.add("binary", new FileSystemResource(binary)); - if (date != null) - formParams.add("date", date); - if (dateTime != null) - formParams.add("dateTime", dateTime); + if (_date != null) + formParams.add("date", _date); + if (_dateTime != null) + formParams.add("dateTime", _dateTime); if (password != null) formParams.add("password", password); if (paramCallback != null) @@ -1012,21 +1012,21 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { + public Mono testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).bodyToMono(localVarReturnType); + return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).bodyToMono(localVarReturnType); } /** @@ -1038,21 +1038,21 @@ public Mono testEndpointParameters(BigDecimal number, Double _double, Stri * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { + public Mono> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).toEntity(localVarReturnType); + return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).toEntity(localVarReturnType); } /** @@ -1064,21 +1064,21 @@ public Mono> testEndpointParametersWithHttpInfo(BigDecimal * @param _double None * @param patternWithoutDelimiter None * @param _byte None - * @param integer None + * @param _integer None * @param int32 None * @param int64 None * @param _float None - * @param string None + * @param _string None * @param binary None - * @param date None - * @param dateTime None + * @param _date None + * @param _dateTime None * @param password None * @param paramCallback None * @return ResponseSpec * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException { - return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException { + return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** * To test enum parameters diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index 0626a5810e642..18e3120cfd111 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -34,34 +34,34 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { + public FooGetDefaultResponse _string(Foo _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @Override @@ -73,19 +73,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java index 1efd4270dd5d1..1f7bd87b32f60 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java @@ -53,7 +53,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -74,7 +74,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -83,13 +83,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -103,31 +103,31 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { + public FormatTest _integer(Integer _integer) { - this.integer = integer; + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -295,29 +295,29 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { + public FormatTest _string(String _string) { - this.string = string; + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -373,81 +373,81 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { + public FormatTest _date(LocalDate _date) { - this.date = date; + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -537,19 +537,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -557,26 +557,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e90966d864854..86cf76cb59115 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,100 +39,100 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map; + private Map _map; public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { - this.dateTime = dateTime; + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { - this.map = map; + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -144,23 +144,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 1a3e502685bca..f69f168101d24 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { + public ObjectWithDeprecatedFields _uuid(String _uuid) { - this.uuid = uuid; + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -180,7 +180,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -188,14 +188,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index f4cfbc41db59a..ab11b36995785 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -32,8 +32,8 @@ public interface DefaultApi { /** * GET /thingy/{date} * - * @param date A date path parameter (required) - * @param dateTime A date-time query parameter (required) + * @param _date A date path parameter (required) + * @param _dateTime A date-time query parameter (required) * @param xOrderDate A date header parameter (required) * @param loginDate A date cookie parameter (optional, default to 1975-01-01) * @return OK (status code 200) @@ -52,8 +52,8 @@ public interface DefaultApi { ) ResponseEntity get( - @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @NotNull @ApiParam(value = "A date header parameter", required = true, defaultValue = "1974-01-01") @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate, @ApiParam(value = "A date cookie parameter", defaultValue = "1975-01-01") @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate ); @@ -63,7 +63,7 @@ ResponseEntity get( * POST /thingy/{date} * update with form data * - * @param date A date path parameter (required) + * @param _date A date path parameter (required) * @param visitDate Updated last visit timestamp (optional, default to 1971-12-19T03:39:57-08:00) * @return Invalid input (status code 405) */ @@ -82,7 +82,7 @@ ResponseEntity get( ) ResponseEntity updatePetWithForm( - @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, + @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate ); diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java index 942abfa00d23c..8a7c7c9aee83b 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -187,14 +187,14 @@ Mono> testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -211,14 +211,14 @@ Mono> testEndpointParameters( @RequestParam(value = "double", required = true) Double _double, @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @RequestParam(value = "byte", required = true) byte[] _byte, - @RequestParam(value = "integer", required = false) Integer integer, + @RequestParam(value = "integer", required = false) Integer _integer, @RequestParam(value = "int32", required = false) Integer int32, @RequestParam(value = "int64", required = false) Long int64, @RequestParam(value = "float", required = false) Float _float, - @RequestParam(value = "string", required = false) String string, + @RequestParam(value = "string", required = false) String _string, @RequestPart(value = "binary", required = false) Flux binary, - @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @RequestParam(value = "password", required = false) String password, @RequestParam(value = "callback", required = false) String paramCallback ); diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java index 47b445bbf5cf9..c985d4c1a9dcc 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java @@ -27,7 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -39,23 +39,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -64,32 +64,32 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -195,23 +195,23 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -252,61 +252,61 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -328,23 +328,23 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -356,45 +356,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 8ff1a06c7eb0b..f81baa278cedb 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -25,77 +25,77 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -107,23 +107,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java index 3fd6f8e3861b1..1dffe9ba249ff 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java @@ -183,14 +183,14 @@ ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -207,14 +207,14 @@ ResponseEntity testEndpointParameters( @RequestParam(value = "double", required = true) Double _double, @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @RequestParam(value = "byte", required = true) byte[] _byte, - @RequestParam(value = "integer", required = false) Integer integer, + @RequestParam(value = "integer", required = false) Integer _integer, @RequestParam(value = "int32", required = false) Integer int32, @RequestParam(value = "int64", required = false) Long int64, @RequestParam(value = "float", required = false) Float _float, - @RequestParam(value = "string", required = false) String string, + @RequestParam(value = "string", required = false) String _string, @RequestPart(value = "binary", required = false) MultipartFile binary, - @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @RequestParam(value = "password", required = false) String password, @RequestParam(value = "callback", required = false) String paramCallback ); diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java index 68f17b1f1f21b..c9ede611a19b6 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java @@ -27,7 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTestDto { - private Integer integer; + private Integer _integer; private Integer int32; @@ -39,43 +39,43 @@ public class FormatTestDto { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; - public FormatTestDto integer(Integer integer) { - this.integer = integer; + public FormatTestDto _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTestDto int32(Integer int32) { @@ -181,23 +181,23 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTestDto string(String string) { - this.string = string; + public FormatTestDto _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTestDto _byte(byte[] _byte) { @@ -238,61 +238,61 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTestDto date(LocalDate date) { - this.date = date; + public FormatTestDto _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTestDto dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTestDto _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTestDto uuid(UUID uuid) { - this.uuid = uuid; + public FormatTestDto _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTestDto password(String password) { @@ -314,23 +314,23 @@ public void setPassword(String password) { this.password = password; } - public FormatTestDto bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTestDto _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -342,45 +342,45 @@ public boolean equals(Object o) { return false; } FormatTestDto formatTest = (FormatTestDto) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTestDto {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 499c5540a5fc3..bdac430f08559 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -27,77 +27,77 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClassDto { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClassDto _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClassDto _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClassDto _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, AnimalDto mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, AnimalDto _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -109,23 +109,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClassDto mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClassDto) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClassDto {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md index 83f469863c9af..c680764dd260e 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md @@ -597,7 +597,7 @@ No authorization required ## testEndpointParameters -> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) +> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -637,18 +637,18 @@ public class Example { Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None byte[] _byte = null; // byte[] | None - Integer integer = 56; // Integer | None + Integer _integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 56L; // Long | None Float _float = 3.4F; // Float | None - String string = "string_example"; // String | None + String _string = "_string_example"; // String | None File binary = new File("/path/to/file"); // File | None - LocalDate date = LocalDate.now(); // LocalDate | None - OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None + LocalDate _date = LocalDate.now(); // LocalDate | None + OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None String password = "password_example"; // String | None String paramCallback = "paramCallback_example"; // String | None try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); System.err.println("Status code: " + e.getCode()); @@ -669,14 +669,14 @@ public class Example { | **_double** | **Double**| None | | | **patternWithoutDelimiter** | **String**| None | | | **_byte** | **byte[]**| None | | -| **integer** | **Integer**| None | [optional] | +| **_integer** | **Integer**| None | [optional] | | **int32** | **Integer**| None | [optional] | | **int64** | **Long**| None | [optional] | | **_float** | **Float**| None | [optional] | -| **string** | **String**| None | [optional] | +| **_string** | **String**| None | [optional] | | **binary** | **File**| None | [optional] | -| **date** | **LocalDate**| None | [optional] | -| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | +| **_date** | **LocalDate**| None | [optional] | +| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] | | **password** | **String**| None | [optional] | | **paramCallback** | **String**| None | [optional] | diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FooGetDefaultResponse.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FooGetDefaultResponse.md index ff3d7a3a56c3d..7fcb7b5e54276 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FooGetDefaultResponse.md +++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FooGetDefaultResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**string** | [**Foo**](Foo.md) | | [optional] | +|**_string** | [**Foo**](Foo.md) | | [optional] | diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md index 01b8c777ae06d..e56dd0d80db91 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md +++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md @@ -7,19 +7,19 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**integer** | **Integer** | | [optional] | +|**_integer** | **Integer** | | [optional] | |**int32** | **Integer** | | [optional] | |**int64** | **Long** | | [optional] | |**number** | **BigDecimal** | | | |**_float** | **Float** | | [optional] | |**_double** | **Double** | | [optional] | |**decimal** | **BigDecimal** | | [optional] | -|**string** | **String** | | [optional] | +|**_string** | **String** | | [optional] | |**_byte** | **byte[]** | | | |**binary** | **File** | | [optional] | -|**date** | **LocalDate** | | | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**uuid** | **UUID** | | [optional] | +|**_date** | **LocalDate** | | | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_uuid** | **UUID** | | [optional] | |**password** | **String** | | | |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. | [optional] | |**patternWithDigitsAndDelimiter** | **String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional] | diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md index a5ddf0faa6a91..66aea39f7c68d 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md +++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -7,9 +7,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **UUID** | | [optional] | -|**dateTime** | **OffsetDateTime** | | [optional] | -|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | +|**_uuid** | **UUID** | | [optional] | +|**_dateTime** | **OffsetDateTime** | | [optional] | +|**_map** | [**Map<String, Animal>**](Animal.md) | | [optional] | diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ObjectWithDeprecatedFields.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ObjectWithDeprecatedFields.md index f1cf571f4c090..803ee7845f7a3 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ObjectWithDeprecatedFields.md +++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ObjectWithDeprecatedFields.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**uuid** | **String** | | [optional] | +|**_uuid** | **String** | | [optional] | |**id** | **BigDecimal** | | [optional] | |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) | | [optional] | |**bars** | **List<String>** | | [optional] | diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index be2aa6952f092..afb09cf99944a 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -404,14 +404,14 @@ public ApiResponse testClientModelWithHttpInfo(Client client) throws Api * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException if fails to make API call @@ -422,8 +422,8 @@ public ApiResponse testClientModelWithHttpInfo(Client client) throws Api 404 User not found - */ - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { - testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { + testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } /** @@ -433,14 +433,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) + * @param _date None (optional) + * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00) * @param password None (optional) * @param paramCallback None (optional) * @return ApiResponse<Void> @@ -452,7 +452,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat 404 User not found - */ - public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { + public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException { // Check required parameters if (number == null) { throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters"); @@ -469,8 +469,8 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D // Form parameters Map localVarFormParams = new LinkedHashMap<>(); - if (integer != null) { - localVarFormParams.put("integer", integer); + if (_integer != null) { + localVarFormParams.put("integer", _integer); } if (int32 != null) { localVarFormParams.put("int32", int32); @@ -483,19 +483,19 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D localVarFormParams.put("float", _float); } localVarFormParams.put("double", _double); - if (string != null) { - localVarFormParams.put("string", string); + if (_string != null) { + localVarFormParams.put("string", _string); } localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter); localVarFormParams.put("byte", _byte); if (binary != null) { localVarFormParams.put("binary", binary); } - if (date != null) { - localVarFormParams.put("date", date); + if (_date != null) { + localVarFormParams.put("date", _date); } - if (dateTime != null) { - localVarFormParams.put("dateTime", dateTime); + if (_dateTime != null) { + localVarFormParams.put("dateTime", _dateTime); } if (password != null) { localVarFormParams.put("password", password); diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index b38d9e1a0050e..7b29aa86299ee 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -37,33 +37,33 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; - private Foo string; + private Foo _string; public FooGetDefaultResponse() { } - public FooGetDefaultResponse string(Foo string) { - this.string = string; + public FooGetDefaultResponse _string(Foo _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Foo getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @@ -79,19 +79,19 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(this.string, fooGetDefaultResponse.string); + return Objects.equals(this._string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java index e473f1eee2397..fce2c08d1eee0 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java @@ -56,7 +56,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; private Integer int32; @@ -77,7 +77,7 @@ public class FormatTest { private BigDecimal decimal; public static final String JSON_PROPERTY_STRING = "string"; - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; private byte[] _byte; @@ -86,13 +86,13 @@ public class FormatTest { private File binary; public static final String JSON_PROPERTY_DATE = "date"; - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -106,30 +106,30 @@ public class FormatTest { public FormatTest() { } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } @@ -291,28 +291,28 @@ public void setDecimal(BigDecimal decimal) { } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getString() { - return string; + return _string; } @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } @@ -366,78 +366,78 @@ public void setBinary(File binary) { } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) public LocalDate getDate() { - return date; + return _date; } @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } @@ -528,19 +528,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.decimal, formatTest.decimal) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -548,26 +548,26 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1cefe82183ede..2fda754aef8f9 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -42,97 +42,97 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Map getMap() { - return map; + return _map; } @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -148,23 +148,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 139a42db42519..ec53d0e51613e 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -42,7 +42,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; private BigDecimal id; @@ -56,28 +56,28 @@ public class ObjectWithDeprecatedFields { public ObjectWithDeprecatedFields() { } - public ObjectWithDeprecatedFields uuid(String uuid) { - this.uuid = uuid; + public ObjectWithDeprecatedFields _uuid(String _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getUuid() { - return uuid; + return _uuid; } @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } @@ -182,7 +182,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) && Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(this.bars, objectWithDeprecatedFields.bars); @@ -190,14 +190,14 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index ab1bfe6992fc4..91f997c7d2cb6 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -42,8 +42,8 @@ public interface DefaultApi { /** * GET /thingy/{date} * - * @param date A date path parameter (required) - * @param dateTime A date-time query parameter (required) + * @param _date A date path parameter (required) + * @param _dateTime A date-time query parameter (required) * @param xOrderDate A date header parameter (required) * @param loginDate A date cookie parameter (optional, default to 1975-01-01) * @return OK (status code 200) @@ -60,8 +60,8 @@ public interface DefaultApi { ) ResponseEntity get( - @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @NotNull @Parameter(name = "X-Order-Date", description = "A date header parameter", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate, @Parameter(name = "loginDate", description = "A date cookie parameter", in = ParameterIn.COOKIE) @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate ); @@ -71,7 +71,7 @@ ResponseEntity get( * POST /thingy/{date} * update with form data * - * @param date A date path parameter (required) + * @param _date A date path parameter (required) * @param visitDate Updated last visit timestamp (optional, default to 1971-12-19T03:39:57-08:00) * @return Invalid input (status code 405) */ @@ -89,7 +89,7 @@ ResponseEntity get( ) ResponseEntity updatePetWithForm( - @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, + @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, @Parameter(name = "visitDate", description = "Updated last visit timestamp") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index b322430fbd494..fc9f0075a77fb 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -280,14 +280,14 @@ ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -317,14 +317,14 @@ ResponseEntity testEndpointParameters( @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string, + @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string, @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java index 81c7dcc4e2863..e021526972631 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java @@ -29,7 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -41,44 +41,44 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -189,24 +189,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -249,64 +249,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -329,24 +329,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -358,45 +358,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 7dd078dbaa801..dca4f3609f0f5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,80 +27,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -112,23 +112,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index ec2981e02369c..76dcaa0255139 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -326,14 +326,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -363,18 +363,18 @@ default ResponseEntity testEndpointParameters( @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string, + @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string, @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index e04c34be3b065..4b16e092d6094 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -189,14 +189,14 @@ default ResponseEntity testClientModel(Client client) { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -207,14 +207,14 @@ default ResponseEntity testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, - Integer integer, + Integer _integer, Integer int32, Long int64, Float _float, - String string, + String _string, MultipartFile binary, - LocalDate date, - OffsetDateTime dateTime, + LocalDate _date, + OffsetDateTime _dateTime, String password, String paramCallback) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java index dfc230959b208..43b46417231dd 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java @@ -29,7 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -41,23 +41,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -66,33 +66,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -203,24 +203,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -343,24 +343,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -372,45 +372,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 7dd078dbaa801..dca4f3609f0f5 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,80 +27,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -112,23 +112,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index f9de7344ba4ec..5639577bfac63 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -366,14 +366,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -403,14 +403,14 @@ default ResponseEntity testEndpointParameters( @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string, + @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string, @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java index dfc230959b208..43b46417231dd 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java @@ -29,7 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -41,23 +41,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -66,33 +66,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -203,24 +203,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -343,24 +343,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -372,45 +372,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 7dd078dbaa801..dca4f3609f0f5 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,80 +27,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -112,23 +112,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeService.java index 856a23d38dcad..03b2bcd96f357 100644 --- a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeService.java +++ b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeService.java @@ -109,7 +109,7 @@ public interface FakeService { @POST @Consumes({ "application/x-www-form-urlencoded" }) - void testEndpointParameters(@FormParam(value = "number") BigDecimal number, @FormParam(value = "double") Double _double, @FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter, @FormParam(value = "byte") byte[] _byte, @FormParam(value = "integer") Integer integer, @FormParam(value = "int32") Integer int32, @FormParam(value = "int64") Long int64, @FormParam(value = "float") Float _float, @FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream, @FormParam(value = "date") LocalDate date, @FormParam(value = "dateTime") OffsetDateTime dateTime, @FormParam(value = "password") String password, @FormParam(value = "callback") String paramCallback); + void testEndpointParameters(@FormParam(value = "number") BigDecimal number, @FormParam(value = "double") Double _double, @FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter, @FormParam(value = "byte") byte[] _byte, @FormParam(value = "integer") Integer _integer, @FormParam(value = "int32") Integer int32, @FormParam(value = "int64") Long int64, @FormParam(value = "float") Float _float, @FormParam(value = "string") String _string, @FormParam(value = "binary") InputStream binaryInputStream, @FormParam(value = "date") LocalDate _date, @FormParam(value = "dateTime") OffsetDateTime _dateTime, @FormParam(value = "password") String password, @FormParam(value = "callback") String paramCallback); @GET @Consumes({ "application/x-www-form-urlencoded" }) diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java index 83412a6d0ea2c..3d30589e32934 100644 --- a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java +++ b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java @@ -138,7 +138,7 @@ public Client testClientModel(@Valid @NotNull Client client) { @POST @Consumes({ "application/x-www-form-urlencoded" }) - public void testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") OffsetDateTime dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public void testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer _integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate _date,@FormParam(value = "dateTime") OffsetDateTime _dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { } @GET diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java index 2536010aaeb32..f17b8f017a31b 100644 --- a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java +++ b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java @@ -25,25 +25,25 @@ public class FooGetDefaultResponse { - private Foo string; + private Foo _string; /** - * Get string - * @return string + * Get _string + * @return _string **/ public Foo getString() { - return string; + return _string; } /** - * Set string + * Set _string **/ - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } - public FooGetDefaultResponse string(Foo string) { - this.string = string; + public FooGetDefaultResponse _string(Foo _string) { + this._string = _string; return this; } @@ -56,7 +56,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/FormatTest.java b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/FormatTest.java index ceb79d014d52f..c1b489f67d878 100644 --- a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/FormatTest.java +++ b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/FormatTest.java @@ -29,7 +29,7 @@ public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -43,17 +43,17 @@ public class FormatTest { private BigDecimal decimal; - private String string; + private String _string; private byte[] _byte; private File binary; - private LocalDate date; + private LocalDate _date; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; @@ -68,24 +68,24 @@ public class FormatTest { private String patternWithDigitsAndDelimiter; /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } /** - * Set integer + * Set _integer **/ - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } @@ -219,22 +219,22 @@ public FormatTest decimal(BigDecimal decimal) { } /** - * Get string - * @return string + * Get _string + * @return _string **/ @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } /** - * Set string + * Set _string **/ - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } @@ -280,63 +280,63 @@ public FormatTest binary(File binary) { } /** - * Get date - * @return date + * Get _date + * @return _date **/ @NotNull public LocalDate getDate() { - return date; + return _date; } /** - * Set date + * Set _date **/ - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } /** - * Set dateTime + * Set _dateTime **/ - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public UUID getUuid() { - return uuid; + return _uuid; } /** - * Set uuid + * Set _uuid **/ - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -410,19 +410,19 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1d04eaf6c9451..4a365c34dfe52 100644 --- a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,74 +28,74 @@ public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private Map map = null; + private Map _map = null; /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public UUID getUuid() { - return uuid; + return _uuid; } /** - * Set uuid + * Set _uuid **/ - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } /** - * Set dateTime + * Set _dateTime **/ - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ public Map getMap() { - return map; + return _map; } /** - * Set map + * Set _map **/ - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - this.map.put(key, mapItem); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + this._map.put(key, _mapItem); return this; } @@ -108,9 +108,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java index dc24a224465a4..805ede1222126 100644 --- a/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java @@ -28,7 +28,7 @@ public class ObjectWithDeprecatedFields { - private String uuid; + private String _uuid; private BigDecimal id; @@ -37,22 +37,22 @@ public class ObjectWithDeprecatedFields { private List bars = null; /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public String getUuid() { - return uuid; + return _uuid; } /** - * Set uuid + * Set _uuid **/ - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } - public ObjectWithDeprecatedFields uuid(String uuid) { - this.uuid = uuid; + public ObjectWithDeprecatedFields _uuid(String _uuid) { + this._uuid = _uuid; return this; } @@ -136,7 +136,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java index f4716bdfcd1e7..7eb1ebe999528 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java @@ -7,7 +7,7 @@ public class FooGetDefaultResponse { - private Foo string; + private Foo _string; /** * Default constructor. @@ -19,26 +19,26 @@ public FooGetDefaultResponse() { /** * Create FooGetDefaultResponse. * - * @param string string + * @param _string _string */ public FooGetDefaultResponse( - Foo string + Foo _string ) { - this.string = string; + this._string = _string; } /** - * Get string - * @return string + * Get _string + * @return _string */ public Foo getString() { - return string; + return _string; } - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } /** @@ -49,7 +49,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FormatTest.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FormatTest.java index df656b5b83c47..ef7af05dd031c 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FormatTest.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/FormatTest.java @@ -11,19 +11,19 @@ public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; private Long int64; private BigDecimal number; private Float _float; private Double _double; private BigDecimal decimal; - private String string; + private String _string; private byte[] _byte; private File binary; - private LocalDate date; - private OffsetDateTime dateTime; - private UUID uuid; + private LocalDate _date; + private OffsetDateTime _dateTime; + private UUID _uuid; private String password; private String patternWithDigits; private String patternWithDigitsAndDelimiter; @@ -38,54 +38,54 @@ public FormatTest() { /** * Create FormatTest. * - * @param integer integer + * @param _integer _integer * @param int32 int32 * @param int64 int64 * @param number number * @param _float _float * @param _double _double * @param decimal decimal - * @param string string + * @param _string _string * @param _byte _byte * @param binary binary - * @param date date - * @param dateTime dateTime - * @param uuid uuid + * @param _date _date + * @param _dateTime _dateTime + * @param _uuid _uuid * @param password password * @param patternWithDigits A string that is a 10 digit number. Can have leading zeros. * @param patternWithDigitsAndDelimiter A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. */ public FormatTest( - Integer integer, + Integer _integer, Integer int32, Long int64, BigDecimal number, Float _float, Double _double, BigDecimal decimal, - String string, + String _string, byte[] _byte, File binary, - LocalDate date, - OffsetDateTime dateTime, - UUID uuid, + LocalDate _date, + OffsetDateTime _dateTime, + UUID _uuid, String password, String patternWithDigits, String patternWithDigitsAndDelimiter ) { - this.integer = integer; + this._integer = _integer; this.int32 = int32; this.int64 = int64; this.number = number; this._float = _float; this._double = _double; this.decimal = decimal; - this.string = string; + this._string = _string; this._byte = _byte; this.binary = binary; - this.date = date; - this.dateTime = dateTime; - this.uuid = uuid; + this._date = _date; + this._dateTime = _dateTime; + this._uuid = _uuid; this.password = password; this.patternWithDigits = patternWithDigits; this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter; @@ -94,17 +94,17 @@ public FormatTest( /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } /** @@ -188,15 +188,15 @@ public void setDecimal(BigDecimal decimal) { } /** - * Get string - * @return string + * Get _string + * @return _string */ public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } /** @@ -224,39 +224,39 @@ public void setBinary(File binary) { } /** - * Get date - * @return date + * Get _date + * @return _date */ public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** @@ -303,19 +303,19 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0a6bef328e2b4..ee8dc7d0cdd62 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -10,9 +10,9 @@ public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; - private OffsetDateTime dateTime; - private Map map = new HashMap<>(); + private UUID _uuid; + private OffsetDateTime _dateTime; + private Map _map = new HashMap<>(); /** * Default constructor. @@ -24,56 +24,56 @@ public MixedPropertiesAndAdditionalPropertiesClass() { /** * Create MixedPropertiesAndAdditionalPropertiesClass. * - * @param uuid uuid - * @param dateTime dateTime - * @param map map + * @param _uuid _uuid + * @param _dateTime _dateTime + * @param _map _map */ public MixedPropertiesAndAdditionalPropertiesClass( - UUID uuid, - OffsetDateTime dateTime, - Map map + UUID _uuid, + OffsetDateTime _dateTime, + Map _map ) { - this.uuid = uuid; - this.dateTime = dateTime; - this.map = map; + this._uuid = _uuid; + this._dateTime = _dateTime; + this._map = _map; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } /** - * Get map - * @return map + * Get _map + * @return _map */ public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } /** @@ -84,9 +84,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java index 2a6633c0f2cb1..7df322d47c3fa 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java @@ -10,7 +10,7 @@ public class ObjectWithDeprecatedFields { - private String uuid; + private String _uuid; private BigDecimal id; private DeprecatedObject deprecatedRef; private List bars; @@ -25,18 +25,18 @@ public ObjectWithDeprecatedFields() { /** * Create ObjectWithDeprecatedFields. * - * @param uuid uuid + * @param _uuid _uuid * @param id id * @param deprecatedRef deprecatedRef * @param bars bars */ public ObjectWithDeprecatedFields( - String uuid, + String _uuid, BigDecimal id, DeprecatedObject deprecatedRef, List bars ) { - this.uuid = uuid; + this._uuid = _uuid; this.id = id; this.deprecatedRef = deprecatedRef; this.bars = bars; @@ -45,15 +45,15 @@ public ObjectWithDeprecatedFields( /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ public String getUuid() { - return uuid; + return _uuid; } - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } /** @@ -100,7 +100,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java index fa8a808eb7cf4..8e9f2889beafd 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java @@ -152,21 +152,21 @@ public Response testEndpointParameters(@ApiParam(value = "None", required=true) ,@ApiParam(value = "None", required=true) @FormParam("double") Double _double ,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter ,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte -,@ApiParam(value = "None") @FormParam("integer") Integer integer +,@ApiParam(value = "None") @FormParam("integer") Integer _integer ,@ApiParam(value = "None") @FormParam("int32") Integer int32 ,@ApiParam(value = "None") @FormParam("int64") Long int64 ,@ApiParam(value = "None") @FormParam("float") Float _float -,@ApiParam(value = "None") @FormParam("string") String string +,@ApiParam(value = "None") @FormParam("string") String _string , @FormDataParam("binary") InputStream binaryInputStream, @FormDataParam("binary") FileInfo binaryDetail -,@ApiParam(value = "None") @FormParam("date") Date date -,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime +,@ApiParam(value = "None") @FormParam("date") Date _date +,@ApiParam(value = "None") @FormParam("dateTime") Date _dateTime ,@ApiParam(value = "None") @FormParam("password") String password ,@ApiParam(value = "None") @FormParam("callback") String paramCallback ) throws NotFoundException { - return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,integer,int32,int64,_float,string,binaryInputStream, binaryDetail,date,dateTime,password,paramCallback); + return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,_integer,int32,int64,_float,_string,binaryInputStream, binaryDetail,_date,_dateTime,password,paramCallback); } @GET diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java index 2fc3d704eb8b2..ed4f25dd14f45 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java @@ -49,14 +49,14 @@ public abstract Response testEndpointParameters(BigDecimal number ,Double _double ,String patternWithoutDelimiter ,byte[] _byte - ,Integer integer + ,Integer _integer ,Integer int32 ,Long int64 ,Float _float - ,String string + ,String _string ,InputStream binaryInputStream, FileInfo binaryDetail - ,Date date - ,Date dateTime + ,Date _date + ,Date _dateTime ,String password ,String paramCallback ) throws NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java index 8937ac0528454..4ad0307947684 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java @@ -17,7 +17,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen") public class FormatTest { @JsonProperty("integer") - private Integer integer; + private Integer _integer; @JsonProperty("int32") private Integer int32; @@ -35,7 +35,7 @@ public class FormatTest { private Double _double; @JsonProperty("string") - private String string; + private String _string; @JsonProperty("byte") private byte[] _byte; @@ -44,38 +44,38 @@ public class FormatTest { private File binary; @JsonProperty("date") - private Date date; + private Date _date; @JsonProperty("dateTime") - private Date dateTime; + private Date _dateTime; @JsonProperty("uuid") - private UUID uuid; + private UUID _uuid; @JsonProperty("password") private String password; @JsonProperty("BigDecimal") - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @ApiModelProperty(value = "") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -176,22 +176,22 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @ApiModelProperty(value = "") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -230,58 +230,58 @@ public void setBinary(File binary) { this.binary = binary; } - public FormatTest date(Date date) { - this.date = date; + public FormatTest _date(Date _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @ApiModelProperty(required = true, value = "") public Date getDate() { - return date; + return _date; } - public void setDate(Date date) { - this.date = date; + public void setDate(Date _date) { + this._date = _date; } - public FormatTest dateTime(Date dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @ApiModelProperty(value = "") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -302,22 +302,22 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -330,25 +330,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Objects.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override @@ -356,20 +356,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 9ced9500993ba..9d8e58f368a59 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -17,74 +17,74 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("uuid") - private UUID uuid; + private UUID _uuid; @JsonProperty("dateTime") - private Date dateTime; + private Date _dateTime; @JsonProperty("map") - private Map map = null; + private Map _map = null; - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @ApiModelProperty(value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @ApiModelProperty(value = "") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @ApiModelProperty(value = "") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -97,14 +97,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -112,9 +112,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 7e67c02af191d..fca4d6aae1888 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -82,14 +82,14 @@ public Response testEndpointParameters(BigDecimal number , Double _double , String patternWithoutDelimiter , byte[] _byte -, Integer integer +, Integer _integer , Integer int32 , Long int64 , Float _float -, String string +, String _string , InputStream binaryInputStream, FileInfo binaryDetail -, Date date -, Date dateTime +, Date _date +, Date _dateTime , String password , String paramCallback ) throws NotFoundException { diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java index 13e3f7e8ba04a..a857fe00f78e2 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java @@ -21,7 +21,7 @@ public class FormatTest { @Min(10) @Max(100) - private Integer integer; + private Integer _integer; @JsonProperty("int32") @Min(20) @@ -56,7 +56,7 @@ public class FormatTest { @JsonProperty("string") @Pattern(regexp="/[a-z]/i") - private String string; + private String _string; @JsonProperty("byte") @NotNull @@ -73,17 +73,17 @@ public class FormatTest { @NotNull @Valid - private LocalDate date; + private LocalDate _date; @JsonProperty("dateTime") @Valid - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @JsonProperty("uuid") @Valid - private UUID uuid; + private UUID _uuid; @JsonProperty("password") @NotNull @@ -94,25 +94,25 @@ public class FormatTest { @JsonProperty("BigDecimal") @Valid - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -208,21 +208,21 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -259,55 +259,55 @@ public void setBinary(InputStream binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -327,21 +327,21 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -354,25 +354,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(integer, formatTest.integer) && + return Objects.equals(_integer, formatTest._integer) && Objects.equals(int32, formatTest.int32) && Objects.equals(int64, formatTest.int64) && Objects.equals(number, formatTest.number) && Objects.equals(_float, formatTest._float) && Objects.equals(_double, formatTest._double) && - Objects.equals(string, formatTest.string) && + Objects.equals(_string, formatTest._string) && Objects.equals(_byte, formatTest._byte) && Objects.equals(binary, formatTest.binary) && - Objects.equals(date, formatTest.date) && - Objects.equals(dateTime, formatTest.dateTime) && - Objects.equals(uuid, formatTest.uuid) && + Objects.equals(_date, formatTest._date) && + Objects.equals(_dateTime, formatTest._dateTime) && + Objects.equals(_uuid, formatTest._uuid) && Objects.equals(password, formatTest.password) && - Objects.equals(bigDecimal, formatTest.bigDecimal); + Objects.equals(_bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal); } @SuppressWarnings("StringBufferReplaceableByString") @@ -381,20 +381,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java index b5ae9f0b47fdd..80cb8c46e1c7d 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java @@ -19,75 +19,75 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("uuid") @Valid - private UUID uuid; + private UUID _uuid; @JsonProperty("dateTime") @Valid - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @JsonProperty("map") @Valid - private Map map = null; + private Map _map = null; - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -100,14 +100,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(_uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(_dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(_map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @SuppressWarnings("StringBufferReplaceableByString") @@ -116,9 +116,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java index 8cc88003ee331..ecb97fad1d3df 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java @@ -174,12 +174,12 @@ public Result testClientModel(Http.Request request) throws Exception { @ApiAction public Result testEndpointParameters(Http.Request request) throws Exception { - String[] valueinteger = request.body().asMultipartFormData().asFormUrlEncoded().get("integer"); - Integer integer; - if (valueinteger != null) { - integer = Integer.parseInt(valueinteger[0]); + String[] value_integer = request.body().asMultipartFormData().asFormUrlEncoded().get("integer"); + Integer _integer; + if (value_integer != null) { + _integer = Integer.parseInt(value_integer[0]); } else { - integer = null; + _integer = null; } String[] valueint32 = request.body().asMultipartFormData().asFormUrlEncoded().get("int32"); Integer int32; @@ -216,12 +216,12 @@ public Result testEndpointParameters(Http.Request request) throws Exception { } else { throw new IllegalArgumentException("'double' parameter is required"); } - String[] valuestring = request.body().asMultipartFormData().asFormUrlEncoded().get("string"); - String string; - if (valuestring != null) { - string = valuestring[0]; + String[] value_string = request.body().asMultipartFormData().asFormUrlEncoded().get("string"); + String _string; + if (value_string != null) { + _string = value_string[0]; } else { - string = null; + _string = null; } String[] valuepatternWithoutDelimiter = request.body().asMultipartFormData().asFormUrlEncoded().get("pattern_without_delimiter"); String patternWithoutDelimiter; @@ -239,19 +239,19 @@ public Result testEndpointParameters(Http.Request request) throws Exception { } Http.MultipartFormData bodybinary = request.body().asMultipartFormData(); Http.MultipartFormData.FilePart binary = bodybinary.getFile("binary"); - String[] valuedate = request.body().asMultipartFormData().asFormUrlEncoded().get("date"); - LocalDate date; - if (valuedate != null) { - date = LocalDate.parse(valuedate[0]); + String[] value_date = request.body().asMultipartFormData().asFormUrlEncoded().get("date"); + LocalDate _date; + if (value_date != null) { + _date = LocalDate.parse(value_date[0]); } else { - date = null; + _date = null; } - String[] valuedateTime = request.body().asMultipartFormData().asFormUrlEncoded().get("dateTime"); - OffsetDateTime dateTime; - if (valuedateTime != null) { - dateTime = OffsetDateTime.parse(valuedateTime[0]); + String[] value_dateTime = request.body().asMultipartFormData().asFormUrlEncoded().get("dateTime"); + OffsetDateTime _dateTime; + if (value_dateTime != null) { + _dateTime = OffsetDateTime.parse(value_dateTime[0]); } else { - dateTime = null; + _dateTime = null; } String[] valuepassword = request.body().asMultipartFormData().asFormUrlEncoded().get("password"); String password; @@ -267,7 +267,7 @@ public Result testEndpointParameters(Http.Request request) throws Exception { } else { paramCallback = null; } - return imp.testEndpointParametersHttp(request, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return imp.testEndpointParametersHttp(request, number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } @ApiAction diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java index 0d999b3bde66a..ade75917589ea 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java @@ -67,7 +67,7 @@ public Client testClientModel(Http.Request request, Client body) throws Exceptio } @Override - public void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception { + public void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, Http.MultipartFormData.FilePart binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws Exception { //Do your magic!!! } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java index b7871b677ac61..a10d57ac25344 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java @@ -124,13 +124,13 @@ public Result testClientModelHttp(Http.Request request, Client body) throws Exce public abstract Client testClientModel(Http.Request request, Client body) throws Exception; - public Result testEndpointParametersHttp(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception { - testEndpointParameters(request, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + public Result testEndpointParametersHttp(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, Http.MultipartFormData.FilePart binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws Exception { + testEndpointParameters(request, number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); return ok(); } - public abstract void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception; + public abstract void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, Http.MultipartFormData.FilePart binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws Exception; public Result testEnumParametersHttp(Http.Request request, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws Exception { testEnumParameters(request, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java index fc6c48b50d6cf..b0a1de5072a0c 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java @@ -128,7 +128,7 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - public void testEndpointParameters(@Multipart(value = "number") BigDecimal number, @Multipart(value = "double") Double _double, @Multipart(value = "pattern_without_delimiter") String patternWithoutDelimiter, @Multipart(value = "byte") byte[] _byte, @Multipart(value = "integer", required = false) Integer integer, @Multipart(value = "int32", required = false) Integer int32, @Multipart(value = "int64", required = false) Long int64, @Multipart(value = "float", required = false) Float _float, @Multipart(value = "string", required = false) String string, @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false) LocalDate date, @Multipart(value = "dateTime", required = false) Date dateTime, @Multipart(value = "password", required = false) String password, @Multipart(value = "callback", required = false) String paramCallback); + public void testEndpointParameters(@Multipart(value = "number") BigDecimal number, @Multipart(value = "double") Double _double, @Multipart(value = "pattern_without_delimiter") String patternWithoutDelimiter, @Multipart(value = "byte") byte[] _byte, @Multipart(value = "integer", required = false) Integer _integer, @Multipart(value = "int32", required = false) Integer int32, @Multipart(value = "int64", required = false) Long int64, @Multipart(value = "float", required = false) Float _float, @Multipart(value = "string", required = false) String _string, @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false) LocalDate _date, @Multipart(value = "dateTime", required = false) Date _dateTime, @Multipart(value = "password", required = false) String password, @Multipart(value = "callback", required = false) String paramCallback); /** * To test enum parameters diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java index dfd0ae304bf48..893bcc617aff3 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java @@ -17,7 +17,7 @@ public class FormatTest { @ApiModelProperty(value = "") - private Integer integer; + private Integer _integer; @ApiModelProperty(value = "") private Integer int32; @@ -36,7 +36,7 @@ public class FormatTest { private Double _double; @ApiModelProperty(value = "") - private String string; + private String _string; @ApiModelProperty(required = true, value = "") private byte[] _byte; @@ -45,37 +45,37 @@ public class FormatTest { private File binary; @ApiModelProperty(required = true, value = "") - private LocalDate date; + private LocalDate _date; @ApiModelProperty(value = "") - private Date dateTime; + private Date _dateTime; @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") - private UUID uuid; + private UUID _uuid; @ApiModelProperty(required = true, value = "") private String password; @ApiModelProperty(value = "") @Valid - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @JsonProperty("integer") @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } @@ -179,20 +179,20 @@ public FormatTest _double(Double _double) { } /** - * Get string - * @return string + * Get _string + * @return _string **/ @JsonProperty("string") @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } @@ -234,57 +234,57 @@ public FormatTest binary(File binary) { } /** - * Get date - * @return date + * Get _date + * @return _date **/ @JsonProperty("date") @NotNull public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty("dateTime") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public FormatTest dateTime(Date dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -308,20 +308,20 @@ public FormatTest password(String password) { } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } @@ -334,25 +334,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(integer, formatTest.integer) && + return Objects.equals(_integer, formatTest._integer) && Objects.equals(int32, formatTest.int32) && Objects.equals(int64, formatTest.int64) && Objects.equals(number, formatTest.number) && Objects.equals(_float, formatTest._float) && Objects.equals(_double, formatTest._double) && - Objects.equals(string, formatTest.string) && + Objects.equals(_string, formatTest._string) && Objects.equals(_byte, formatTest._byte) && Objects.equals(binary, formatTest.binary) && - Objects.equals(date, formatTest.date) && - Objects.equals(dateTime, formatTest.dateTime) && - Objects.equals(uuid, formatTest.uuid) && + Objects.equals(_date, formatTest._date) && + Objects.equals(_dateTime, formatTest._dateTime) && + Objects.equals(_uuid, formatTest._uuid) && Objects.equals(password, formatTest.password) && - Objects.equals(bigDecimal, formatTest.bigDecimal); + Objects.equals(_bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override @@ -360,20 +360,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 8e290019422af..1bcc31bf07ae1 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -16,70 +16,70 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @ApiModelProperty(value = "") - private UUID uuid; + private UUID _uuid; @ApiModelProperty(value = "") - private Date dateTime; + private Date _dateTime; @ApiModelProperty(value = "") @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty("dateTime") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - this.map.put(key, mapItem); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + this._map.put(key, _mapItem); return this; } @@ -92,14 +92,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(_uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(_dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(_map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -107,9 +107,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java index 899dfde8ef38f..7ba915b625efc 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java @@ -171,10 +171,10 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String string, - @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") LocalDate date,@ApiParam(value = "None") @FormParam("dateTime") OffsetDateTime dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext) + public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer _integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String _string, + @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") LocalDate _date,@ApiParam(value = "None") @FormParam("dateTime") OffsetDateTime _dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext); + return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binaryBodypart, _date, _dateTime, password, paramCallback, securityContext); } @javax.ws.rs.GET diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java index 3cc65be92b99f..972662a639889 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java @@ -34,7 +34,7 @@ public abstract class FakeApiService { public abstract Response testBodyWithFileSchema(FileSchemaTestClass body,SecurityContext securityContext) throws NotFoundException; public abstract Response testBodyWithQueryParams( @NotNull String query,User body,SecurityContext securityContext) throws NotFoundException; public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException; - public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,LocalDate date,OffsetDateTime dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; + public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer _integer,Integer int32,Long int64,Float _float,String _string,FormDataBodyPart binaryBodypart,LocalDate _date,OffsetDateTime _dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; public abstract Response testEnumParameters(List enumHeaderStringArray,String enumHeaderString,List enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException; public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException; public abstract Response testInlineAdditionalProperties(Map param,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java index 0d0dc03104af7..8a8cee7477e0d 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java @@ -52,7 +52,7 @@ public class FormatTest implements Serializable { public static final String JSON_PROPERTY_INTEGER = "integer"; @JsonProperty(JSON_PROPERTY_INTEGER) - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; @JsonProperty(JSON_PROPERTY_INT32) @@ -76,7 +76,7 @@ public class FormatTest implements Serializable { public static final String JSON_PROPERTY_STRING = "string"; @JsonProperty(JSON_PROPERTY_STRING) - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; @JsonProperty(JSON_PROPERTY_BYTE) @@ -88,15 +88,15 @@ public class FormatTest implements Serializable { public static final String JSON_PROPERTY_DATE = "date"; @JsonProperty(JSON_PROPERTY_DATE) - private LocalDate date; + private LocalDate _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @JsonProperty(JSON_PROPERTY_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; @JsonProperty(JSON_PROPERTY_UUID) - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; @JsonProperty(JSON_PROPERTY_PASSWORD) @@ -104,28 +104,28 @@ public class FormatTest implements Serializable { public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @JsonProperty(value = "integer") @ApiModelProperty(value = "") @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -236,24 +236,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @JsonProperty(value = "string") @ApiModelProperty(value = "") @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -296,64 +296,64 @@ public void setBinary(File binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @JsonProperty(value = "date") @ApiModelProperty(required = true, value = "") @NotNull public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty(value = "dateTime") @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty(value = "uuid") @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -376,24 +376,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @JsonProperty(value = "BigDecimal") @ApiModelProperty(value = "") @Valid public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -406,25 +406,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(integer, formatTest.integer) && + return Objects.equals(_integer, formatTest._integer) && Objects.equals(int32, formatTest.int32) && Objects.equals(int64, formatTest.int64) && Objects.equals(number, formatTest.number) && Objects.equals(_float, formatTest._float) && Objects.equals(_double, formatTest._double) && - Objects.equals(string, formatTest.string) && + Objects.equals(_string, formatTest._string) && Objects.equals(_byte, formatTest._byte) && Objects.equals(binary, formatTest.binary) && - Objects.equals(date, formatTest.date) && - Objects.equals(dateTime, formatTest.dateTime) && - Objects.equals(uuid, formatTest.uuid) && + Objects.equals(_date, formatTest._date) && + Objects.equals(_dateTime, formatTest._dateTime) && + Objects.equals(_uuid, formatTest._uuid) && Objects.equals(password, formatTest.password) && - Objects.equals(bigDecimal, formatTest.bigDecimal); + Objects.equals(_bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override @@ -432,20 +432,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 86a0fabb278dc..baa3a3c7fc4cd 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -40,82 +40,82 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { public static final String JSON_PROPERTY_UUID = "uuid"; @JsonProperty(JSON_PROPERTY_UUID) - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @JsonProperty(JSON_PROPERTY_DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty(value = "uuid") @ApiModelProperty(value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty(value = "dateTime") @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @JsonProperty(value = "map") @ApiModelProperty(value = "") @Valid public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -128,14 +128,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(_uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(_dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(_map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -143,9 +143,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index a0e15051506b6..98e8115c260ba 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -66,7 +66,7 @@ public Response testClientModel(Client body, SecurityContext securityContext) th return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException { + public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, FormDataBodyPart binaryBodypart, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java index 32c652a19ee83..d076b41251271 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java @@ -226,10 +226,10 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String string, - @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") Date date,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext) + public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer _integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String _string, + @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") Date _date,@ApiParam(value = "None") @FormParam("dateTime") Date _dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext); + return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binaryBodypart, _date, _dateTime, password, paramCallback, securityContext); } @javax.ws.rs.GET diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java index d42edf03a9a08..572284755ca26 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java @@ -43,7 +43,7 @@ public abstract class FakeApiService { public abstract Response testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass,SecurityContext securityContext) throws NotFoundException; public abstract Response testBodyWithQueryParams( @NotNull String query,User user,SecurityContext securityContext) throws NotFoundException; public abstract Response testClientModel(Client client,SecurityContext securityContext) throws NotFoundException; - public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; + public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer _integer,Integer int32,Long int64,Float _float,String _string,FormDataBodyPart binaryBodypart,Date _date,Date _dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; public abstract Response testEnumParameters(List enumHeaderStringArray,String enumHeaderString,List enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List enumQueryModelArray,List enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException; public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException; public abstract Response testInlineAdditionalProperties(Map requestBody,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java index 394551fa842cd..3c342dd72993a 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java @@ -34,26 +34,26 @@ public class FooGetDefaultResponse { public static final String JSON_PROPERTY_STRING = "string"; @JsonProperty(JSON_PROPERTY_STRING) - private Foo string; + private Foo _string; - public FooGetDefaultResponse string(Foo string) { - this.string = string; + public FooGetDefaultResponse _string(Foo _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @JsonProperty(value = "string") @ApiModelProperty(value = "") @Valid public Foo getString() { - return string; + return _string; } - public void setString(Foo string) { - this.string = string; + public void setString(Foo _string) { + this._string = _string; } @@ -66,12 +66,12 @@ public boolean equals(Object o) { return false; } FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; - return Objects.equals(string, fooGetDefaultResponse.string); + return Objects.equals(_string, fooGetDefaultResponse._string); } @Override public int hashCode() { - return Objects.hash(string); + return Objects.hash(_string); } @Override @@ -79,7 +79,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FooGetDefaultResponse {\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java index a785b2b0f7e28..ba1af49ed404a 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java @@ -52,7 +52,7 @@ public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; @JsonProperty(JSON_PROPERTY_INTEGER) - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; @JsonProperty(JSON_PROPERTY_INT32) @@ -80,7 +80,7 @@ public class FormatTest { public static final String JSON_PROPERTY_STRING = "string"; @JsonProperty(JSON_PROPERTY_STRING) - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; @JsonProperty(JSON_PROPERTY_BYTE) @@ -92,15 +92,15 @@ public class FormatTest { public static final String JSON_PROPERTY_DATE = "date"; @JsonProperty(JSON_PROPERTY_DATE) - private Date date; + private Date _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @JsonProperty(JSON_PROPERTY_DATE_TIME) - private Date dateTime; + private Date _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; @JsonProperty(JSON_PROPERTY_UUID) - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; @JsonProperty(JSON_PROPERTY_PASSWORD) @@ -114,26 +114,26 @@ public class FormatTest { @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER) private String patternWithDigitsAndDelimiter; - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @JsonProperty(value = "integer") @ApiModelProperty(value = "") @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -264,24 +264,24 @@ public void setDecimal(BigDecimal decimal) { this.decimal = decimal; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @JsonProperty(value = "string") @ApiModelProperty(value = "") @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -324,64 +324,64 @@ public void setBinary(File binary) { this.binary = binary; } - public FormatTest date(Date date) { - this.date = date; + public FormatTest _date(Date _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @JsonProperty(value = "date") @ApiModelProperty(required = true, value = "") @NotNull public Date getDate() { - return date; + return _date; } - public void setDate(Date date) { - this.date = date; + public void setDate(Date _date) { + this._date = _date; } - public FormatTest dateTime(Date dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty(value = "dateTime") @ApiModelProperty(value = "") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty(value = "uuid") @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -454,19 +454,19 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(integer, formatTest.integer) && + return Objects.equals(_integer, formatTest._integer) && Objects.equals(int32, formatTest.int32) && Objects.equals(int64, formatTest.int64) && Objects.equals(number, formatTest.number) && Objects.equals(_float, formatTest._float) && Objects.equals(_double, formatTest._double) && Objects.equals(decimal, formatTest.decimal) && - Objects.equals(string, formatTest.string) && + Objects.equals(_string, formatTest._string) && Objects.equals(_byte, formatTest._byte) && Objects.equals(binary, formatTest.binary) && - Objects.equals(date, formatTest.date) && - Objects.equals(dateTime, formatTest.dateTime) && - Objects.equals(uuid, formatTest.uuid) && + Objects.equals(_date, formatTest._date) && + Objects.equals(_dateTime, formatTest._dateTime) && + Objects.equals(_uuid, formatTest._uuid) && Objects.equals(password, formatTest.password) && Objects.equals(patternWithDigits, formatTest.patternWithDigits) && Objects.equals(patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); @@ -474,7 +474,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, _byte, binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); + return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, _byte, binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter); } @Override @@ -482,19 +482,19 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); sb.append(" decimal: ").append(toIndentedString(decimal)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n"); sb.append(" patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n"); diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index dfa842013c5a5..b7b83d412fc18 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,82 +39,82 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; @JsonProperty(JSON_PROPERTY_UUID) - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @JsonProperty(JSON_PROPERTY_DATE_TIME) - private Date dateTime; + private Date _dateTime; public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty(value = "uuid") @ApiModelProperty(value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty(value = "dateTime") @ApiModelProperty(value = "") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @JsonProperty(value = "map") @ApiModelProperty(value = "") @Valid public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -127,14 +127,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(_uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(_dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(_map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -142,9 +142,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 456badd43a57f..c762e5b2dcdbf 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -40,7 +40,7 @@ public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_UUID = "uuid"; @JsonProperty(JSON_PROPERTY_UUID) - private String uuid; + private String _uuid; public static final String JSON_PROPERTY_ID = "id"; @JsonProperty(JSON_PROPERTY_ID) @@ -54,24 +54,24 @@ public class ObjectWithDeprecatedFields { @JsonProperty(JSON_PROPERTY_BARS) private List bars; - public ObjectWithDeprecatedFields uuid(String uuid) { - this.uuid = uuid; + public ObjectWithDeprecatedFields _uuid(String _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty(value = "uuid") @ApiModelProperty(value = "") public String getUuid() { - return uuid; + return _uuid; } - public void setUuid(String uuid) { - this.uuid = uuid; + public void setUuid(String _uuid) { + this._uuid = _uuid; } public ObjectWithDeprecatedFields id(BigDecimal id) { @@ -152,7 +152,7 @@ public boolean equals(Object o) { return false; } ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; - return Objects.equals(uuid, objectWithDeprecatedFields.uuid) && + return Objects.equals(_uuid, objectWithDeprecatedFields._uuid) && Objects.equals(id, objectWithDeprecatedFields.id) && Objects.equals(deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(bars, objectWithDeprecatedFields.bars); @@ -160,7 +160,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(uuid, id, deprecatedRef, bars); + return Objects.hash(_uuid, id, deprecatedRef, bars); } @Override @@ -168,7 +168,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ObjectWithDeprecatedFields {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n"); sb.append(" bars: ").append(toIndentedString(bars)).append("\n"); diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 4490e6fe42131..ba5cc7072bd36 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -91,7 +91,7 @@ public Response testClientModel(Client client, SecurityContext securityContext) return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException { + public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, FormDataBodyPart binaryBodypart, Date _date, Date _dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java index 77b99b940cadb..6fb0807ca7fea 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java @@ -101,7 +101,7 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - void testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback); + void testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer _integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate _date,@FormParam(value = "dateTime") Date _dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback); @GET @Consumes({ "application/x-www-form-urlencoded" }) diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java index 8d71c957011a7..4c15fbceccb9e 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java @@ -25,27 +25,27 @@ @JsonTypeName("format_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FormatTest implements Serializable { - private @Valid Integer integer; + private @Valid Integer _integer; private @Valid Integer int32; private @Valid Long int64; private @Valid BigDecimal number; private @Valid Float _float; private @Valid Double _double; - private @Valid String string; + private @Valid String _string; private @Valid byte[] _byte; private @Valid File binary; - private @Valid LocalDate date; - private @Valid Date dateTime; - private @Valid UUID uuid; + private @Valid LocalDate _date; + private @Valid Date _dateTime; + private @Valid UUID _uuid; private @Valid String password; - private @Valid BigDecimal bigDecimal; + private @Valid BigDecimal _bigDecimal; /** * minimum: 10 * maximum: 100 **/ - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } @@ -53,12 +53,12 @@ public FormatTest integer(Integer integer) { @ApiModelProperty(value = "") @JsonProperty("integer") @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty("integer") - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } /** @@ -167,8 +167,8 @@ public void setDouble(Double _double) { /** **/ - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } @@ -176,12 +176,12 @@ public FormatTest string(String string) { @ApiModelProperty(value = "") @JsonProperty("string") @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } @JsonProperty("string") - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } /** @@ -225,8 +225,8 @@ public void setBinary(File binary) { /** **/ - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } @@ -235,18 +235,18 @@ public FormatTest date(LocalDate date) { @JsonProperty("date") @NotNull public LocalDate getDate() { - return date; + return _date; } @JsonProperty("date") - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } /** **/ - public FormatTest dateTime(Date dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } @@ -254,18 +254,18 @@ public FormatTest dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty("dateTime") - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } /** **/ - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -273,12 +273,12 @@ public FormatTest uuid(UUID uuid) { @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty("uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** @@ -303,8 +303,8 @@ public void setPassword(String password) { /** **/ - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } @@ -312,12 +312,12 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty("BigDecimal") - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -330,25 +330,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override @@ -356,20 +356,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 01d4be09cbfaf..83b805b91f013 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -23,14 +23,14 @@ @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid Date dateTime; - private @Valid Map map = new HashMap<>(); + private @Valid UUID _uuid; + private @Valid Date _dateTime; + private @Valid Map _map = new HashMap<>(); /** **/ - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -38,18 +38,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty("uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** **/ - public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } @@ -57,18 +57,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty("dateTime") - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } @@ -76,26 +76,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } @JsonProperty("map") - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } - public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(Animal mapItem) { - if (mapItem != null && this.map != null) { - this.map.remove(mapItem); + public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(Animal _mapItem) { + if (_mapItem != null && this._map != null) { + this._map.remove(_mapItem); } return this; @@ -110,14 +110,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -125,9 +125,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java index 3b839c28295f5..e6c8ba0a4d4f2 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java @@ -126,7 +126,7 @@ public Response testClientModel(@Valid @NotNull Client body) { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer _integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate _date,@FormParam(value = "dateTime") Date _dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java index 8baa28ee4312d..719a97cc855e5 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java @@ -25,36 +25,36 @@ @JsonTypeName("format_test") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FormatTest implements Serializable { - private @Valid Integer integer; + private @Valid Integer _integer; private @Valid Integer int32; private @Valid Long int64; private @Valid BigDecimal number; private @Valid Float _float; private @Valid Double _double; - private @Valid String string; + private @Valid String _string; private @Valid byte[] _byte; private @Valid File binary; - private @Valid LocalDate date; - private @Valid Date dateTime; - private @Valid UUID uuid; + private @Valid LocalDate _date; + private @Valid Date _dateTime; + private @Valid UUID _uuid; private @Valid String password; - private @Valid BigDecimal bigDecimal; + private @Valid BigDecimal _bigDecimal; protected FormatTest(FormatTestBuilder b) { - this.integer = b.integer; + this._integer = b._integer; this.int32 = b.int32; this.int64 = b.int64; this.number = b.number; this._float = b._float; this._double = b._double; - this.string = b.string; + this._string = b._string; this._byte = b._byte; this.binary = b.binary; - this.date = b.date; - this.dateTime = b.dateTime; - this.uuid = b.uuid; + this._date = b._date; + this._dateTime = b._dateTime; + this._uuid = b._uuid; this.password = b.password; - this.bigDecimal = b.bigDecimal; + this._bigDecimal = b._bigDecimal; } public FormatTest() { @@ -64,8 +64,8 @@ public FormatTest() { * minimum: 10 * maximum: 100 **/ - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } @@ -73,12 +73,12 @@ public FormatTest integer(Integer integer) { @ApiModelProperty(value = "") @JsonProperty("integer") @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty("integer") - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } /** @@ -187,8 +187,8 @@ public void setDouble(Double _double) { /** **/ - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } @@ -196,12 +196,12 @@ public FormatTest string(String string) { @ApiModelProperty(value = "") @JsonProperty("string") @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } @JsonProperty("string") - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } /** @@ -245,8 +245,8 @@ public void setBinary(File binary) { /** **/ - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } @@ -255,18 +255,18 @@ public FormatTest date(LocalDate date) { @JsonProperty("date") @NotNull public LocalDate getDate() { - return date; + return _date; } @JsonProperty("date") - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } /** **/ - public FormatTest dateTime(Date dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } @@ -274,18 +274,18 @@ public FormatTest dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty("dateTime") - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } /** **/ - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -293,12 +293,12 @@ public FormatTest uuid(UUID uuid) { @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty("uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** @@ -323,8 +323,8 @@ public void setPassword(String password) { /** **/ - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } @@ -332,12 +332,12 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty("BigDecimal") - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -350,25 +350,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override @@ -376,20 +376,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } @@ -424,26 +424,26 @@ public FormatTest build() { } public static abstract class FormatTestBuilder> { - private Integer integer; + private Integer _integer; private Integer int32; private Long int64; private BigDecimal number; private Float _float; private Double _double; - private String string; + private String _string; private byte[] _byte; private File binary; - private LocalDate date; - private Date dateTime; - private UUID uuid; + private LocalDate _date; + private Date _dateTime; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; protected abstract B self(); public abstract C build(); - public B integer(Integer integer) { - this.integer = integer; + public B _integer(Integer _integer) { + this._integer = _integer; return self(); } public B int32(Integer int32) { @@ -466,8 +466,8 @@ public B _double(Double _double) { this._double = _double; return self(); } - public B string(String string) { - this.string = string; + public B _string(String _string) { + this._string = _string; return self(); } public B _byte(byte[] _byte) { @@ -478,24 +478,24 @@ public B binary(File binary) { this.binary = binary; return self(); } - public B date(LocalDate date) { - this.date = date; + public B _date(LocalDate _date) { + this._date = _date; return self(); } - public B dateTime(Date dateTime) { - this.dateTime = dateTime; + public B _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return self(); } - public B uuid(UUID uuid) { - this.uuid = uuid; + public B _uuid(UUID _uuid) { + this._uuid = _uuid; return self(); } public B password(String password) { this.password = password; return self(); } - public B bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public B _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return self(); } } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6e5d8d9d466ce..1fce0e65168f8 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -23,14 +23,14 @@ @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid Date dateTime; - private @Valid Map map = new HashMap<>(); + private @Valid UUID _uuid; + private @Valid Date _dateTime; + private @Valid Map _map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { - this.uuid = b.uuid; - this.dateTime = b.dateTime; - this.map = b.map; + this._uuid = b._uuid; + this._dateTime = b._dateTime; + this._map = b._map; } public MixedPropertiesAndAdditionalPropertiesClass() { @@ -38,8 +38,8 @@ public MixedPropertiesAndAdditionalPropertiesClass() { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -47,18 +47,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty("uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** **/ - public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } @@ -66,18 +66,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty("dateTime") - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } @@ -85,26 +85,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } @JsonProperty("map") - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } - public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(Animal mapItem) { - if (mapItem != null && this.map != null) { - this.map.remove(mapItem); + public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(Animal _mapItem) { + if (_mapItem != null && this._map != null) { + this._map.remove(_mapItem); } return this; @@ -119,14 +119,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -134,9 +134,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } @@ -171,23 +171,23 @@ public MixedPropertiesAndAdditionalPropertiesClass build() { } public static abstract class MixedPropertiesAndAdditionalPropertiesClassBuilder> { - private UUID uuid; - private Date dateTime; - private Map map = new HashMap<>(); + private UUID _uuid; + private Date _dateTime; + private Map _map = new HashMap<>(); protected abstract B self(); public abstract C build(); - public B uuid(UUID uuid) { - this.uuid = uuid; + public B _uuid(UUID _uuid) { + this._uuid = _uuid; return self(); } - public B dateTime(Date dateTime) { - this.dateTime = dateTime; + public B _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return self(); } - public B map(Map map) { - this.map = map; + public B _map(Map _map) { + this._map = _map; return self(); } } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/FakeApi.java index ff33d5f579761..b62962e164754 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/FakeApi.java @@ -203,7 +203,7 @@ public Response testClientModel(@Valid @NotNull Client body) { }) }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") LocalDateTime dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer _integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate _date,@FormParam(value = "dateTime") LocalDateTime _dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java index 4bf137765e8e1..e317358f6064d 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java @@ -23,36 +23,36 @@ @JsonTypeName("format_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FormatTest implements Serializable { - private @Valid Integer integer; + private @Valid Integer _integer; private @Valid Integer int32; private @Valid Long int64; private @Valid BigDecimal number; private @Valid Float _float; private @Valid Double _double; - private @Valid String string; + private @Valid String _string; private @Valid byte[] _byte; private @Valid File binary; - private @Valid LocalDate date; - private @Valid LocalDateTime dateTime; - private @Valid UUID uuid; + private @Valid LocalDate _date; + private @Valid LocalDateTime _dateTime; + private @Valid UUID _uuid; private @Valid String password; - private @Valid BigDecimal bigDecimal; + private @Valid BigDecimal _bigDecimal; protected FormatTest(FormatTestBuilder b) { - this.integer = b.integer; + this._integer = b._integer; this.int32 = b.int32; this.int64 = b.int64; this.number = b.number; this._float = b._float; this._double = b._double; - this.string = b.string; + this._string = b._string; this._byte = b._byte; this.binary = b.binary; - this.date = b.date; - this.dateTime = b.dateTime; - this.uuid = b.uuid; + this._date = b._date; + this._dateTime = b._dateTime; + this._uuid = b._uuid; this.password = b.password; - this.bigDecimal = b.bigDecimal; + this._bigDecimal = b._bigDecimal; } public FormatTest() { @@ -62,8 +62,8 @@ public FormatTest() { * minimum: 10 * maximum: 100 **/ - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } @@ -71,12 +71,12 @@ public FormatTest integer(Integer integer) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("integer") @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty("integer") - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } /** @@ -185,8 +185,8 @@ public void setDouble(Double _double) { /** **/ - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } @@ -194,12 +194,12 @@ public FormatTest string(String string) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("string") @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } @JsonProperty("string") - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } /** @@ -243,8 +243,8 @@ public void setBinary(File binary) { /** **/ - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } @@ -253,18 +253,18 @@ public FormatTest date(LocalDate date) { @JsonProperty("date") @NotNull public LocalDate getDate() { - return date; + return _date; } @JsonProperty("date") - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } /** **/ - public FormatTest dateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; return this; } @@ -272,18 +272,18 @@ public FormatTest dateTime(LocalDateTime dateTime) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("dateTime") public LocalDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty("dateTime") - public void setDateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; } /** **/ - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -291,12 +291,12 @@ public FormatTest uuid(UUID uuid) { @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", description = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty("uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** @@ -321,8 +321,8 @@ public void setPassword(String password) { /** **/ - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } @@ -330,12 +330,12 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty("BigDecimal") - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -348,25 +348,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override @@ -374,20 +374,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } @@ -422,26 +422,26 @@ public FormatTest build() { } public static abstract class FormatTestBuilder> { - private Integer integer; + private Integer _integer; private Integer int32; private Long int64; private BigDecimal number; private Float _float; private Double _double; - private String string; + private String _string; private byte[] _byte; private File binary; - private LocalDate date; - private LocalDateTime dateTime; - private UUID uuid; + private LocalDate _date; + private LocalDateTime _dateTime; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; protected abstract B self(); public abstract C build(); - public B integer(Integer integer) { - this.integer = integer; + public B _integer(Integer _integer) { + this._integer = _integer; return self(); } public B int32(Integer int32) { @@ -464,8 +464,8 @@ public B _double(Double _double) { this._double = _double; return self(); } - public B string(String string) { - this.string = string; + public B _string(String _string) { + this._string = _string; return self(); } public B _byte(byte[] _byte) { @@ -476,24 +476,24 @@ public B binary(File binary) { this.binary = binary; return self(); } - public B date(LocalDate date) { - this.date = date; + public B _date(LocalDate _date) { + this._date = _date; return self(); } - public B dateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public B _dateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; return self(); } - public B uuid(UUID uuid) { - this.uuid = uuid; + public B _uuid(UUID _uuid) { + this._uuid = _uuid; return self(); } public B password(String password) { this.password = password; return self(); } - public B bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public B _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return self(); } } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index bab8ecb9aa91f..238dcce82ebe7 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -21,14 +21,14 @@ @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid LocalDateTime dateTime; - private @Valid Map map = new HashMap<>(); + private @Valid UUID _uuid; + private @Valid LocalDateTime _dateTime; + private @Valid Map _map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { - this.uuid = b.uuid; - this.dateTime = b.dateTime; - this.map = b.map; + this._uuid = b._uuid; + this._dateTime = b._dateTime; + this._map = b._map; } public MixedPropertiesAndAdditionalPropertiesClass() { @@ -36,8 +36,8 @@ public MixedPropertiesAndAdditionalPropertiesClass() { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -45,18 +45,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty("uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** **/ - public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; return this; } @@ -64,18 +64,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTi @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("dateTime") public LocalDateTime getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty("dateTime") - public void setDateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; } /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } @@ -83,26 +83,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } @JsonProperty("map") - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } - public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(Animal mapItem) { - if (mapItem != null && this.map != null) { - this.map.remove(mapItem); + public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(Animal _mapItem) { + if (_mapItem != null && this._map != null) { + this._map.remove(_mapItem); } return this; @@ -117,14 +117,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -132,9 +132,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } @@ -169,23 +169,23 @@ public MixedPropertiesAndAdditionalPropertiesClass build() { } public static abstract class MixedPropertiesAndAdditionalPropertiesClassBuilder> { - private UUID uuid; - private LocalDateTime dateTime; - private Map map = new HashMap<>(); + private UUID _uuid; + private LocalDateTime _dateTime; + private Map _map = new HashMap<>(); protected abstract B self(); public abstract C build(); - public B uuid(UUID uuid) { - this.uuid = uuid; + public B _uuid(UUID _uuid) { + this._uuid = _uuid; return self(); } - public B dateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; + public B _dateTime(LocalDateTime _dateTime) { + this._dateTime = _dateTime; return self(); } - public B map(Map map) { - this.map = map; + public B _map(Map _map) { + this._map = _map; return self(); } } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java index 43f4d635a0789..a206e7ab35636 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java @@ -126,7 +126,7 @@ public Response testClientModel(@Valid @NotNull Client body) { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer _integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate _date,@FormParam(value = "dateTime") Date _dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java index f64ed7b22ce55..45bf445e8a301 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java @@ -25,36 +25,36 @@ @JsonTypeName("format_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FormatTest implements Serializable { - private @Valid Integer integer; + private @Valid Integer _integer; private @Valid Integer int32; private @Valid Long int64; private @Valid BigDecimal number; private @Valid Float _float; private @Valid Double _double; - private @Valid String string; + private @Valid String _string; private @Valid byte[] _byte; private @Valid File binary; - private @Valid LocalDate date; - private @Valid Date dateTime; - private @Valid UUID uuid; + private @Valid LocalDate _date; + private @Valid Date _dateTime; + private @Valid UUID _uuid; private @Valid String password; - private @Valid BigDecimal bigDecimal; + private @Valid BigDecimal _bigDecimal; protected FormatTest(FormatTestBuilder b) { - this.integer = b.integer; + this._integer = b._integer; this.int32 = b.int32; this.int64 = b.int64; this.number = b.number; this._float = b._float; this._double = b._double; - this.string = b.string; + this._string = b._string; this._byte = b._byte; this.binary = b.binary; - this.date = b.date; - this.dateTime = b.dateTime; - this.uuid = b.uuid; + this._date = b._date; + this._dateTime = b._dateTime; + this._uuid = b._uuid; this.password = b.password; - this.bigDecimal = b.bigDecimal; + this._bigDecimal = b._bigDecimal; } public FormatTest() { @@ -64,8 +64,8 @@ public FormatTest() { * minimum: 10 * maximum: 100 **/ - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } @@ -73,12 +73,12 @@ public FormatTest integer(Integer integer) { @ApiModelProperty(value = "") @JsonProperty("integer") @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } @JsonProperty("integer") - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } /** @@ -187,8 +187,8 @@ public void setDouble(Double _double) { /** **/ - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } @@ -196,12 +196,12 @@ public FormatTest string(String string) { @ApiModelProperty(value = "") @JsonProperty("string") @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } @JsonProperty("string") - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } /** @@ -245,8 +245,8 @@ public void setBinary(File binary) { /** **/ - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } @@ -255,18 +255,18 @@ public FormatTest date(LocalDate date) { @JsonProperty("date") @NotNull public LocalDate getDate() { - return date; + return _date; } @JsonProperty("date") - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } /** **/ - public FormatTest dateTime(Date dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } @@ -274,18 +274,18 @@ public FormatTest dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty("dateTime") - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } /** **/ - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -293,12 +293,12 @@ public FormatTest uuid(UUID uuid) { @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty("uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** @@ -323,8 +323,8 @@ public void setPassword(String password) { /** **/ - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } @@ -332,12 +332,12 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } @JsonProperty("BigDecimal") - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -350,25 +350,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override @@ -376,20 +376,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } @@ -424,26 +424,26 @@ public FormatTest build() { } public static abstract class FormatTestBuilder> { - private Integer integer; + private Integer _integer; private Integer int32; private Long int64; private BigDecimal number; private Float _float; private Double _double; - private String string; + private String _string; private byte[] _byte; private File binary; - private LocalDate date; - private Date dateTime; - private UUID uuid; + private LocalDate _date; + private Date _dateTime; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; protected abstract B self(); public abstract C build(); - public B integer(Integer integer) { - this.integer = integer; + public B _integer(Integer _integer) { + this._integer = _integer; return self(); } public B int32(Integer int32) { @@ -466,8 +466,8 @@ public B _double(Double _double) { this._double = _double; return self(); } - public B string(String string) { - this.string = string; + public B _string(String _string) { + this._string = _string; return self(); } public B _byte(byte[] _byte) { @@ -478,24 +478,24 @@ public B binary(File binary) { this.binary = binary; return self(); } - public B date(LocalDate date) { - this.date = date; + public B _date(LocalDate _date) { + this._date = _date; return self(); } - public B dateTime(Date dateTime) { - this.dateTime = dateTime; + public B _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return self(); } - public B uuid(UUID uuid) { - this.uuid = uuid; + public B _uuid(UUID _uuid) { + this._uuid = _uuid; return self(); } public B password(String password) { this.password = password; return self(); } - public B bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public B _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return self(); } } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 9412491c8bdd0..47235009bb544 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -23,14 +23,14 @@ @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - private @Valid UUID uuid; - private @Valid Date dateTime; - private @Valid Map map = new HashMap<>(); + private @Valid UUID _uuid; + private @Valid Date _dateTime; + private @Valid Map _map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { - this.uuid = b.uuid; - this.dateTime = b.dateTime; - this.map = b.map; + this._uuid = b._uuid; + this._dateTime = b._dateTime; + this._map = b._map; } public MixedPropertiesAndAdditionalPropertiesClass() { @@ -38,8 +38,8 @@ public MixedPropertiesAndAdditionalPropertiesClass() { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } @@ -47,18 +47,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } @JsonProperty("uuid") - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } /** **/ - public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } @@ -66,18 +66,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { - return dateTime; + return _dateTime; } @JsonProperty("dateTime") - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } @@ -85,26 +85,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } @JsonProperty("map") - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } - public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(Animal mapItem) { - if (mapItem != null && this.map != null) { - this.map.remove(mapItem); + public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(Animal _mapItem) { + if (_mapItem != null && this._map != null) { + this._map.remove(_mapItem); } return this; @@ -119,14 +119,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -134,9 +134,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } @@ -171,23 +171,23 @@ public MixedPropertiesAndAdditionalPropertiesClass build() { } public static abstract class MixedPropertiesAndAdditionalPropertiesClassBuilder> { - private UUID uuid; - private Date dateTime; - private Map map = new HashMap<>(); + private UUID _uuid; + private Date _dateTime; + private Map _map = new HashMap<>(); protected abstract B self(); public abstract C build(); - public B uuid(UUID uuid) { - this.uuid = uuid; + public B _uuid(UUID _uuid) { + this._uuid = _uuid; return self(); } - public B dateTime(Date dateTime) { - this.dateTime = dateTime; + public B _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return self(); } - public B map(Map map) { - this.map = map; + public B _map(Map _map) { + this._map = _map; return self(); } } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java index b37b7cad26e75..42005aab965d2 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -169,10 +169,10 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String string, - @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") Date date,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext) + public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer _integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String _string, + @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") Date _date,@ApiParam(value = "None") @FormParam("dateTime") Date _dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext); + return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binaryBodypart, _date, _dateTime, password, paramCallback, securityContext); } @javax.ws.rs.GET diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java index 119c6a70f68fb..bf23ee6097192 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java @@ -32,7 +32,7 @@ public abstract class FakeApiService { public abstract Response testBodyWithFileSchema(FileSchemaTestClass body,SecurityContext securityContext) throws NotFoundException; public abstract Response testBodyWithQueryParams( @NotNull String query,User body,SecurityContext securityContext) throws NotFoundException; public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException; - public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; + public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer _integer,Integer int32,Long int64,Float _float,String _string,FormDataBodyPart binaryBodypart,Date _date,Date _dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; public abstract Response testEnumParameters(List enumHeaderStringArray,String enumHeaderString,List enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException; public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException; public abstract Response testInlineAdditionalProperties(Map param,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java index 114a70310b10e..abf30af98a08c 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java @@ -50,7 +50,7 @@ public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; @JsonProperty(JSON_PROPERTY_INTEGER) - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; @JsonProperty(JSON_PROPERTY_INT32) @@ -74,7 +74,7 @@ public class FormatTest { public static final String JSON_PROPERTY_STRING = "string"; @JsonProperty(JSON_PROPERTY_STRING) - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; @JsonProperty(JSON_PROPERTY_BYTE) @@ -86,15 +86,15 @@ public class FormatTest { public static final String JSON_PROPERTY_DATE = "date"; @JsonProperty(JSON_PROPERTY_DATE) - private Date date; + private Date _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @JsonProperty(JSON_PROPERTY_DATE_TIME) - private Date dateTime; + private Date _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; @JsonProperty(JSON_PROPERTY_UUID) - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; @JsonProperty(JSON_PROPERTY_PASSWORD) @@ -102,28 +102,28 @@ public class FormatTest { public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @JsonProperty(value = "integer") @ApiModelProperty(value = "") @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -234,24 +234,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @JsonProperty(value = "string") @ApiModelProperty(value = "") @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -294,64 +294,64 @@ public void setBinary(File binary) { this.binary = binary; } - public FormatTest date(Date date) { - this.date = date; + public FormatTest _date(Date _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @JsonProperty(value = "date") @ApiModelProperty(required = true, value = "") @NotNull public Date getDate() { - return date; + return _date; } - public void setDate(Date date) { - this.date = date; + public void setDate(Date _date) { + this._date = _date; } - public FormatTest dateTime(Date dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty(value = "dateTime") @ApiModelProperty(value = "") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty(value = "uuid") @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -374,24 +374,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @JsonProperty(value = "BigDecimal") @ApiModelProperty(value = "") @Valid public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -404,25 +404,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(integer, formatTest.integer) && + return Objects.equals(_integer, formatTest._integer) && Objects.equals(int32, formatTest.int32) && Objects.equals(int64, formatTest.int64) && Objects.equals(number, formatTest.number) && Objects.equals(_float, formatTest._float) && Objects.equals(_double, formatTest._double) && - Objects.equals(string, formatTest.string) && + Objects.equals(_string, formatTest._string) && Objects.equals(_byte, formatTest._byte) && Objects.equals(binary, formatTest.binary) && - Objects.equals(date, formatTest.date) && - Objects.equals(dateTime, formatTest.dateTime) && - Objects.equals(uuid, formatTest.uuid) && + Objects.equals(_date, formatTest._date) && + Objects.equals(_dateTime, formatTest._dateTime) && + Objects.equals(_uuid, formatTest._uuid) && Objects.equals(password, formatTest.password) && - Objects.equals(bigDecimal, formatTest.bigDecimal); + Objects.equals(_bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override @@ -430,20 +430,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index dfa842013c5a5..b7b83d412fc18 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,82 +39,82 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; @JsonProperty(JSON_PROPERTY_UUID) - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @JsonProperty(JSON_PROPERTY_DATE_TIME) - private Date dateTime; + private Date _dateTime; public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty(value = "uuid") @ApiModelProperty(value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty(value = "dateTime") @ApiModelProperty(value = "") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @JsonProperty(value = "map") @ApiModelProperty(value = "") @Valid public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -127,14 +127,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(_uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(_dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(_map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -142,9 +142,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index aa26da980b8ab..49792e619fa20 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -64,7 +64,7 @@ public Response testClientModel(Client body, SecurityContext securityContext) th return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException { + public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, FormDataBodyPart binaryBodypart, Date _date, Date _dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java index ad937f064f9ef..c015d86f85b9c 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java @@ -170,10 +170,10 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String string, - @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") Date date,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext) + public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer _integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String _string, + @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") Date _date,@ApiParam(value = "None") @FormParam("dateTime") Date _dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext); + return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binaryBodypart, _date, _dateTime, password, paramCallback, securityContext); } @javax.ws.rs.GET diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java index c46e98aebc478..fb3ac9b2cb4b2 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java @@ -33,7 +33,7 @@ public abstract class FakeApiService { public abstract Response testBodyWithFileSchema(FileSchemaTestClass body,SecurityContext securityContext) throws NotFoundException; public abstract Response testBodyWithQueryParams( @NotNull String query,User body,SecurityContext securityContext) throws NotFoundException; public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException; - public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; + public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer _integer,Integer int32,Long int64,Float _float,String _string,FormDataBodyPart binaryBodypart,Date _date,Date _dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; public abstract Response testEnumParameters(List enumHeaderStringArray,String enumHeaderString,List enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException; public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException; public abstract Response testInlineAdditionalProperties(Map param,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java index 114a70310b10e..abf30af98a08c 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java @@ -50,7 +50,7 @@ public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; @JsonProperty(JSON_PROPERTY_INTEGER) - private Integer integer; + private Integer _integer; public static final String JSON_PROPERTY_INT32 = "int32"; @JsonProperty(JSON_PROPERTY_INT32) @@ -74,7 +74,7 @@ public class FormatTest { public static final String JSON_PROPERTY_STRING = "string"; @JsonProperty(JSON_PROPERTY_STRING) - private String string; + private String _string; public static final String JSON_PROPERTY_BYTE = "byte"; @JsonProperty(JSON_PROPERTY_BYTE) @@ -86,15 +86,15 @@ public class FormatTest { public static final String JSON_PROPERTY_DATE = "date"; @JsonProperty(JSON_PROPERTY_DATE) - private Date date; + private Date _date; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @JsonProperty(JSON_PROPERTY_DATE_TIME) - private Date dateTime; + private Date _dateTime; public static final String JSON_PROPERTY_UUID = "uuid"; @JsonProperty(JSON_PROPERTY_UUID) - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_PASSWORD = "password"; @JsonProperty(JSON_PROPERTY_PASSWORD) @@ -102,28 +102,28 @@ public class FormatTest { public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer **/ @JsonProperty(value = "integer") @ApiModelProperty(value = "") @Min(10) @Max(100) public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -234,24 +234,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string **/ @JsonProperty(value = "string") @ApiModelProperty(value = "") @Pattern(regexp="/[a-z]/i") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -294,64 +294,64 @@ public void setBinary(File binary) { this.binary = binary; } - public FormatTest date(Date date) { - this.date = date; + public FormatTest _date(Date _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date **/ @JsonProperty(value = "date") @ApiModelProperty(required = true, value = "") @NotNull public Date getDate() { - return date; + return _date; } - public void setDate(Date date) { - this.date = date; + public void setDate(Date _date) { + this._date = _date; } - public FormatTest dateTime(Date dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty(value = "dateTime") @ApiModelProperty(value = "") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty(value = "uuid") @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -374,24 +374,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal **/ @JsonProperty(value = "BigDecimal") @ApiModelProperty(value = "") @Valid public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @@ -404,25 +404,25 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(integer, formatTest.integer) && + return Objects.equals(_integer, formatTest._integer) && Objects.equals(int32, formatTest.int32) && Objects.equals(int64, formatTest.int64) && Objects.equals(number, formatTest.number) && Objects.equals(_float, formatTest._float) && Objects.equals(_double, formatTest._double) && - Objects.equals(string, formatTest.string) && + Objects.equals(_string, formatTest._string) && Objects.equals(_byte, formatTest._byte) && Objects.equals(binary, formatTest.binary) && - Objects.equals(date, formatTest.date) && - Objects.equals(dateTime, formatTest.dateTime) && - Objects.equals(uuid, formatTest.uuid) && + Objects.equals(_date, formatTest._date) && + Objects.equals(_dateTime, formatTest._dateTime) && + Objects.equals(_uuid, formatTest._uuid) && Objects.equals(password, formatTest.password) && - Objects.equals(bigDecimal, formatTest.bigDecimal); + Objects.equals(_bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override @@ -430,20 +430,20 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index dfa842013c5a5..b7b83d412fc18 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,82 +39,82 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; @JsonProperty(JSON_PROPERTY_UUID) - private UUID uuid; + private UUID _uuid; public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; @JsonProperty(JSON_PROPERTY_DATE_TIME) - private Date dateTime; + private Date _dateTime; public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid **/ @JsonProperty(value = "uuid") @ApiModelProperty(value = "") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime **/ @JsonProperty(value = "dateTime") @ApiModelProperty(value = "") public Date getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(Date dateTime) { - this.dateTime = dateTime; + public void setDateTime(Date _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map **/ @JsonProperty(value = "map") @ApiModelProperty(value = "") @Valid public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @@ -127,14 +127,14 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(_uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(_dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(_map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override @@ -142,9 +142,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index c73b41f742248..6159af73c3aca 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -65,7 +65,7 @@ public Response testClientModel(Client body, SecurityContext securityContext) th return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException { + public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, FormDataBodyPart binaryBodypart, Date _date, Date _dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index e2a4f6e93af12..b6d7f46fd6435 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -308,14 +308,14 @@ ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -345,14 +345,14 @@ ResponseEntity testEndpointParameters( @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string, + @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string, @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) throws Exception; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java index dfc230959b208..43b46417231dd 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java @@ -29,7 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -41,23 +41,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -66,33 +66,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -203,24 +203,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -343,24 +343,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -372,45 +372,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 7dd078dbaa801..dca4f3609f0f5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,80 +27,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -112,23 +112,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 00ece07e0c198..37ae4afd741eb 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -359,14 +359,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -396,14 +396,14 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java index d0c9f78571d52..6886867806e2b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java @@ -29,7 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -41,23 +41,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -66,33 +66,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -203,24 +203,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -343,24 +343,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -372,45 +372,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 205b8049fefa0..e860c1057eadf 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,80 +27,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -112,23 +112,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 00ece07e0c198..37ae4afd741eb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -359,14 +359,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -396,14 +396,14 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index c45620b8dae19..a3c04b8c5ce19 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -319,14 +319,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -356,18 +356,18 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index e04c34be3b065..4b16e092d6094 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -189,14 +189,14 @@ default ResponseEntity testClientModel(Client client) { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -207,14 +207,14 @@ default ResponseEntity testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, - Integer integer, + Integer _integer, Integer int32, Long int64, Float _float, - String string, + String _string, MultipartFile binary, - LocalDate date, - OffsetDateTime dateTime, + LocalDate _date, + OffsetDateTime _dateTime, String password, String paramCallback) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index c45620b8dae19..a3c04b8c5ce19 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -319,14 +319,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -356,18 +356,18 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index e04c34be3b065..4b16e092d6094 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -189,14 +189,14 @@ default ResponseEntity testClientModel(Client client) { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -207,14 +207,14 @@ default ResponseEntity testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, - Integer integer, + Integer _integer, Integer int32, Long int64, Float _float, - String string, + String _string, MultipartFile binary, - LocalDate date, - OffsetDateTime dateTime, + LocalDate _date, + OffsetDateTime _dateTime, String password, String paramCallback) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index c1dca403316b4..9f5a92785d186 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -359,14 +359,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -396,14 +396,14 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java index 77fdd3109b368..40c69c1a489cd 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java @@ -342,14 +342,14 @@ default Mono testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -380,19 +380,19 @@ default Mono testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) Flux binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, exchange); } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApiDelegate.java index e606ecfe26a42..70daff05555d5 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -214,14 +214,14 @@ default Mono testClientModel(Mono client, * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -232,14 +232,14 @@ default Mono testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, - Integer integer, + Integer _integer, Integer int32, Long int64, Float _float, - String string, + String _string, Flux binary, - LocalDate date, - OffsetDateTime dateTime, + LocalDate _date, + OffsetDateTime _dateTime, String password, String paramCallback, ServerWebExchange exchange) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index 4916727a2dcb1..8ca50dadb30ca 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -333,14 +333,14 @@ default Mono> testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -370,19 +370,19 @@ default Mono> testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) Flux binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, exchange); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index e1303c319373a..85d94fcb808ec 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -215,14 +215,14 @@ default Mono> testClientModel(Mono client, * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -233,14 +233,14 @@ default Mono> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, - Integer integer, + Integer _integer, Integer int32, Long int64, Float _float, - String string, + String _string, Flux binary, - LocalDate date, - OffsetDateTime dateTime, + LocalDate _date, + OffsetDateTime _dateTime, String password, String paramCallback, ServerWebExchange exchange) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 96dce92fe5704..d0946a2b49ec3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -284,14 +284,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -321,18 +321,18 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index 24d83e90bd8df..9bdaeedf4b45a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -166,14 +166,14 @@ default ResponseEntity testClientModel(Client body) { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -184,14 +184,14 @@ default ResponseEntity testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, - Integer integer, + Integer _integer, Integer int32, Long int64, Float _float, - String string, + String _string, MultipartFile binary, - LocalDate date, - OffsetDateTime dateTime, + LocalDate _date, + OffsetDateTime _dateTime, String password, String paramCallback) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index 96dce92fe5704..d0946a2b49ec3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -284,14 +284,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -321,18 +321,18 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java index 24d83e90bd8df..9bdaeedf4b45a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -166,14 +166,14 @@ default ResponseEntity testClientModel(Client body) { * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -184,14 +184,14 @@ default ResponseEntity testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, - Integer integer, + Integer _integer, Integer int32, Long int64, Float _float, - String string, + String _string, MultipartFile binary, - LocalDate date, - OffsetDateTime dateTime, + LocalDate _date, + OffsetDateTime _dateTime, String password, String paramCallback) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index b6cb0c0b58a4a..39f2cf4b854b8 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -314,14 +314,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -351,14 +351,14 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index b6cb0c0b58a4a..39f2cf4b854b8 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -314,14 +314,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -351,14 +351,14 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index b7765e99b8f0a..2719728e53791 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -359,14 +359,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -396,14 +396,14 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java index 7a7c86d8be76b..7bfcb941982df 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -67,33 +67,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 075d281eb4bc7..29c350c0c4d19 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,80 +28,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -113,23 +113,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index cdabe80efd834..daada9dc3a853 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -378,14 +378,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -416,14 +416,14 @@ default ResponseEntity testEndpointParameters( @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string, + @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string, @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java index 11e1f03b3130c..5d4bc5f23453d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java @@ -29,7 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTest { - private Integer integer; + private Integer _integer; private Integer int32; @@ -41,23 +41,23 @@ public class FormatTest { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTest() { super(); @@ -66,33 +66,33 @@ public FormatTest() { /** * Constructor with only required parameters */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTest integer(Integer integer) { - this.integer = integer; + public FormatTest _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTest int32(Integer int32) { @@ -203,24 +203,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTest string(String string) { - this.string = string; + public FormatTest _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTest _byte(byte[] _byte) { @@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTest date(LocalDate date) { - this.date = date; + public FormatTest _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED) @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTest dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTest _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; + public FormatTest _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTest password(String password) { @@ -343,24 +343,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTest _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -372,45 +372,45 @@ public boolean equals(Object o) { return false; } FormatTest formatTest = (FormatTest) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTest {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java index 2165294c3be57..7b8888f08b680 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,80 +27,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClass { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClass _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -112,23 +112,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } 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 index 770ca405dae09..c93942d6660db 100644 --- 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 @@ -359,14 +359,14 @@ default ResponseEntity testClientModel( * @param _double None (required) * @param patternWithoutDelimiter None (required) * @param _byte None (required) - * @param integer None (optional) + * @param _integer None (optional) * @param int32 None (optional) * @param int64 None (optional) * @param _float None (optional) - * @param string None (optional) + * @param _string None (optional) * @param binary None (optional) - * @param date None (optional) - * @param dateTime None (optional) + * @param _date None (optional) + * @param _dateTime None (optional) * @param password None (optional) * @param paramCallback None (optional) * @return Invalid username supplied (status code 400) @@ -396,14 +396,14 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer, @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string, @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime, @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java index c223be2f2e121..bac596bf2059a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java @@ -30,7 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class FormatTestDto { - private Integer integer; + private Integer _integer; private Integer int32; @@ -42,23 +42,23 @@ public class FormatTestDto { private Double _double; - private String string; + private String _string; private byte[] _byte; private org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) - private LocalDate date; + private LocalDate _date; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; - private UUID uuid; + private UUID _uuid; private String password; - private BigDecimal bigDecimal; + private BigDecimal _bigDecimal; public FormatTestDto() { super(); @@ -67,33 +67,33 @@ public FormatTestDto() { /** * Constructor with only required parameters */ - public FormatTestDto(BigDecimal number, byte[] _byte, LocalDate date, String password) { + public FormatTestDto(BigDecimal number, byte[] _byte, LocalDate _date, String password) { this.number = number; this._byte = _byte; - this.date = date; + this._date = _date; this.password = password; } - public FormatTestDto integer(Integer integer) { - this.integer = integer; + public FormatTestDto _integer(Integer _integer) { + this._integer = _integer; return this; } /** - * Get integer + * Get _integer * minimum: 10 * maximum: 100 - * @return integer + * @return _integer */ @Min(10) @Max(100) @ApiModelProperty(value = "") @JsonProperty("integer") public Integer getInteger() { - return integer; + return _integer; } - public void setInteger(Integer integer) { - this.integer = integer; + public void setInteger(Integer _integer) { + this._integer = _integer; } public FormatTestDto int32(Integer int32) { @@ -204,24 +204,24 @@ public void setDouble(Double _double) { this._double = _double; } - public FormatTestDto string(String string) { - this.string = string; + public FormatTestDto _string(String _string) { + this._string = _string; return this; } /** - * Get string - * @return string + * Get _string + * @return _string */ @Pattern(regexp = "/[a-z]/i") @ApiModelProperty(value = "") @JsonProperty("string") public String getString() { - return string; + return _string; } - public void setString(String string) { - this.string = string; + public void setString(String _string) { + this._string = _string; } public FormatTestDto _byte(byte[] _byte) { @@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } - public FormatTestDto date(LocalDate date) { - this.date = date; + public FormatTestDto _date(LocalDate _date) { + this._date = _date; return this; } /** - * Get date - * @return date + * Get _date + * @return _date */ @NotNull @Valid @ApiModelProperty(required = true, value = "") @JsonProperty("date") public LocalDate getDate() { - return date; + return _date; } - public void setDate(LocalDate date) { - this.date = date; + public void setDate(LocalDate _date) { + this._date = _date; } - public FormatTestDto dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public FormatTestDto _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public FormatTestDto uuid(UUID uuid) { - this.uuid = uuid; + public FormatTestDto _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } public FormatTestDto password(String password) { @@ -344,24 +344,24 @@ public void setPassword(String password) { this.password = password; } - public FormatTestDto bigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public FormatTestDto _bigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; return this; } /** - * Get bigDecimal - * @return bigDecimal + * Get _bigDecimal + * @return _bigDecimal */ @Valid @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { - return bigDecimal; + return _bigDecimal; } - public void setBigDecimal(BigDecimal bigDecimal) { - this.bigDecimal = bigDecimal; + public void setBigDecimal(BigDecimal _bigDecimal) { + this._bigDecimal = _bigDecimal; } @Override @@ -373,45 +373,45 @@ public boolean equals(Object o) { return false; } FormatTestDto formatTest = (FormatTestDto) o; - return Objects.equals(this.integer, formatTest.integer) && + return Objects.equals(this._integer, formatTest._integer) && Objects.equals(this.int32, formatTest.int32) && Objects.equals(this.int64, formatTest.int64) && Objects.equals(this.number, formatTest.number) && Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && - Objects.equals(this.string, formatTest.string) && + Objects.equals(this._string, formatTest._string) && Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && - Objects.equals(this.date, formatTest.date) && - Objects.equals(this.dateTime, formatTest.dateTime) && - Objects.equals(this.uuid, formatTest.uuid) && + Objects.equals(this._date, formatTest._date) && + Objects.equals(this._dateTime, formatTest._dateTime) && + Objects.equals(this._uuid, formatTest._uuid) && Objects.equals(this.password, formatTest.password) && - Objects.equals(this.bigDecimal, formatTest.bigDecimal); + Objects.equals(this._bigDecimal, formatTest._bigDecimal); } @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FormatTestDto {\n"); - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); + sb.append(" _integer: ").append(toIndentedString(_integer)).append("\n"); sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); + sb.append(" _string: ").append(toIndentedString(_string)).append("\n"); sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" _date: ").append(toIndentedString(_date)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); + sb.append(" _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 3640ff771d12a..6648169447874 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -30,80 +30,80 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen") public class MixedPropertiesAndAdditionalPropertiesClassDto { - private UUID uuid; + private UUID _uuid; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime dateTime; + private OffsetDateTime _dateTime; @Valid - private Map map = new HashMap<>(); + private Map _map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) { - this.uuid = uuid; + public MixedPropertiesAndAdditionalPropertiesClassDto _uuid(UUID _uuid) { + this._uuid = _uuid; return this; } /** - * Get uuid - * @return uuid + * Get _uuid + * @return _uuid */ @Valid @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { - return uuid; + return _uuid; } - public void setUuid(UUID uuid) { - this.uuid = uuid; + public void setUuid(UUID _uuid) { + this._uuid = _uuid; } - public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public MixedPropertiesAndAdditionalPropertiesClassDto _dateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; return this; } /** - * Get dateTime - * @return dateTime + * Get _dateTime + * @return _dateTime */ @Valid @ApiModelProperty(value = "") @JsonProperty("dateTime") public OffsetDateTime getDateTime() { - return dateTime; + return _dateTime; } - public void setDateTime(OffsetDateTime dateTime) { - this.dateTime = dateTime; + public void setDateTime(OffsetDateTime _dateTime) { + this._dateTime = _dateTime; } - public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { - this.map = map; + public MixedPropertiesAndAdditionalPropertiesClassDto _map(Map _map) { + this._map = _map; return this; } - public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, AnimalDto mapItem) { - if (this.map == null) { - this.map = new HashMap<>(); + public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, AnimalDto _mapItem) { + if (this._map == null) { + this._map = new HashMap<>(); } - this.map.put(key, mapItem); + this._map.put(key, _mapItem); return this; } /** - * Get map - * @return map + * Get _map + * @return _map */ @Valid @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { - return map; + return _map; } - public void setMap(Map map) { - this.map = map; + public void setMap(Map _map) { + this._map = _map; } @Override @@ -115,23 +115,23 @@ public boolean equals(Object o) { return false; } MixedPropertiesAndAdditionalPropertiesClassDto mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClassDto) o; - return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && - Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && - Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) && + Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) && + Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map); } @Override public int hashCode() { - return Objects.hash(uuid, dateTime, map); + return Objects.hash(_uuid, _dateTime, _map); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MixedPropertiesAndAdditionalPropertiesClassDto {\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append(" _uuid: ").append(toIndentedString(_uuid)).append("\n"); + sb.append(" _dateTime: ").append(toIndentedString(_dateTime)).append("\n"); + sb.append(" _map: ").append(toIndentedString(_map)).append("\n"); sb.append("}"); return sb.toString(); } From e7e4ab188dd8c8b81c7cc02b5d22435e512a59c2 Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Mon, 2 Oct 2023 18:59:32 +0200 Subject: [PATCH 2/2] fix one test --- .../java/org/openapitools/codegen/java/JavaModelTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java index 221736e4ea52c..873504f7ff66f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java @@ -973,7 +973,7 @@ public void modelWithWrappedXmlTest() { Assert.assertEquals(property2.getter, "getArray"); Assert.assertEquals(property2.setter, "setArray"); Assert.assertEquals(property2.dataType, "List"); - Assert.assertEquals(property2.name, "array"); + Assert.assertEquals(property2.name, "_array"); Assert.assertEquals(property2.defaultValue, null); Assert.assertEquals(property2.baseType, "List"); Assert.assertTrue(property2.isContainer); @@ -983,7 +983,7 @@ public void modelWithWrappedXmlTest() { Assert.assertNotNull(property2.items); CodegenProperty items = property2.items; Assert.assertEquals(items.xmlName, "i"); - Assert.assertEquals(items.baseName, "array"); + Assert.assertEquals(items.baseName, "_array"); } @Test(description = "convert a boolean parameter")