From 663675dce3d9f0129bc09a67cec4deda1ae1a2e3 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 5 Jan 2022 16:21:29 +0000 Subject: [PATCH 1/6] [version bump] new dev version --- boat-engine/pom.xml | 2 +- boat-maven-plugin/pom.xml | 2 +- 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 ++-- boat-terminal/pom.xml | 2 +- boat-trail-resources/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/boat-engine/pom.xml b/boat-engine/pom.xml index b0275aabf..9174d038e 100644 --- a/boat-engine/pom.xml +++ b/boat-engine/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT boat-engine jar diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml index 6084b6773..fcb950934 100644 --- a/boat-maven-plugin/pom.xml +++ b/boat-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT boat-maven-plugin diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index 64b2d554c..f57a13dcd 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.15.3-SNAPSHOT + 0.15.4-SNAPSHOT boat-quay-lint jar diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index f562923f4..36a4e6d5c 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.15.3-SNAPSHOT + 0.15.4-SNAPSHOT boat-quay-rules jar diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml index 1a13a650a..ce544d3fb 100644 --- a/boat-quay/pom.xml +++ b/boat-quay/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml index 546e599ed..18303bdff 100644 --- a/boat-scaffold/pom.xml +++ b/boat-scaffold/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT boat-scaffold @@ -86,7 +86,7 @@ com.backbase.oss boat-trail-resources - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT test diff --git a/boat-terminal/pom.xml b/boat-terminal/pom.xml index ef73ac21e..a944c3838 100644 --- a/boat-terminal/pom.xml +++ b/boat-terminal/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT boat-terminal diff --git a/boat-trail-resources/pom.xml b/boat-trail-resources/pom.xml index a3fea60ef..1f462a0ee 100644 --- a/boat-trail-resources/pom.xml +++ b/boat-trail-resources/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT boat-trail-resources diff --git a/pom.xml b/pom.xml index d3be6d8df..7341bf9a9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT pom Backbase Open Api Tools will help you converting RAML to OpenAPI plus many more diff --git a/tests/pom.xml b/tests/pom.xml index a3a64fa8e..38703eddf 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.3-SNAPSHOT + 0.15.4-SNAPSHOT tests From 00d75176712c9c6ee2bf9800b28306ad1dea4481 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 5 Apr 2022 10:08:23 +0000 Subject: [PATCH 2/6] [version bump] new dev version --- boat-engine/pom.xml | 2 +- boat-maven-plugin/pom.xml | 2 +- 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 ++-- boat-terminal/pom.xml | 2 +- boat-trail-resources/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/boat-engine/pom.xml b/boat-engine/pom.xml index e0093604a..c00856c3f 100644 --- a/boat-engine/pom.xml +++ b/boat-engine/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.5-SNAPSHOT + 0.15.6-SNAPSHOT boat-engine jar diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml index ed87e77c1..1223cfab1 100644 --- a/boat-maven-plugin/pom.xml +++ b/boat-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.5-SNAPSHOT + 0.15.6-SNAPSHOT boat-maven-plugin diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index 53288c512..be8753698 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.15.5-SNAPSHOT + 0.15.6-SNAPSHOT boat-quay-lint diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index 12896da23..7416604e4 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.15.5-SNAPSHOT + 0.15.6-SNAPSHOT boat-quay-rules diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml index 0357a5156..b65503b1f 100644 --- a/boat-quay/pom.xml +++ b/boat-quay/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.5-SNAPSHOT + 0.15.6-SNAPSHOT diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml index fd754ff9a..39dda3341 100644 --- a/boat-scaffold/pom.xml +++ b/boat-scaffold/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.5-SNAPSHOT + 0.15.6-SNAPSHOT boat-scaffold @@ -87,7 +87,7 @@ com.backbase.oss boat-trail-resources - 0.15.5-SNAPSHOT + 0.15.6-SNAPSHOT test diff --git a/boat-terminal/pom.xml b/boat-terminal/pom.xml index 6f84f0d79..c3699a455 100644 --- a/boat-terminal/pom.xml +++ b/boat-terminal/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.5-SNAPSHOT + 0.15.6-SNAPSHOT boat-terminal diff --git a/boat-trail-resources/pom.xml b/boat-trail-resources/pom.xml index 14415fb71..af8c6fd74 100644 --- a/boat-trail-resources/pom.xml +++ b/boat-trail-resources/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.5-SNAPSHOT + 0.15.6-SNAPSHOT boat-trail-resources diff --git a/pom.xml b/pom.xml index 6dab5d91f..e1f9a169b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.5-SNAPSHOT + 0.15.6-SNAPSHOT pom Backbase Open Api Tools will help you converting RAML to OpenAPI plus many more diff --git a/tests/pom.xml b/tests/pom.xml index c7069ffe3..647bea867 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -5,7 +5,7 @@ com.backbase.oss backbase-openapi-tools - 0.15.5-SNAPSHOT + 0.15.6-SNAPSHOT tests From 5875d215f1fcd33882feaa615ad011a50babf7ac Mon Sep 17 00:00:00 2001 From: Balazs Toth Date: Fri, 22 Apr 2022 15:16:41 +0200 Subject: [PATCH 3/6] Respect createApiComponent setting on generated ApiClient class --- README.md | 3 +++ boat-maven-plugin/README.md | 9 +++++++++ .../libraries/resttemplate/ApiClient.mustache | 10 +++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ee887576..ccaa5119b 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,9 @@ The project is very much Work In Progress and will be published on maven central # Release Notes BOAT is still under development and subject to change. +## 0.15.6 +* *Maven Plugin* + * Add example of use the additional properties like createApiComponent ## 0.15.5 * *Boat Lint* * Bumped version of Zally Linting Libraries that contain several vulnerability fixes diff --git a/boat-maven-plugin/README.md b/boat-maven-plugin/README.md index f8d287957..980e0b6e9 100644 --- a/boat-maven-plugin/README.md +++ b/boat-maven-plugin/README.md @@ -87,6 +87,15 @@ Same with `generate` but with opinionated defaults for Rest Template Client +### Sample usage with additional feature + + + ... + + createApiComponent=false + + + ## boat:generate-webclient-embedded Same with `generate` but with opinionated defaults for Web Client diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache index cbb9232b3..3142dc70d 100644 --- a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache +++ b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache @@ -8,7 +8,6 @@ import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator; {{/withXml}} import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; {{#restTemplateBeanName}} import org.springframework.beans.factory.annotation.Qualifier; {{/restTemplateBeanName}} @@ -31,7 +30,10 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter; {{/withXml}} +{{#createApiComponent}} +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +{{/createApiComponent}} import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; @@ -88,7 +90,9 @@ import {{invokerPackage}}.auth.OAuth; {{/authMethods}} {{>generatedAnnotation}} +{{#createApiComponent}} @Component("{{invokerPackage}}.ApiClient") +{{/createApiComponent}} public class ApiClient { public enum CollectionFormat { CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); @@ -127,11 +131,15 @@ public class ApiClient { } {{/useDefaultApiClient}} {{#useJacksonConversion}} +{{#createApiComponent}} @Autowired +{{/createApiComponent}} private ObjectMapper objectMapper; {{/useJacksonConversion}} +{{#createApiComponent}} @Autowired +{{/createApiComponent}} public ApiClient({{#restTemplateBeanName}}@Qualifier("{{restTemplateBeanName}}") {{/restTemplateBeanName}}RestTemplate restTemplate) { this.restTemplate = restTemplate; init(); From ec93cdbd79c3c117ee2a4244be598045ab07328f Mon Sep 17 00:00:00 2001 From: daiscog Date: Tue, 10 May 2022 07:57:24 +0100 Subject: [PATCH 4/6] Generate ng-package.json file and remove ng-packagr config from package.json (#265) --- .../codegen/angular/BoatAngularGenerator.java | 1 + .../templates/boat-angular/package.mustache | 8 +------- .../angular/BoatAngularTemplatesTests.java | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java index 01ed5558b..9304ad587 100644 --- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java +++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java @@ -219,6 +219,7 @@ private void applyAngularVersion(String versionRange) { private void addDependencies(SemVer angularVersion) { if (additionalProperties.containsKey(NPM_NAME)) { supportingFiles.add(new SupportingFile("package.mustache", getIndexDirectory(), "package.json")); + supportingFiles.add(new SupportingFile("ng-package.mustache", getIndexDirectory(), "ng-package.json")); supportingFiles.add(new SupportingFile("tsconfig.mustache", getIndexDirectory(), "tsconfig.json")); additionalProperties.put("zonejsVersion", "0.10.2"); additionalProperties.put("rxjsVersion", "6.6.0"); diff --git a/boat-scaffold/src/main/templates/boat-angular/package.mustache b/boat-scaffold/src/main/templates/boat-angular/package.mustache index 45fa921e6..b1d2e6429 100644 --- a/boat-scaffold/src/main/templates/boat-angular/package.mustache +++ b/boat-scaffold/src/main/templates/boat-angular/package.mustache @@ -12,13 +12,7 @@ ], "license": "Unlicense", "scripts": { - "build": "ng-packagr -p package.json" - }, - "ngPackage": { - "lib": { - "entryFile": "public_api.ts" - }, - "dest": "{{{buildDist}}}" + "build": "ng-packagr -p ng-package.json" }, "peerDependencies": { "@angular/core": "^{{ngVersion}}", diff --git a/boat-scaffold/src/test/java/com/backbase/oss/codegen/angular/BoatAngularTemplatesTests.java b/boat-scaffold/src/test/java/com/backbase/oss/codegen/angular/BoatAngularTemplatesTests.java index 77f78cf3a..b5f2dee43 100644 --- a/boat-scaffold/src/test/java/com/backbase/oss/codegen/angular/BoatAngularTemplatesTests.java +++ b/boat-scaffold/src/test/java/com/backbase/oss/codegen/angular/BoatAngularTemplatesTests.java @@ -1,5 +1,7 @@ package com.backbase.oss.codegen.angular; +import java.util.Optional; +import java.util.stream.Collectors; import lombok.SneakyThrows; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeAll; @@ -90,6 +92,22 @@ void generate(Combination param) { assertThat(this.files.size(), not(equalTo(0))); } + @Check + public void ngPackageConfig() throws IOException { + var ngPackageFiles = selectFiles("/ng-package\\.json$"); + if (this.param.npmName) { + assertThat(ngPackageFiles, hasSize(1)); + List content; + try (var lines = Files.lines(Paths.get(ngPackageFiles.get(0)))) { + content = lines.collect(Collectors.toList()); + } + var dist = Optional.ofNullable(this.param.buildDist).orElse("dist"); + assertThat(content, hasItem(containsString("\"dest\": \"" + dist + "\""))); + } else { + assertThat(ngPackageFiles, hasSize(0)); + } + } + @Check public void npmName() { assertThat( From 1a9f45199e487ab446cb4a73952502fd7a70f8a2 Mon Sep 17 00:00:00 2001 From: jorge Date: Tue, 10 May 2022 10:06:24 +0200 Subject: [PATCH 5/6] fix conflicts --- boat-engine/pom.xml | 4 ---- boat-maven-plugin/pom.xml | 4 ---- boat-quay/boat-quay-lint/pom.xml | 4 ---- boat-quay/boat-quay-rules/pom.xml | 4 ---- boat-quay/pom.xml | 4 ---- boat-scaffold/pom.xml | 8 -------- boat-terminal/pom.xml | 4 ---- boat-trail-resources/pom.xml | 4 ---- pom.xml | 4 ---- tests/pom.xml | 4 ---- 10 files changed, 44 deletions(-) diff --git a/boat-engine/pom.xml b/boat-engine/pom.xml index 8d113d5e7..c00856c3f 100644 --- a/boat-engine/pom.xml +++ b/boat-engine/pom.xml @@ -5,11 +5,7 @@ com.backbase.oss backbase-openapi-tools -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f boat-engine jar diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml index 748a8f816..1223cfab1 100644 --- a/boat-maven-plugin/pom.xml +++ b/boat-maven-plugin/pom.xml @@ -5,11 +5,7 @@ com.backbase.oss backbase-openapi-tools -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f boat-maven-plugin diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml index 5fd261d9c..be8753698 100644 --- a/boat-quay/boat-quay-lint/pom.xml +++ b/boat-quay/boat-quay-lint/pom.xml @@ -5,11 +5,7 @@ com.backbase.oss boat-quay -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f boat-quay-lint diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml index ca6750685..7416604e4 100644 --- a/boat-quay/boat-quay-rules/pom.xml +++ b/boat-quay/boat-quay-rules/pom.xml @@ -5,11 +5,7 @@ com.backbase.oss boat-quay -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f boat-quay-rules diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml index 1c8a61bd6..b65503b1f 100644 --- a/boat-quay/pom.xml +++ b/boat-quay/pom.xml @@ -5,11 +5,7 @@ com.backbase.oss backbase-openapi-tools -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml index 72cb9dffd..39dda3341 100644 --- a/boat-scaffold/pom.xml +++ b/boat-scaffold/pom.xml @@ -5,11 +5,7 @@ com.backbase.oss backbase-openapi-tools -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f boat-scaffold @@ -91,11 +87,7 @@ com.backbase.oss boat-trail-resources -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f test diff --git a/boat-terminal/pom.xml b/boat-terminal/pom.xml index 39f969d9a..c3699a455 100644 --- a/boat-terminal/pom.xml +++ b/boat-terminal/pom.xml @@ -5,11 +5,7 @@ com.backbase.oss backbase-openapi-tools -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f boat-terminal diff --git a/boat-trail-resources/pom.xml b/boat-trail-resources/pom.xml index 12a528f02..af8c6fd74 100644 --- a/boat-trail-resources/pom.xml +++ b/boat-trail-resources/pom.xml @@ -5,11 +5,7 @@ com.backbase.oss backbase-openapi-tools -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f boat-trail-resources diff --git a/pom.xml b/pom.xml index 5725c318c..e1f9a169b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,8 @@ com.backbase.oss backbase-openapi-tools -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f pom Backbase Open Api Tools will help you converting RAML to OpenAPI plus many more diff --git a/tests/pom.xml b/tests/pom.xml index 52d334dc4..647bea867 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -5,11 +5,7 @@ com.backbase.oss backbase-openapi-tools -<<<<<<< HEAD - 0.15.4-SNAPSHOT -======= 0.15.6-SNAPSHOT ->>>>>>> ec93cdbd79c3c117ee2a4244be598045ab07328f tests From b4156b31198b0f1eb7cbcd1dbfa057ce6385c1b8 Mon Sep 17 00:00:00 2001 From: Marco Santarelli Date: Tue, 10 May 2022 17:37:08 +0200 Subject: [PATCH 6/6] Release notes --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ccaa5119b..7cfea68e8 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ BOAT is still under development and subject to change. ## 0.15.6 * *Maven Plugin* * Add example of use the additional properties like createApiComponent +* Boat Angular generator + * Generate an `ng-package.json` file for use with the `ng-package` CLI ## 0.15.5 * *Boat Lint* * Bumped version of Zally Linting Libraries that contain several vulnerability fixes