From 652990ecfe09e1493b4d59c3928bf3b8f23f2215 Mon Sep 17 00:00:00 2001
From: marcinm_backbase <63855724+bbzurek@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:28:56 +0100
Subject: [PATCH 1/5] - move project to baseline standard openapi-generator
with version 7.20.0 to allow future updates
---
boat-engine/pom.xml | 2 +-
boat-maven-plugin/pom.xml | 4 +-
boat-quay/boat-quay-lint/pom.xml | 2 +-
boat-quay/boat-quay-rules/pom.xml | 2 +-
boat-quay/pom.xml | 2 +-
boat-scaffold/pom.xml | 4 +-
.../templates/boat-java/ApiClient.mustache | 54 +-
.../BeanValidationException.mustache | 15 +-
.../boat-java/Configuration.mustache | 65 +-
.../CustomInstantDeserializer.mustache | 2 +
.../main/templates/boat-java/JSON.mustache | 4 +-
.../boat-java/JavaTimeFormatter.mustache | 75 +-
.../main/templates/boat-java/Pair.mustache | 55 +-
.../main/templates/boat-java/README.mustache | 25 +-
.../boat-java/RFC3339DateFormat.mustache | 4 +-
.../RFC3339InstantDeserializer.mustache | 90 ++
.../boat-java/RFC3339JavaTimeModule.mustache | 29 +
.../boat-java/ServerConfiguration.mustache | 6 +-
.../boat-java/ServerVariable.mustache | 4 +
.../templates/boat-java/StringUtil.mustache | 23 +
.../additionalModelTypeAnnotations.mustache | 2 +-
.../boat-java/additional_properties.mustache | 34 +
.../src/main/templates/boat-java/api.mustache | 24 +-
.../templates/boat-java/apiException.mustache | 5 +-
.../main/templates/boat-java/api_doc.mustache | 2 +-
.../templates/boat-java/api_test.mustache | 14 +-
.../boat-java/auth/ApiKeyAuth.mustache | 1 +
.../boat-java/auth/Authentication.mustache | 18 +-
.../boat-java/auth/HttpBasicAuth.mustache | 3 +-
.../boat-java/auth/HttpBearerAuth.mustache | 29 +-
.../templates/boat-java/auth/OAuth.mustache | 1 +
.../boat-java/auth/OAuthFlow.mustache | 3 +-
.../templates/boat-java/build.gradle.mustache | 50 +-
.../boat-java/generatedAnnotation.mustache | 2 +-
.../templates/boat-java/git_push.sh.mustache | 2 +-
.../templates/boat-java/gradle-wrapper.jar | Bin 59536 -> 43453 bytes
.../gradle-wrapper.properties.mustache | 6 +-
.../boat-java/gradle.properties.mustache | 2 +-
.../templates/boat-java/gradlew.bat.mustache | 39 +-
.../main/templates/boat-java/gradlew.mustache | 191 ++--
.../boat-java/jackson_annotations.mustache | 19 +-
.../templates/boat-java/javaBuilder.mustache | 82 ++
.../apache-httpclient/ApiClient.mustache | 201 ++--
.../apache-httpclient/BaseApi.mustache | 111 +++
.../apache-httpclient/README.mustache | 23 +-
.../libraries/apache-httpclient/api.mustache | 131 ++-
.../apache-httpclient/api_test.mustache | 15 +-
.../apache-httpclient/build.gradle.mustache | 21 +-
.../libraries/apache-httpclient/pom.mustache | 131 +--
.../libraries/feign/ApiClient.mustache | 105 +-
.../feign/ApiResponseDecoder.mustache | 85 +-
.../libraries/feign/EncodingUtils.mustache | 2 +
.../libraries/feign/ParamExpander.mustache | 2 +
.../boat-java/libraries/feign/README.mustache | 2 +-
.../feign/additional_properties.mustache | 45 +
.../boat-java/libraries/feign/api.mustache | 34 +-
.../libraries/feign/api_test.mustache | 7 +-
.../feign/auth/ApiErrorDecoder.mustache | 6 +-
.../libraries/feign/auth/ApiKeyAuth.mustache | 4 +-
.../feign/auth/DefaultApi20Impl.mustache | 3 +
.../feign/auth/HttpBasicAuth.mustache | 2 +
.../feign/auth/HttpBearerAuth.mustache | 26 +-
.../libraries/feign/auth/OAuth.mustache | 3 +
.../auth/OauthClientCredentialsGrant.mustache | 3 +
.../feign/auth/OauthPasswordGrant.mustache | 3 +
.../libraries/feign/build.gradle.mustache | 45 +-
.../libraries/feign/build.sbt.mustache | 42 +-
.../boat-java/libraries/feign/model.mustache | 78 ++
.../feign/model/ApiResponse.mustache | 12 +-
.../libraries/feign/model_test.mustache | 7 -
.../boat-java/libraries/feign/pojo.mustache | 580 +++++++++++
.../boat-java/libraries/feign/pom.mustache | 101 +-
.../google-api-client/ApiClient.mustache | 20 +-
.../libraries/google-api-client/api.mustache | 45 +-
.../google-api-client/api_test.mustache | 17 +-
.../google-api-client/build.gradle.mustache | 12 +-
.../google-api-client/build.sbt.mustache | 6 +-
.../libraries/google-api-client/pom.mustache | 40 +-
.../jersey2/AbstractOpenApiSchema.mustache | 8 +-
.../libraries/jersey2/ApiClient.mustache | 403 ++++----
.../boat-java/libraries/jersey2/JSON.mustache | 59 +-
.../jersey2/additional_properties.mustache | 2 +-
.../libraries/jersey2/anyof_model.mustache | 61 +-
.../boat-java/libraries/jersey2/api.mustache | 130 ++-
.../libraries/jersey2/apiException.mustache | 3 +
.../libraries/jersey2/api_test.mustache | 7 +-
.../jersey2/auth/ApiKeyAuth.mustache | 1 +
.../jersey2/auth/Authentication.mustache | 2 +
.../jersey2/auth/HttpBasicAuth.mustache | 1 +
.../jersey2/auth/HttpBearerAuth.mustache | 1 +
.../libraries/jersey2/auth/OAuth.mustache | 3 +-
.../libraries/jersey2/build.gradle.mustache | 36 +-
.../libraries/jersey2/build.sbt.mustache | 17 +-
.../libraries/jersey2/model.mustache | 7 +-
.../libraries/jersey2/model_doc.mustache | 4 +
.../libraries/jersey2/model_test.mustache | 7 -
.../libraries/jersey2/oneof_model.mustache | 120 ++-
.../boat-java/libraries/jersey2/pojo.mustache | 117 ++-
.../boat-java/libraries/jersey2/pom.mustache | 50 +-
.../jersey3/AbstractOpenApiSchema.mustache | 8 +-
.../libraries/jersey3/ApiClient.mustache | 396 ++++----
.../boat-java/libraries/jersey3/JSON.mustache | 59 +-
.../jersey3/additional_properties.mustache | 2 +-
.../libraries/jersey3/anyof_model.mustache | 61 +-
.../boat-java/libraries/jersey3/api.mustache | 130 ++-
.../libraries/jersey3/apiException.mustache | 3 +
.../libraries/jersey3/api_test.mustache | 7 +-
.../jersey3/auth/ApiKeyAuth.mustache | 1 +
.../jersey3/auth/Authentication.mustache | 2 +
.../jersey3/auth/HttpBasicAuth.mustache | 1 +
.../jersey3/auth/HttpBearerAuth.mustache | 1 +
.../libraries/jersey3/auth/OAuth.mustache | 3 +-
.../libraries/jersey3/build.gradle.mustache | 24 +-
.../libraries/jersey3/build.sbt.mustache | 17 +-
.../jersey3/generatedAnnotation.mustache | 2 +-
.../libraries/jersey3/model.mustache | 7 +-
.../libraries/jersey3/model_doc.mustache | 4 +
.../libraries/jersey3/model_test.mustache | 7 -
.../libraries/jersey3/oneof_model.mustache | 120 ++-
.../boat-java/libraries/jersey3/pojo.mustache | 119 ++-
.../boat-java/libraries/jersey3/pom.mustache | 52 +-
.../libraries/microprofile/README.mustache | 11 +-
.../additional_properties.mustache | 45 +
.../libraries/microprofile/api.mustache | 68 +-
.../microprofile/api_exception.mustache | 2 +-
.../api_exception_mapper.mustache | 4 +
.../libraries/microprofile/api_test.mustache | 27 +-
.../beanValidationCookieParams.mustache | 1 +
.../microprofile/beanValidationCore.mustache | 4 +-
.../microprofile/client_operation.mustache | 1 +
.../microprofile/cookieParams.mustache | 1 +
.../microprofile/cookieParamsImpl.mustache | 1 +
.../libraries/microprofile/enumClass.mustache | 24 +-
.../microprofile/enumOuterClass.mustache | 30 +-
.../microprofile/formParams.mustache | 2 +-
.../microprofile/formParamsImpl.mustache | 2 +-
.../formParamsNameSuffix.mustache | 1 +
.../microprofile/generatedAnnotation.mustache | 2 +-
.../microprofile/kumuluzee.pom.mustache | 6 +-
.../microprofile/licenseInfo.mustache | 2 +-
.../libraries/microprofile/model.mustache | 44 +-
.../libraries/microprofile/pojo.mustache | 121 +--
.../microprofile/pojoOverrides.mustache | 70 ++
.../libraries/microprofile/pom.mustache | 88 +-
.../libraries/microprofile/pom_3.0.mustache | 90 +-
.../microprofile/server_operation.mustache | 1 +
.../native/AbstractOpenApiSchema.mustache | 4 +-
.../libraries/native/ApiClient.mustache | 215 +++-
.../libraries/native/ApiResponse.mustache | 2 +
.../boat-java/libraries/native/JSON.mustache | 31 +-
.../libraries/native/README.mustache | 23 +-
.../libraries/native/anyof_model.mustache | 172 +++-
.../boat-java/libraries/native/api.mustache | 673 +++++++++++--
.../libraries/native/apiException.mustache | 3 +
.../libraries/native/api_doc.mustache | 2 +-
.../libraries/native/api_test.mustache | 13 +-
.../libraries/native/build.gradle.mustache | 67 +-
.../native/generatedAnnotation.mustache | 2 +-
.../boat-java/libraries/native/model.mustache | 19 +-
.../libraries/native/modelEnum.mustache | 123 +++
.../libraries/native/model_doc.mustache | 4 +
.../libraries/native/oneof_model.mustache | 172 +++-
.../boat-java/libraries/native/pojo.mustache | 282 ++++--
.../boat-java/libraries/native/pom.mustache | 100 +-
.../AbstractOpenApiSchema.mustache | 9 +-
.../libraries/okhttp-gson/ApiClient.mustache | 367 +++++--
.../libraries/okhttp-gson/JSON.mustache | 29 +-
.../libraries/okhttp-gson/README.mustache | 24 +-
.../okhttp-gson/anyof_model.mustache | 346 +++++--
.../libraries/okhttp-gson/api.mustache | 115 ++-
.../okhttp-gson/apiException.mustache | 8 +-
.../libraries/okhttp-gson/api_doc.mustache | 6 +-
.../libraries/okhttp-gson/api_test.mustache | 7 +-
.../okhttp-gson/auth/AWS4Auth.mustache | 105 ++
.../okhttp-gson/auth/ApiKeyAuth.mustache | 1 +
.../okhttp-gson/auth/Authentication.mustache | 2 +
.../okhttp-gson/auth/HttpBasicAuth.mustache | 2 -
.../okhttp-gson/auth/HttpBearerAuth.mustache | 21 +-
.../libraries/okhttp-gson/auth/OAuth.mustache | 1 +
.../auth/OAuthOkHttpClient.mustache | 2 +
.../okhttp-gson/auth/RetryingOAuth.mustache | 2 +
.../okhttp-gson/build.gradle.mustache | 45 +-
.../libraries/okhttp-gson/build.sbt.mustache | 24 +-
.../libraries/okhttp-gson/model.mustache | 32 +-
.../libraries/okhttp-gson/modelEnum.mustache | 88 ++
.../okhttp-gson/modelInnerEnum.mustache | 66 ++
.../libraries/okhttp-gson/model_test.mustache | 7 -
.../okhttp-gson/oneof_model.mustache | 414 ++++++--
.../libraries/okhttp-gson/pojo.mustache | 379 ++++---
.../libraries/okhttp-gson/pom.mustache | 85 +-
.../libraries/rest-assured/ApiClient.mustache | 9 +-
.../rest-assured/JacksonObjectMapper.mustache | 2 +-
.../libraries/rest-assured/api.mustache | 41 +-
.../libraries/rest-assured/api_doc.mustache | 2 +-
.../libraries/rest-assured/api_test.mustache | 18 +-
.../rest-assured/build.gradle.mustache | 40 +-
.../libraries/rest-assured/build.sbt.mustache | 26 +-
.../libraries/rest-assured/pom.mustache | 50 +-
.../libraries/restclient/ApiClient.mustache | 902 +++++++++++++++++
.../libraries/restclient/README.mustache | 216 ++++
.../restclient/additional_properties.mustache | 45 +
.../libraries/restclient/api.mustache | 221 ++++
.../libraries/restclient/api_test.mustache | 45 +
.../restclient/auth/ApiKeyAuth.mustache | 65 ++
.../restclient/auth/Authentication.mustache | 19 +
.../restclient/auth/HttpBasicAuth.mustache | 41 +
.../restclient/auth/HttpBearerAuth.mustache | 59 ++
.../libraries/restclient/auth/OAuth.mustache | 51 +
.../restclient/auth/OAuthFlow.mustache | 7 +
.../restclient/build.gradle.mustache | 159 +++
.../libraries/restclient/model.mustache | 78 ++
.../libraries/restclient/pojo.mustache | 630 ++++++++++++
.../libraries/restclient/pom.mustache | 365 +++++++
.../single_request_parameter.mustache | 110 ++
.../libraries/resteasy/ApiClient.mustache | 65 +-
.../libraries/resteasy/JSON.mustache | 7 +-
.../boat-java/libraries/resteasy/api.mustache | 15 +-
.../libraries/resteasy/build.gradle.mustache | 18 +-
.../libraries/resteasy/build.sbt.mustache | 19 +-
.../boat-java/libraries/resteasy/pom.mustache | 43 +-
.../libraries/resttemplate/ApiClient.mustache | 187 +++-
.../libraries/resttemplate/BaseApi.mustache | 77 ++
.../additional_properties.mustache | 45 +
.../libraries/resttemplate/api.mustache | 74 +-
.../libraries/resttemplate/api_test.mustache | 23 +-
.../resttemplate/auth/ApiKeyAuth.mustache | 3 +
.../resttemplate/auth/Authentication.mustache | 7 +-
.../resttemplate/auth/HttpBasicAuth.mustache | 3 +
.../resttemplate/auth/HttpBearerAuth.mustache | 31 +-
.../resttemplate/auth/OAuth.mustache | 39 +-
.../resttemplate/auth/OAuthFlow.mustache | 2 +
.../resttemplate/build.gradle.mustache | 76 +-
.../libraries/resttemplate/model.mustache | 78 ++
.../libraries/resttemplate/pojo.mustache | 630 ++++++++++++
.../libraries/resttemplate/pom.mustache | 112 ++-
.../libraries/retrofit2/ApiClient.mustache | 57 +-
.../retrofit2/CollectionFormats.mustache | 2 +
.../libraries/retrofit2/JSON.mustache | 2 +
.../libraries/retrofit2/JSON_jackson.mustache | 264 +++++
.../libraries/retrofit2/api.mustache | 7 +-
.../libraries/retrofit2/api_test.mustache | 14 +-
.../retrofit2/auth/ApiKeyAuth.mustache | 4 +-
.../retrofit2/auth/HttpBasicAuth.mustache | 2 +
.../retrofit2/auth/HttpBearerAuth.mustache | 2 +
.../libraries/retrofit2/auth/OAuth.mustache | 2 +
.../retrofit2/auth/OAuthOkHttpClient.mustache | 2 +
.../libraries/retrofit2/build.gradle.mustache | 36 +-
.../libraries/retrofit2/build.sbt.mustache | 30 +-
.../play-common/auth/ApiKeyAuth.mustache | 1 +
.../retrofit2/play24/ApiClient.mustache | 12 +-
.../play24/Play24CallAdapterFactory.mustache | 2 +
.../play24/Play24CallFactory.mustache | 10 +-
.../libraries/retrofit2/play24/api.mustache | 2 -
.../retrofit2/play25/ApiClient.mustache | 12 +-
.../play25/Play25CallAdapterFactory.mustache | 2 +
.../play25/Play25CallFactory.mustache | 10 +-
.../libraries/retrofit2/play25/api.mustache | 2 -
.../retrofit2/play26/ApiClient.mustache | 18 +-
.../play26/Play26CallAdapterFactory.mustache | 2 +
.../play26/Play26CallFactory.mustache | 8 +-
.../libraries/retrofit2/play26/api.mustache | 7 +-
.../libraries/retrofit2/pom.mustache | 63 +-
.../libraries/vertx/ApiClient.mustache | 77 +-
.../libraries/vertx/Configuration.mustache | 3 +
.../boat-java/libraries/vertx/api.mustache | 30 +-
.../libraries/vertx/apiException.mustache | 3 +
.../libraries/vertx/apiImpl.mustache | 3 +-
.../libraries/vertx/api_test.mustache | 30 +-
.../libraries/vertx/auth/ApiKeyAuth.mustache | 1 +
.../vertx/auth/Authentication.mustache | 2 +
.../vertx/auth/HttpBasicAuth.mustache | 1 +
.../vertx/auth/HttpBearerAuth.mustache | 1 +
.../libraries/vertx/auth/OAuth.mustache | 1 +
.../libraries/vertx/build.gradle.mustache | 12 +-
.../boat-java/libraries/vertx/pom.mustache | 35 +-
.../libraries/vertx/rxApiImpl.mustache | 1 +
.../libraries/webclient/ApiClient.mustache | 103 +-
.../webclient/additional_properties.mustache | 45 +
.../libraries/webclient/api.mustache | 76 +-
.../libraries/webclient/api_test.mustache | 19 +-
.../webclient/auth/ApiKeyAuth.mustache | 3 +
.../webclient/auth/Authentication.mustache | 7 +-
.../webclient/auth/HttpBasicAuth.mustache | 3 +
.../webclient/auth/HttpBearerAuth.mustache | 3 +
.../libraries/webclient/auth/OAuth.mustache | 3 +
.../webclient/auth/OAuthFlow.mustache | 2 +
.../libraries/webclient/build.gradle.mustache | 66 +-
.../libraries/webclient/model.mustache | 78 ++
.../libraries/webclient/pojo.mustache | 630 ++++++++++++
.../libraries/webclient/pom.mustache | 78 +-
.../single_request_parameter.mustache | 106 ++
.../templates/boat-java/licenseInfo.mustache | 8 +-
.../templates/boat-java/maven.yml.mustache | 6 +-
.../main/templates/boat-java/model.mustache | 53 +-
.../templates/boat-java/modelEnum.mustache | 39 +-
.../boat-java/modelInnerEnum.mustache | 14 +-
.../templates/boat-java/model_test.mustache | 19 +-
.../nullable_var_annotations.mustache | 1 +
.../boat-java/oneof_interface.mustache | 5 +-
.../main/templates/boat-java/permits.mustache | 1 +
.../main/templates/boat-java/pojo.mustache | 942 +++++++++---------
.../templates/boat-java/pojo_doc.mustache | 2 +-
.../src/main/templates/boat-java/pom.mustache | 108 +-
.../main/templates/boat-java/sealed.mustache | 1 +
.../main/templates/boat-java/travis.mustache | 2 +-
.../boat-java/typeInfoAnnotation.mustache | 14 +-
.../additionalModelTypeAnnotations.mustache | 3 +-
.../boat-spring/additionalProperties.mustache | 39 +
.../main/templates/boat-spring/api.mustache | 169 ++--
.../boat-spring/apiController.mustache | 44 +-
.../boat-spring/apiDelegate.mustache | 54 +-
.../boat-spring/apiException.mustache | 10 +-
.../boat-spring/apiOriginFilter.mustache | 18 +-
.../boat-spring/apiResponseMessage.mustache | 14 +-
.../templates/boat-spring/apiUtil.mustache | 17 +-
.../boat-spring/beanValidation.mustache | 2 +-
.../boat-spring/beanValidationCore.mustache | 29 +-
.../beanValidationPathParams.mustache | 2 +-
.../templates/boat-spring/bodyParams.mustache | 2 +-
.../templates/boat-spring/converter.mustache | 21 +-
.../boat-spring/cookieParams.mustache | 2 +-
.../templates/boat-spring/enumClass.mustache | 18 +-
.../boat-spring/enumOuterClass.mustache | 20 +-
.../templates/boat-spring/formParams.mustache | 2 +-
.../boat-spring/generatedAnnotation.mustache | 2 +-
.../boat-spring/headerParams.mustache | 2 +-
.../boat-spring/homeController.mustache | 2 +-
.../boat-spring/javaBuilder.mustache | 93 ++
.../spring-boot/RFC3339DateFormat.mustache | 2 +-
.../spring-boot/application.mustache | 5 +
.../spring-boot/openapi2SpringBoot.mustache | 13 +-
.../libraries/spring-boot/pom-sb3.mustache | 78 +-
.../libraries/spring-boot/pom-sb4.mustache | 251 +++++
.../libraries/spring-boot/pom.mustache | 95 +-
.../libraries/spring-cloud/apiClient.mustache | 2 +-
.../spring-cloud/clientConfiguration.mustache | 152 ++-
.../clientPropertiesConfiguration.mustache | 43 +
.../libraries/spring-cloud/pom-sb3.mustache | 51 +-
.../libraries/spring-cloud/pom-sb4.mustache | 167 ++++
.../libraries/spring-cloud/pom.mustache | 42 +-
.../spring-http-interface/README.mustache | 21 +
.../spring-http-interface/api.mustache | 76 ++
.../httpInterfacesConfiguration.mustache | 49 +
.../spring-http-interface/pom-sb4.mustache | 107 ++
.../spring-http-interface/pom.mustache | 105 ++
.../boat-spring/lombokAnnotation.mustache | 39 +
.../templates/boat-spring/methodBody.mustache | 26 +-
.../main/templates/boat-spring/model.mustache | 52 +-
.../boat-spring/notFoundException.mustache | 8 +-
.../boat-spring/nullableAnnotation.mustache | 1 +
.../boat-spring/nullableDataType.mustache | 2 +-
.../nullableDataTypeBeanValidation.mustache | 1 +
.../boat-spring/oneof_interface.mustache | 14 +-
.../openapiDocumentationConfig.mustache | 15 +-
.../boat-spring/optionalDataType.mustache | 14 +-
.../templates/boat-spring/paramDoc.mustache | 2 +-
.../templates/boat-spring/pathParams.mustache | 2 +-
.../templates/boat-spring/permits.mustache | 1 +
.../main/templates/boat-spring/pojo.mustache | 494 +++++----
.../boat-spring/project/build.properties | 2 +-
.../boat-spring/queryParams.mustache | 2 +-
.../boat-spring/responseType.mustache | 2 +-
.../boat-spring/returnTypes.mustache | 2 +-
.../templates/boat-spring/sealed.mustache | 1 +
.../springdocDocumentationConfig.mustache | 2 +-
.../boat-spring/xmlAnnotation.mustache | 7 +-
boat-trail-resources/pom.xml | 2 +-
pom.xml | 4 +-
tests/pom.xml | 2 +-
369 files changed, 15915 insertions(+), 4346 deletions(-)
create mode 100644 boat-scaffold/src/main/templates/boat-java/RFC3339InstantDeserializer.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/RFC3339JavaTimeModule.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/additional_properties.mustache
mode change 100755 => 100644 boat-scaffold/src/main/templates/boat-java/git_push.sh.mustache
mode change 100755 => 100644 boat-scaffold/src/main/templates/boat-java/gradlew.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/javaBuilder.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/apache-httpclient/BaseApi.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/feign/additional_properties.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/feign/model.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/feign/pojo.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/microprofile/additional_properties.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/microprofile/beanValidationCookieParams.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/microprofile/client_operation.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/microprofile/cookieParams.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/microprofile/cookieParamsImpl.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/microprofile/formParamsNameSuffix.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/microprofile/pojoOverrides.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/microprofile/server_operation.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/native/modelEnum.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/okhttp-gson/auth/AWS4Auth.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/okhttp-gson/modelEnum.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/okhttp-gson/modelInnerEnum.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/ApiClient.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/README.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/additional_properties.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/api.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/api_test.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/auth/ApiKeyAuth.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/auth/Authentication.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/auth/HttpBasicAuth.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/auth/HttpBearerAuth.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/auth/OAuth.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/auth/OAuthFlow.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/build.gradle.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/model.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/pojo.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/pom.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/restclient/single_request_parameter.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/BaseApi.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/additional_properties.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/model.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/pojo.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/retrofit2/JSON_jackson.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/webclient/additional_properties.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/webclient/model.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/webclient/pojo.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/libraries/webclient/single_request_parameter.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/nullable_var_annotations.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/permits.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-java/sealed.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/additionalProperties.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/javaBuilder.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/libraries/spring-boot/pom-sb4.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/libraries/spring-cloud/clientPropertiesConfiguration.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/libraries/spring-cloud/pom-sb4.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/libraries/spring-http-interface/README.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/libraries/spring-http-interface/api.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/libraries/spring-http-interface/httpInterfacesConfiguration.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/libraries/spring-http-interface/pom-sb4.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/libraries/spring-http-interface/pom.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/lombokAnnotation.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/nullableAnnotation.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/nullableDataTypeBeanValidation.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/permits.mustache
create mode 100644 boat-scaffold/src/main/templates/boat-spring/sealed.mustache
diff --git a/boat-engine/pom.xml b/boat-engine/pom.xml
index b3793d829..776bed88a 100644
--- a/boat-engine/pom.xml
+++ b/boat-engine/pom.xml
@@ -5,7 +5,7 @@
com.backbase.oss
backbase-openapi-tools
- 0.17.75-SNAPSHOT
+ 0.18.0-SNAPSHOT
boat-engine
jar
diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml
index 7286b5300..d60c02d6f 100644
--- a/boat-maven-plugin/pom.xml
+++ b/boat-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
com.backbase.oss
backbase-openapi-tools
- 0.17.75-SNAPSHOT
+ 0.18.0-SNAPSHOT
boat-maven-plugin
@@ -360,7 +360,7 @@
com.backbase.oss
boat-maven-plugin
- 0.17.50
+ 0.18.0
diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml
index c20e60663..14df40cd7 100644
--- a/boat-quay/boat-quay-lint/pom.xml
+++ b/boat-quay/boat-quay-lint/pom.xml
@@ -5,7 +5,7 @@
com.backbase.oss
boat-quay
- 0.17.75-SNAPSHOT
+ 0.18.0-SNAPSHOT
boat-quay-lint
diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml
index 2adaed33a..0f48c13c5 100644
--- a/boat-quay/boat-quay-rules/pom.xml
+++ b/boat-quay/boat-quay-rules/pom.xml
@@ -5,7 +5,7 @@
com.backbase.oss
boat-quay
- 0.17.75-SNAPSHOT
+ 0.18.0-SNAPSHOT
boat-quay-rules
diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml
index 26415dbb1..7a2d7f695 100644
--- a/boat-quay/pom.xml
+++ b/boat-quay/pom.xml
@@ -5,7 +5,7 @@
com.backbase.oss
backbase-openapi-tools
- 0.17.75-SNAPSHOT
+ 0.18.0-SNAPSHOT
diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml
index d62bb8924..e40ef908f 100644
--- a/boat-scaffold/pom.xml
+++ b/boat-scaffold/pom.xml
@@ -5,7 +5,7 @@
com.backbase.oss
backbase-openapi-tools
- 0.17.75-SNAPSHOT
+ 0.18.0-SNAPSHOT
boat-scaffold
@@ -102,7 +102,7 @@
com.backbase.oss
boat-trail-resources
- 0.17.75-SNAPSHOT
+ 0.18.0-SNAPSHOT
test
diff --git a/boat-scaffold/src/main/templates/boat-java/ApiClient.mustache b/boat-scaffold/src/main/templates/boat-java/ApiClient.mustache
index 69494573c..c38f59dcb 100644
--- a/boat-scaffold/src/main/templates/boat-java/ApiClient.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/ApiClient.mustache
@@ -8,7 +8,12 @@ import com.fasterxml.jackson.datatype.joda.JodaModule;
{{/joda}}
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import java.time.OffsetDateTime;
+{{#useJakartaEe}}
+import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
+{{/useJakartaEe}}
+{{^useJakartaEe}}
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+{{/useJakartaEe}}
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
@@ -21,9 +26,9 @@ import com.sun.jersey.api.client.WebResource.Builder;
import com.sun.jersey.multipart.FormDataMultiPart;
import com.sun.jersey.multipart.file.FileDataBodyPart;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.Response.Status.Family;
-import javax.ws.rs.core.MediaType;
+import {{javaxPackage}}.ws.rs.core.Cookie;
+import {{javaxPackage}}.ws.rs.core.Response.Status.Family;
+import {{javaxPackage}}.ws.rs.core.MediaType;
import java.util.Collection;
import java.util.Collections;
@@ -59,10 +64,11 @@ import {{invokerPackage}}.auth.OAuth;
{{/hasOAuthMethods}}
{{>generatedAnnotation}}
+
public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
- private Map defaultHeaderMap = new HashMap();
- private Map defaultCookieMap = new HashMap();
- private String basePath = "{{{basePath}}}";
+ protected Map defaultHeaderMap = new HashMap();
+ protected Map defaultCookieMap = new HashMap();
+ protected String basePath = "{{{basePath}}}";
protected List servers = new ArrayList({{#servers}}{{#-first}}Arrays.asList(
{{/-first}} new ServerConfiguration(
"{{{url}}}",
@@ -90,18 +96,18 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
){{/-last}}{{/servers}});
protected Integer serverIndex = 0;
protected Map serverVariables = null;
- private boolean debugging = false;
- private int connectionTimeout = 0;
+ protected boolean debugging = false;
+ protected int connectionTimeout = 0;
- private Client httpClient;
- private ObjectMapper objectMapper;
+ protected Client httpClient;
+ protected ObjectMapper objectMapper;
- private Map authentications;
+ protected Map authentications;
- private int statusCode;
- private Map> responseHeaders;
+ protected int statusCode;
+ protected Map> responseHeaders;
- private DateFormat dateFormat;
+ protected DateFormat dateFormat;
public ApiClient() {
objectMapper = new ObjectMapper();
@@ -124,8 +130,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
// Setup authentications (key: authentication name, value: authentication).
authentications = new HashMap();{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
- authentications.put("{{name}}", new HttpBasicAuth());{{/isBasicBasic}}{{^isBasicBasic}}
- authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));{{/isBasicBasic}}{{/isBasic}}{{#isApiKey}}
+ authentications.put("{{name}}", new HttpBasicAuth());{{/isBasicBasic}}{{#isBasicBearer}}
+ authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));{{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}
authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}}
authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}}
// Prevent the authentications from being modified.
@@ -192,6 +198,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
public ApiClient setBasePath(String basePath) {
this.basePath = basePath;
+ this.serverIndex = null;
return this;
}
@@ -528,11 +535,11 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
* @param value The value of the parameter.
* @return A list of {@code Pair} objects.
*/
- public List parameterToPairs(String collectionFormat, String name, Collection value) {
+ public List parameterToPairs(String collectionFormat, String name, Collection value) {
List params = new ArrayList();
// preconditions
- if (name == null || name.isEmpty() || value == null) {
+ if (name == null || name.isEmpty() || value == null || value.isEmpty()) {
return params;
}
@@ -682,11 +689,12 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
* @param collectionQueryParams The collection query parameters
* @return The full URL
*/
- private String buildUrl(String path, List queryParams, List collectionQueryParams) {
+ protected String buildUrl(String path, List queryParams, List collectionQueryParams) {
String baseURL;
if (serverIndex != null) {
if (serverIndex < 0 || serverIndex >= servers.size()) {
throw new ArrayIndexOutOfBoundsException(String.format(
+ java.util.Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
));
}
@@ -735,7 +743,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
return url.toString();
}
- private ClientResponse getAPIResponse(String path, String method, List queryParams, List collectionQueryParams, Object body, Map headerParams, Map cookieParams, Map formParams, String accept, String contentType, String[] authNames) throws ApiException {
+ protected ClientResponse getAPIResponse(String path, String method, List queryParams, List collectionQueryParams, Object body, Map headerParams, Map cookieParams, Map formParams, String accept, String contentType, String[] authNames) throws ApiException {
if (body != null && !formParams.isEmpty()) {
throw new ApiException(500, "Cannot have body and form params");
}
@@ -848,7 +856,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
* @param headerParams Header parameters
* @param cookieParams Cookie parameters
*/
- private void updateParamsForAuth(String[] authNames, List queryParams, Map headerParams, Map cookieParams) {
+ protected void updateParamsForAuth(String[] authNames, List queryParams, Map headerParams, Map cookieParams) {
for (String authName : authNames) {
Authentication auth = authentications.get(authName);
if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
@@ -861,7 +869,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
* @param formParams Form parameters
* @return HTTP form encoded parameters
*/
- private String getXWWWFormUrlencodedParams(Map formParams) {
+ protected String getXWWWFormUrlencodedParams(Map formParams) {
StringBuilder formParamBuilder = new StringBuilder();
for (Entry param : formParams.entrySet()) {
@@ -883,4 +891,4 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
return encodedFormParams;
}
-}
\ No newline at end of file
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/BeanValidationException.mustache b/boat-scaffold/src/main/templates/boat-java/BeanValidationException.mustache
index 179abe2fa..d551902f8 100644
--- a/boat-scaffold/src/main/templates/boat-java/BeanValidationException.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/BeanValidationException.mustache
@@ -1,15 +1,12 @@
+{{>licenseInfo}}
+
package {{invokerPackage}};
import java.util.Set;
-{{^useJakartaEe}}
-import javax.validation.ConstraintViolation;
-import javax.validation.ValidationException;
-{{/useJakartaEe}}
-{{#useJakartaEe}}
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.ValidationException;
-{{/useJakartaEe}}
+import {{javaxPackage}}.validation.ConstraintViolation;
+import {{javaxPackage}}.validation.ValidationException;
+
public class BeanValidationException extends ValidationException {
/**
*
@@ -29,4 +26,4 @@ public class BeanValidationException extends ValidationException {
this.violations = violations;
}
-}
\ No newline at end of file
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/Configuration.mustache b/boat-scaffold/src/main/templates/boat-java/Configuration.mustache
index cb425df35..c932ddf99 100644
--- a/boat-scaffold/src/main/templates/boat-java/Configuration.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/Configuration.mustache
@@ -2,27 +2,52 @@
package {{invokerPackage}};
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
{{>generatedAnnotation}}
+
public class Configuration {
- private static ApiClient defaultApiClient = new ApiClient();
-
- /**
- * Get the default API client, which would be used when creating API
- * instances without providing an API client.
- *
- * @return Default API client
- */
- public static ApiClient getDefaultApiClient() {
- return defaultApiClient;
- }
+ public static final String VERSION = "{{{artifactVersion}}}";
+
+ private static final AtomicReference defaultApiClient = new AtomicReference<>();
+ private static volatile Supplier apiClientFactory = ApiClient::new;
- /**
- * Set the default API client, which would be used when creating API
- * instances without providing an API client.
- *
- * @param apiClient API client
- */
- public static void setDefaultApiClient(ApiClient apiClient) {
- defaultApiClient = apiClient;
+ /**
+ * Get the default API client, which would be used when creating API instances without providing an API client.
+ *
+ * @return Default API client
+ */
+ public static ApiClient getDefaultApiClient() {
+ ApiClient client = defaultApiClient.get();
+ if (client == null) {
+ client = defaultApiClient.updateAndGet(val -> {
+ if (val != null) { // changed by another thread
+ return val;
+ }
+ return apiClientFactory.get();
+ });
}
-}
+ return client;
+ }
+
+ /**
+ * Set the default API client, which would be used when creating API instances without providing an API client.
+ *
+ * @param apiClient API client
+ */
+ public static void setDefaultApiClient(ApiClient apiClient) {
+ defaultApiClient.set(apiClient);
+ }
+
+ /**
+ * set the callback used to create new ApiClient objects
+ */
+ public static void setApiClientFactory(Supplier factory) {
+ apiClientFactory = Objects.requireNonNull(factory);
+ }
+
+ private Configuration() {
+ }
+}
\ No newline at end of file
diff --git a/boat-scaffold/src/main/templates/boat-java/CustomInstantDeserializer.mustache b/boat-scaffold/src/main/templates/boat-java/CustomInstantDeserializer.mustache
index 5ebea810e..d4a3ca97e 100644
--- a/boat-scaffold/src/main/templates/boat-java/CustomInstantDeserializer.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/CustomInstantDeserializer.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
package {{invokerPackage}};
import com.fasterxml.jackson.core.JsonParser;
diff --git a/boat-scaffold/src/main/templates/boat-java/JSON.mustache b/boat-scaffold/src/main/templates/boat-java/JSON.mustache
index d315850bb..5ef02660d 100644
--- a/boat-scaffold/src/main/templates/boat-java/JSON.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/JSON.mustache
@@ -31,9 +31,11 @@ import java.lang.reflect.Type;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.ParsePosition;
+{{#jsr310}}
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
+{{/jsr310}}
import java.util.Date;
import java.util.Locale;
import java.util.Map;
@@ -536,4 +538,4 @@ public class JSON {
return this;
}
-}
\ No newline at end of file
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/JavaTimeFormatter.mustache b/boat-scaffold/src/main/templates/boat-java/JavaTimeFormatter.mustache
index f3fb34e55..e96325c40 100644
--- a/boat-scaffold/src/main/templates/boat-java/JavaTimeFormatter.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/JavaTimeFormatter.mustache
@@ -10,44 +10,49 @@ import java.time.format.DateTimeParseException;
* It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
*/
{{>generatedAnnotation}}
+
public class JavaTimeFormatter {
+ private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
- private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+ /**
+ * Get the date format used to parse/format {@code OffsetDateTime} parameters.
+ *
+ * @return DateTimeFormatter
+ */
+ public DateTimeFormatter getOffsetDateTimeFormatter() {
+ return offsetDateTimeFormatter;
+ }
- /**
- * Get the date format used to parse/format {@code OffsetDateTime} parameters.
- * @return DateTimeFormatter
- */
- public DateTimeFormatter getOffsetDateTimeFormatter() {
- return offsetDateTimeFormatter;
- }
+ /**
+ * Set the date format used to parse/format {@code OffsetDateTime} parameters.
+ *
+ * @param offsetDateTimeFormatter {@code DateTimeFormatter}
+ */
+ public void setOffsetDateTimeFormatter(DateTimeFormatter offsetDateTimeFormatter) {
+ this.offsetDateTimeFormatter = offsetDateTimeFormatter;
+ }
- /**
- * Set the date format used to parse/format {@code OffsetDateTime} parameters.
- * @param offsetDateTimeFormatter {@code DateTimeFormatter}
- */
- public void setOffsetDateTimeFormatter(DateTimeFormatter offsetDateTimeFormatter) {
- this.offsetDateTimeFormatter = offsetDateTimeFormatter;
+ /**
+ * Parse the given string into {@code OffsetDateTime} object.
+ *
+ * @param str String
+ * @return {@code OffsetDateTime}
+ */
+ public OffsetDateTime parseOffsetDateTime(String str) {
+ try {
+ return OffsetDateTime.parse(str, offsetDateTimeFormatter);
+ } catch (DateTimeParseException e) {
+ throw new RuntimeException(e);
}
+ }
- /**
- * Parse the given string into {@code OffsetDateTime} object.
- * @param str String
- * @return {@code OffsetDateTime}
- */
- public OffsetDateTime parseOffsetDateTime(String str) {
- try {
- return OffsetDateTime.parse(str, offsetDateTimeFormatter);
- } catch (DateTimeParseException e) {
- throw new RuntimeException(e);
- }
- }
- /**
- * Format the given {@code OffsetDateTime} object into string.
- * @param offsetDateTime {@code OffsetDateTime}
- * @return {@code OffsetDateTime} in string format
- */
- public String formatOffsetDateTime(OffsetDateTime offsetDateTime) {
- return offsetDateTimeFormatter.format(offsetDateTime);
- }
-}
+ /**
+ * Format the given {@code OffsetDateTime} object into string.
+ *
+ * @param offsetDateTime {@code OffsetDateTime}
+ * @return {@code OffsetDateTime} in string format
+ */
+ public String formatOffsetDateTime(OffsetDateTime offsetDateTime) {
+ return offsetDateTimeFormatter.format(offsetDateTime);
+ }
+}
\ No newline at end of file
diff --git a/boat-scaffold/src/main/templates/boat-java/Pair.mustache b/boat-scaffold/src/main/templates/boat-java/Pair.mustache
index ff9e06b20..fc7d0568d 100644
--- a/boat-scaffold/src/main/templates/boat-java/Pair.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/Pair.mustache
@@ -3,48 +3,25 @@
package {{invokerPackage}};
{{>generatedAnnotation}}
-public class Pair {
- private String name = "";
- private String value = "";
-
- public Pair (String name, String value) {
- setName(name);
- setValue(value);
- }
-
- private void setName(String name) {
- if (!isValidString(name)) {
- return;
- }
-
- this.name = name;
- }
- private void setValue(String value) {
- if (!isValidString(value)) {
- return;
- }
-
- this.value = value;
- }
-
- public String getName() {
- return this.name;
- }
+public class Pair {
+ private final String name;
+ private final String value;
- public String getValue() {
- return this.value;
- }
+ public Pair(String name, String value) {
+ this.name = isValidString(name) ? name : "";
+ this.value = isValidString(value) ? value : "";
+ }
- private boolean isValidString(String arg) {
- if (arg == null) {
- return false;
- }
+ public String getName() {
+ return this.name;
+ }
- if (arg.trim().isEmpty()) {
- return false;
- }
+ public String getValue() {
+ return this.value;
+ }
- return true;
- }
+ private static boolean isValidString(String arg) {
+ return arg != null;
+ }
}
diff --git a/boat-scaffold/src/main/templates/boat-java/README.mustache b/boat-scaffold/src/main/templates/boat-java/README.mustache
index 777e2c860..157c8b6e0 100644
--- a/boat-scaffold/src/main/templates/boat-java/README.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/README.mustache
@@ -8,6 +8,8 @@
- Build date: {{generatedDate}}
{{/hideGenerationTimestamp}}
+- Generator version: {{generatorVersion}}
+
{{{appDescriptionWithNewLines}}}
{{#infoUrl}}
@@ -197,11 +199,14 @@ Class | Method | HTTP request | Description
{{#models}}{{#model}} - [{{classname}}]({{modelDocPath}}{{classname}}.md)
{{/model}}{{/models}}
+
## Documentation for Authorization
-{{^authMethods}}All endpoints do not require authorization.
-{{/authMethods}}Authentication schemes defined for the API:
-{{#authMethods}}### {{name}}
+{{^authMethods}}Endpoints do not require authorization.{{/authMethods}}
+{{#hasAuthMethods}}Authentication schemes defined for the API:{{/hasAuthMethods}}
+{{#authMethods}}
+
+### {{name}}
{{#isApiKey}}
@@ -209,10 +214,18 @@ Class | Method | HTTP request | Description
- **API key parameter name**: {{keyParamName}}
- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
{{/isApiKey}}
-{{#isBasic}}
+{{#isBasicBasic}}
- **Type**: HTTP basic authentication
-{{/isBasic}}
+{{/isBasicBasic}}
+{{#isBasicBearer}}
+
+- **Type**: HTTP Bearer Token authentication{{#bearerFormat}} ({{{.}}}){{/bearerFormat}}
+{{/isBasicBearer}}
+{{#isHttpSignature}}
+
+- **Type**: HTTP signature authentication
+{{/isHttpSignature}}
{{#isOAuth}}
- **Type**: OAuth
@@ -232,4 +245,4 @@ It's recommended to create an instance of `ApiClient` per thread in a multithrea
## Author
{{#apiInfo}}{{#apis}}{{#-last}}{{infoEmail}}
-{{/-last}}{{/apis}}{{/apiInfo}}
\ No newline at end of file
+{{/-last}}{{/apis}}{{/apiInfo}}
diff --git a/boat-scaffold/src/main/templates/boat-java/RFC3339DateFormat.mustache b/boat-scaffold/src/main/templates/boat-java/RFC3339DateFormat.mustache
index 311616a4e..c2c205c20 100644
--- a/boat-scaffold/src/main/templates/boat-java/RFC3339DateFormat.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/RFC3339DateFormat.mustache
@@ -11,6 +11,8 @@ import java.text.DecimalFormat;
import java.util.GregorianCalendar;
import java.util.TimeZone;
+{{>generatedAnnotation}}
+
public class RFC3339DateFormat extends DateFormat {
private static final long serialVersionUID = 1L;
private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
@@ -43,4 +45,4 @@ public class RFC3339DateFormat extends DateFormat {
public Object clone() {
return super.clone();
}
-}
\ No newline at end of file
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/RFC3339InstantDeserializer.mustache b/boat-scaffold/src/main/templates/boat-java/RFC3339InstantDeserializer.mustache
new file mode 100644
index 000000000..ea4b0799a
--- /dev/null
+++ b/boat-scaffold/src/main/templates/boat-java/RFC3339InstantDeserializer.mustache
@@ -0,0 +1,90 @@
+{{>licenseInfo}}
+package {{invokerPackage}};
+
+import java.io.IOException;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAccessor;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature;
+import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
+
+{{>generatedAnnotation}}
+
+public class RFC3339InstantDeserializer extends InstantDeserializer {
+ private static final long serialVersionUID = 1L;
+ private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault();
+ private final static boolean DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS
+ = JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS.enabledByDefault();
+
+ public static final RFC3339InstantDeserializer INSTANT = new RFC3339InstantDeserializer<>(
+ Instant.class, DateTimeFormatter.ISO_INSTANT,
+ Instant::from,
+ a -> Instant.ofEpochMilli( a.value ),
+ a -> Instant.ofEpochSecond( a.integer, a.fraction ),
+ null,
+ true, // yes, replace zero offset with Z
+ DEFAULT_NORMALIZE_ZONE_ID,
+ DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS
+ );
+
+ public static final RFC3339InstantDeserializer OFFSET_DATE_TIME = new RFC3339InstantDeserializer<>(
+ OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME,
+ OffsetDateTime::from,
+ a -> OffsetDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ),
+ a -> OffsetDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ),
+ (d, z) -> ( d.isEqual( OffsetDateTime.MIN ) || d.isEqual( OffsetDateTime.MAX ) ?
+ d :
+ d.withOffsetSameInstant( z.getRules().getOffset( d.toLocalDateTime() ) ) ),
+ true, // yes, replace zero offset with Z
+ DEFAULT_NORMALIZE_ZONE_ID,
+ DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS
+ );
+
+ public static final RFC3339InstantDeserializer ZONED_DATE_TIME = new RFC3339InstantDeserializer<>(
+ ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME,
+ ZonedDateTime::from,
+ a -> ZonedDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ),
+ a -> ZonedDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ),
+ ZonedDateTime::withZoneSameInstant,
+ false, // keep zero offset and Z separate since zones explicitly supported
+ DEFAULT_NORMALIZE_ZONE_ID,
+ DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS
+ );
+
+ protected RFC3339InstantDeserializer(
+ Class supportedType,
+ DateTimeFormatter formatter,
+ Function parsedToValue,
+ Function fromMilliseconds,
+ Function fromNanoseconds,
+ BiFunction adjust,
+ boolean replaceZeroOffsetAsZ,
+ boolean normalizeZoneId,
+ boolean readNumericStringsAsTimestamp) {
+ super(
+ supportedType,
+ formatter,
+ parsedToValue,
+ fromMilliseconds,
+ fromNanoseconds,
+ adjust,
+ replaceZeroOffsetAsZ,
+ normalizeZoneId,
+ readNumericStringsAsTimestamp
+ );
+ }
+
+ @Override
+ protected T _fromString(JsonParser p, DeserializationContext ctxt, String string0) throws IOException {
+ return super._fromString(p, ctxt, string0.replace( ' ', 'T' ));
+ }
+}
\ No newline at end of file
diff --git a/boat-scaffold/src/main/templates/boat-java/RFC3339JavaTimeModule.mustache b/boat-scaffold/src/main/templates/boat-java/RFC3339JavaTimeModule.mustache
new file mode 100644
index 000000000..6b780cd43
--- /dev/null
+++ b/boat-scaffold/src/main/templates/boat-java/RFC3339JavaTimeModule.mustache
@@ -0,0 +1,29 @@
+{{>licenseInfo}}
+package {{invokerPackage}};
+
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.Module.SetupContext;
+
+{{>generatedAnnotation}}
+
+public class RFC3339JavaTimeModule extends SimpleModule {
+ private static final long serialVersionUID = 1L;
+
+ public RFC3339JavaTimeModule() {
+ super("RFC3339JavaTimeModule");
+ }
+
+ @Override
+ public void setupModule(SetupContext context) {
+ super.setupModule(context);
+
+ addDeserializer(Instant.class, RFC3339InstantDeserializer.INSTANT);
+ addDeserializer(OffsetDateTime.class, RFC3339InstantDeserializer.OFFSET_DATE_TIME);
+ addDeserializer(ZonedDateTime.class, RFC3339InstantDeserializer.ZONED_DATE_TIME);
+ }
+
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/ServerConfiguration.mustache b/boat-scaffold/src/main/templates/boat-java/ServerConfiguration.mustache
index e324da7a8..4c94d0bd0 100644
--- a/boat-scaffold/src/main/templates/boat-java/ServerConfiguration.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/ServerConfiguration.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
package {{invokerPackage}};
import java.util.Map;
@@ -5,6 +7,8 @@ import java.util.Map;
/**
* Representing a Server configuration.
*/
+{{>generatedAnnotation}}
+
public class ServerConfiguration {
public String URL;
public String description;
@@ -55,4 +59,4 @@ public class ServerConfiguration {
public String URL() {
return URL(null);
}
-}
\ No newline at end of file
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/ServerVariable.mustache b/boat-scaffold/src/main/templates/boat-java/ServerVariable.mustache
index 1978b1eb9..f8261c444 100644
--- a/boat-scaffold/src/main/templates/boat-java/ServerVariable.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/ServerVariable.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
package {{invokerPackage}};
import java.util.HashSet;
@@ -5,6 +7,8 @@ import java.util.HashSet;
/**
* Representing a Server Variable for server URL template substitution.
*/
+{{>generatedAnnotation}}
+
public class ServerVariable {
public String description;
public String defaultValue;
diff --git a/boat-scaffold/src/main/templates/boat-java/StringUtil.mustache b/boat-scaffold/src/main/templates/boat-java/StringUtil.mustache
index ce52c8238..31af8371f 100644
--- a/boat-scaffold/src/main/templates/boat-java/StringUtil.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/StringUtil.mustache
@@ -2,7 +2,11 @@
package {{invokerPackage}};
+import java.util.Collection;
+import java.util.Iterator;
+
{{>generatedAnnotation}}
+
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).
@@ -47,4 +51,23 @@ public class StringUtil {
}
return out.toString();
}
+
+ /**
+ * Join a list of strings with the given separator.
+ *
+ * @param list The list of strings
+ * @param separator The separator
+ * @return the resulting string
+ */
+ public static String join(Collection list, String separator) {
+ Iterator iterator = list.iterator();
+ StringBuilder out = new StringBuilder();
+ if (iterator.hasNext()) {
+ out.append(iterator.next());
+ }
+ while (iterator.hasNext()) {
+ out.append(separator).append(iterator.next());
+ }
+ return out.toString();
+ }
}
diff --git a/boat-scaffold/src/main/templates/boat-java/additionalModelTypeAnnotations.mustache b/boat-scaffold/src/main/templates/boat-java/additionalModelTypeAnnotations.mustache
index e5dc1ac12..f4871c02c 100644
--- a/boat-scaffold/src/main/templates/boat-java/additionalModelTypeAnnotations.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/additionalModelTypeAnnotations.mustache
@@ -1,2 +1,2 @@
-{{#additionalModelTypeAnnotations}}{{.}}
+{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/boat-scaffold/src/main/templates/boat-java/additional_properties.mustache b/boat-scaffold/src/main/templates/boat-java/additional_properties.mustache
new file mode 100644
index 000000000..04c226bce
--- /dev/null
+++ b/boat-scaffold/src/main/templates/boat-java/additional_properties.mustache
@@ -0,0 +1,34 @@
+{{#jackson}}
+{{#additionalPropertiesType}}
+ /**
+ * Set the additional (undeclared) property with the specified name and value.
+ * Creates the property if it does not already exist, otherwise replaces it.
+ * @param key the name of the property
+ * @param value the value of the property
+ * @return self reference
+ */
+ @JsonAnySetter
+ public {{classname}} putAdditionalProperty(String key, {{{.}}} value) {
+ this.put(key, value);
+ return this;
+ }
+
+ /**
+ * Return the additional (undeclared) properties.
+ * @return the additional (undeclared) properties
+ */
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this;
+ }
+
+ /**
+ * Return the additional (undeclared) property with the specified name.
+ * @param key the name of the property
+ * @return the additional (undeclared) property with the specified name
+ */
+ public {{{.}}} getAdditionalProperty(String key) {
+ return this.get(key);
+ }
+{{/additionalPropertiesType}}
+{{/jackson}}
diff --git a/boat-scaffold/src/main/templates/boat-java/api.mustache b/boat-scaffold/src/main/templates/boat-java/api.mustache
index 099d41cd2..3cfd92db0 100644
--- a/boat-scaffold/src/main/templates/boat-java/api.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/api.mustache
@@ -13,20 +13,14 @@ import {{invokerPackage}}.Pair;
{{/imports}}
-{{^fullJavaUtil}}
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-{{/fullJavaUtil}}
{{>generatedAnnotation}}
+
{{#operations}}
-{{#useBeanValidation}}
-{{#useClassLevelBeanValidation}}
-@Validated
-{{/useClassLevelBeanValidation}}
-{{/useBeanValidation}}
public class {{classname}} {
private ApiClient apiClient;
@@ -51,7 +45,7 @@ public class {{classname}} {
* {{summary}}
* {{notes}}
{{#allParams}}
- * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}}
+ * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}}
{{/allParams}}
{{#returnType}}
* @return {{.}}
@@ -68,7 +62,7 @@ public class {{classname}} {
{{#isDeprecated}}
@Deprecated
{{/isDeprecated}}
- public {{#returnType}}{{{.}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws ApiException {
+ public {{#returnType}}{{{.}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{>nullable_var_annotations}} {{{dataType}}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws ApiException {
Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
{{#allParams}}{{#required}}
// verify the required parameter '{{paramName}}' is set
@@ -81,11 +75,11 @@ public class {{classname}} {
.replaceAll("\\{" + "{{baseName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
// query params
- {{javaUtilPrefix}}List localVarQueryParams = new {{javaUtilPrefix}}ArrayList();
- {{javaUtilPrefix}}List localVarCollectionQueryParams = new {{javaUtilPrefix}}ArrayList();
- {{javaUtilPrefix}}Map localVarHeaderParams = new {{javaUtilPrefix}}HashMap();
- {{javaUtilPrefix}}Map localVarCookieParams = new {{javaUtilPrefix}}HashMap();
- {{javaUtilPrefix}}Map localVarFormParams = new {{javaUtilPrefix}}HashMap();
+ List localVarQueryParams = new ArrayList();
+ List localVarCollectionQueryParams = new ArrayList();
+ Map localVarHeaderParams = new HashMap();
+ Map localVarCookieParams = new HashMap();
+ Map localVarFormParams = new HashMap();
{{#queryParams}}
{{#collectionFormat}}localVarCollectionQueryParams.addAll(apiClient.parameterToPairs("{{{.}}}", {{/collectionFormat}}{{^collectionFormat}}localVarQueryParams.addAll(apiClient.parameterToPair({{/collectionFormat}}"{{baseName}}", {{paramName}}));
@@ -124,4 +118,4 @@ public class {{classname}} {
}
{{/operation}}
}
-{{/operations}}
\ No newline at end of file
+{{/operations}}
diff --git a/boat-scaffold/src/main/templates/boat-java/apiException.mustache b/boat-scaffold/src/main/templates/boat-java/apiException.mustache
index 30e171fba..93e28ec89 100644
--- a/boat-scaffold/src/main/templates/boat-java/apiException.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/apiException.mustache
@@ -6,7 +6,10 @@ import java.util.Map;
import java.util.List;
{{>generatedAnnotation}}
+
public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
+ private static final long serialVersionUID = 1L;
+
private int code = 0;
private Map> responseHeaders = null;
private String responseBody = null;
@@ -86,4 +89,4 @@ public class ApiException extends{{#useRuntimeException}} RuntimeException {{/us
", responseBody='" + responseBody + '\'' +
'}';
}
-}
\ No newline at end of file
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/api_doc.mustache b/boat-scaffold/src/main/templates/boat-java/api_doc.mustache
index 680095472..3d3203957 100644
--- a/boat-scaffold/src/main/templates/boat-java/api_doc.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/api_doc.mustache
@@ -105,4 +105,4 @@ public class Example {
{{/responses.0}}
{{/operation}}
-{{/operations}}
\ No newline at end of file
+{{/operations}}
diff --git a/boat-scaffold/src/main/templates/boat-java/api_test.mustache b/boat-scaffold/src/main/templates/boat-java/api_test.mustache
index 176be8069..155f46e40 100644
--- a/boat-scaffold/src/main/templates/boat-java/api_test.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/api_test.mustache
@@ -5,23 +5,21 @@ package {{package}};
import {{invokerPackage}}.ApiException;
{{#imports}}import {{import}};
{{/imports}}
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import java.time.LocalDate;
import java.time.OffsetDateTime;
-{{^fullJavaUtil}}
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-{{/fullJavaUtil}}
/**
* API tests for {{classname}}
*/
-public class {{classname}}Test {
+class {{classname}}Test {
private final {{classname}} api = new {{classname}}();
@@ -40,7 +38,7 @@ public class {{classname}}Test {
* if the Api call fails
*/
@Test
- public void {{operationId}}Test() throws ApiException {
+ void {{operationId}}Test() throws ApiException {
//{{#allParams}}
//{{{dataType}}} {{paramName}} = null;
//{{/allParams}}
@@ -50,4 +48,4 @@ public class {{classname}}Test {
}
{{/operation}}
{{/operations}}
-}
\ No newline at end of file
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/auth/ApiKeyAuth.mustache b/boat-scaffold/src/main/templates/boat-java/auth/ApiKeyAuth.mustache
index 991ae2350..8703bedd3 100644
--- a/boat-scaffold/src/main/templates/boat-java/auth/ApiKeyAuth.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/auth/ApiKeyAuth.mustache
@@ -8,6 +8,7 @@ import java.util.Map;
import java.util.List;
{{>generatedAnnotation}}
+
public class ApiKeyAuth implements Authentication {
private final String location;
private final String paramName;
diff --git a/boat-scaffold/src/main/templates/boat-java/auth/Authentication.mustache b/boat-scaffold/src/main/templates/boat-java/auth/Authentication.mustache
index 033de98d5..78bddebaf 100644
--- a/boat-scaffold/src/main/templates/boat-java/auth/Authentication.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/auth/Authentication.mustache
@@ -7,13 +7,15 @@ import {{invokerPackage}}.Pair;
import java.util.Map;
import java.util.List;
+{{>generatedAnnotation}}
+
public interface Authentication {
- /**
- * Apply authentication settings to header and query params.
- *
- * @param queryParams List of query parameters
- * @param headerParams Map of header parameters
- * @param cookieParams Map of cookie parameters
- */
- void applyToParams(List queryParams, Map headerParams, Map cookieParams);
+ /**
+ * Apply authentication settings to header and query params.
+ *
+ * @param queryParams List of query parameters
+ * @param headerParams Map of header parameters
+ * @param cookieParams Map of cookie parameters
+ */
+ void applyToParams(List queryParams, Map headerParams, Map cookieParams);
}
diff --git a/boat-scaffold/src/main/templates/boat-java/auth/HttpBasicAuth.mustache b/boat-scaffold/src/main/templates/boat-java/auth/HttpBasicAuth.mustache
index 9dfe714b5..be2863d62 100644
--- a/boat-scaffold/src/main/templates/boat-java/auth/HttpBasicAuth.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/auth/HttpBasicAuth.mustache
@@ -11,6 +11,7 @@ import java.util.Map;
import java.util.List;
{{>generatedAnnotation}}
+
public class HttpBasicAuth implements Authentication {
private String username;
private String password;
@@ -39,4 +40,4 @@ public class HttpBasicAuth implements Authentication {
String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
headerParams.put("Authorization", "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)));
}
-}
\ No newline at end of file
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/auth/HttpBearerAuth.mustache b/boat-scaffold/src/main/templates/boat-java/auth/HttpBearerAuth.mustache
index 322281f87..5290e3fb7 100644
--- a/boat-scaffold/src/main/templates/boat-java/auth/HttpBearerAuth.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/auth/HttpBearerAuth.mustache
@@ -4,16 +4,18 @@ package {{invokerPackage}}.auth;
import {{invokerPackage}}.Pair;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
{{>generatedAnnotation}}
+
public class HttpBearerAuth implements Authentication {
private final String scheme;
- private String bearerToken;
+ private Supplier tokenSupplier;
public HttpBearerAuth(String scheme) {
- this.scheme = scheme;
+ this.scheme = upperCaseBearer(scheme);
}
/**
@@ -22,7 +24,7 @@ public class HttpBearerAuth implements Authentication {
* @return The bearer token
*/
public String getBearerToken() {
- return bearerToken;
+ return tokenSupplier.get();
}
/**
@@ -31,19 +33,28 @@ public class HttpBearerAuth implements Authentication {
* @param bearerToken The bearer token to send in the Authorization header
*/
public void setBearerToken(String bearerToken) {
- this.bearerToken = bearerToken;
+ this.tokenSupplier = () -> bearerToken;
+ }
+
+ /**
+ * Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header.
+ *
+ * @param tokenSupplier The supplier of bearer tokens to send in the Authorization header
+ */
+ public void setBearerToken(Supplier tokenSupplier) {
+ this.tokenSupplier = tokenSupplier;
}
@Override
public void applyToParams(List queryParams, Map headerParams, Map cookieParams) {
- if(bearerToken == null) {
+ String bearerToken = tokenSupplier != null ? tokenSupplier.get() : null;
+ if (bearerToken == null) {
return;
}
-
- headerParams.put("Authorization", (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken);
+ headerParams.put("Authorization", (scheme != null ? scheme + " " : "") + bearerToken);
}
private static String upperCaseBearer(String scheme) {
- return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme;
+ return "bearer".equalsIgnoreCase(scheme) ? "Bearer" : scheme;
}
}
diff --git a/boat-scaffold/src/main/templates/boat-java/auth/OAuth.mustache b/boat-scaffold/src/main/templates/boat-java/auth/OAuth.mustache
index 5cb98e7cb..a500f67cf 100644
--- a/boat-scaffold/src/main/templates/boat-java/auth/OAuth.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/auth/OAuth.mustache
@@ -8,6 +8,7 @@ import java.util.Map;
import java.util.List;
{{>generatedAnnotation}}
+
public class OAuth implements Authentication {
private String accessToken;
diff --git a/boat-scaffold/src/main/templates/boat-java/auth/OAuthFlow.mustache b/boat-scaffold/src/main/templates/boat-java/auth/OAuthFlow.mustache
index 3f14c64b1..8dd1cad4e 100644
--- a/boat-scaffold/src/main/templates/boat-java/auth/OAuthFlow.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/auth/OAuthFlow.mustache
@@ -6,9 +6,10 @@ package {{invokerPackage}}.auth;
* OAuth flows that are supported by this client
*/
{{>generatedAnnotation}}
+
public enum OAuthFlow {
ACCESS_CODE, //called authorizationCode in OpenAPI 3.0
IMPLICIT,
PASSWORD,
APPLICATION //called clientCredentials in OpenAPI 3.0
-}
\ No newline at end of file
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/build.gradle.mustache b/boat-scaffold/src/main/templates/boat-java/build.gradle.mustache
index 4d3e795a0..d5094224f 100644
--- a/boat-scaffold/src/main/templates/boat-java/build.gradle.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/build.gradle.mustache
@@ -57,16 +57,16 @@ if(hasProperty('target') && target == 'android') {
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
task.description = "Create jar artifact for ${variant.name}"
task.dependsOn variant.javaCompile
- task.from variant.javaCompile.destinationDir
- task.destinationDir = project.file("${project.buildDir}/outputs/jar")
- task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+ task.from variant.javaCompile.destinationDirectory
+ task.destinationDirectory = project.file("${project.buildDir}/outputs/jar")
+ task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar"
artifacts.add('archives', task);
}
}
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
- classifier = 'sources'
+ archiveClassifier = 'sources'
}
artifacts {
@@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
}
task sourcesJar(type: Jar, dependsOn: classes) {
- classifier = 'sources'
+ archiveClassifier = 'sources'
from sourceSets.main.allSource
}
task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
+ archiveClassifier = 'javadoc'
from javadoc.destinationDir
}
@@ -114,15 +114,21 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.6.3"
- jackson_version = "2.12.6"
- jackson_databind_version = "2.12.6.1"
+ jackson_version = "2.19.2"
+ jackson_databind_version = "2.19.2"
{{#openApiNullable}}
- jackson_databind_nullable_version = "0.2.4"
+ jackson_databind_nullable_version = "0.2.9"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
+ {{#useBeanValidation}}
+ bean_validation_version = "3.0.2"
+ {{/useBeanValidation}}
jersey_version = "1.19.4"
jodatime_version = "2.9.9"
- junit_version = "4.13.2"
+ junit_version = "5.10.2"
+ {{#useReflectionEqualsHashCode}}
+ commons_lang3_version = "3.17.0"
+ {{/useReflectionEqualsHashCode}}
}
dependencies {
@@ -142,5 +148,27 @@ dependencies {
{{/joda}}
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
+ {{#useBeanValidation}}
+ implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
+ {{/useBeanValidation}}
+ {{#useReflectionEqualsHashCode}}
+ implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
+ {{/useReflectionEqualsHashCode}}
testImplementation "junit:junit:$junit_version"
-}
\ No newline at end of file
+ testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+ testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+ // Enable JUnit 5 (Gradle 4.6+).
+ useJUnitPlatform()
+
+ // Always run tests, even when nothing changed.
+ dependsOn 'cleanTest'
+
+ // Show test results.
+ testLogging {
+ events "passed", "skipped", "failed"
+ }
+
+}
diff --git a/boat-scaffold/src/main/templates/boat-java/generatedAnnotation.mustache b/boat-scaffold/src/main/templates/boat-java/generatedAnnotation.mustache
index b3147c04f..e05689d5f 100644
--- a/boat-scaffold/src/main/templates/boat-java/generatedAnnotation.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/generatedAnnotation.mustache
@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@{{^useJakartaEe}}javax{{/useJakartaEe}}{{#useJakartaEe}}jakarta{{/useJakartaEe}}.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
+@{{javaxPackage}}.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}, comments = "Generator version: {{generatorVersion}}")
\ No newline at end of file
diff --git a/boat-scaffold/src/main/templates/boat-java/git_push.sh.mustache b/boat-scaffold/src/main/templates/boat-java/git_push.sh.mustache
old mode 100755
new mode 100644
index 9ff0e8c65..0e3776ae6
--- a/boat-scaffold/src/main/templates/boat-java/git_push.sh.mustache
+++ b/boat-scaffold/src/main/templates/boat-java/git_push.sh.mustache
@@ -54,4 +54,4 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
-git push origin master 2>&1 | grep -v 'To https'
\ No newline at end of file
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/boat-scaffold/src/main/templates/boat-java/gradle-wrapper.jar b/boat-scaffold/src/main/templates/boat-java/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644
GIT binary patch
literal 43453
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 yu?e%!_ptzGB|8GrCfu%p?(_
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