Release 0.15.6 (#266)

santam85 · actions-user · balazstbb · web-flow · commit 0c1001fff547 · 2022-05-10T17:47:33.000+02:00
* [version bump] new dev version * [version bump] new dev version * Respect createApiComponent setting on generated ApiClient class * Generate ng-package.json file and remove ng-packagr config from package.json (#265) * fix conflicts * Release notes Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Balazs Toth <balazst@backbase.com> Co-authored-by: Balazs Toth <82379122+balazstbb@users.noreply.github.com> Co-authored-by: daiscog <daiscog@users.noreply.github.com> Co-authored-by: jorge <jorge@backbase.com>
diff --git a/README.md b/README.md
@@ -18,6 +18,11 @@ 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
+* 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
diff --git a/boat-engine/pom.xml b/boat-engine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.5</version>
+        <version>0.15.6-SNAPSHOT</version>
     </parent>
     <artifactId>boat-engine</artifactId>
     <packaging>jar</packaging>
diff --git 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
         </configOptions>
     </configuration>
 
+### Sample usage with additional feature
+
+    <configuration>
+        ...
+        <additionalProperties>
+            <additionalProperty>createApiComponent=false</additionalProperty>
+        </additionalProperties>
+    </configuration>
+
 ## boat:generate-webclient-embedded
 
 Same with `generate` but with opinionated defaults for Web Client
diff --git a/boat-maven-plugin/pom.xml b/boat-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.5</version>
+        <version>0.15.6-SNAPSHOT</version>
     </parent>
     <artifactId>boat-maven-plugin</artifactId>
 
diff --git a/boat-quay/boat-quay-lint/pom.xml b/boat-quay/boat-quay-lint/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>boat-quay</artifactId>
-        <version>0.15.5</version>
+        <version>0.15.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>boat-quay-lint</artifactId>
diff --git a/boat-quay/boat-quay-rules/pom.xml b/boat-quay/boat-quay-rules/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>boat-quay</artifactId>
-        <version>0.15.5</version>
+        <version>0.15.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>boat-quay-rules</artifactId>
diff --git a/boat-quay/pom.xml b/boat-quay/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.5</version>
+        <version>0.15.6-SNAPSHOT</version>
     </parent>
 
 
diff --git a/boat-scaffold/pom.xml b/boat-scaffold/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.5</version>
+        <version>0.15.6-SNAPSHOT</version>
     </parent>
   
     <artifactId>boat-scaffold</artifactId>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>com.backbase.oss</groupId>
             <artifactId>boat-trail-resources</artifactId>
-            <version>0.15.5</version>
+            <version>0.15.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
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
@@ -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
@@ -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/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();
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
@@ -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<String> 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(
diff --git a/boat-terminal/pom.xml b/boat-terminal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.5</version>
+        <version>0.15.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>boat-terminal</artifactId>
diff --git a/boat-trail-resources/pom.xml b/boat-trail-resources/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.5</version>
+        <version>0.15.6-SNAPSHOT</version>
     </parent>
   
     <artifactId>boat-trail-resources</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.backbase.oss</groupId>
     <artifactId>backbase-openapi-tools</artifactId>
-    <version>0.15.5</version>
+    <version>0.15.6-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <description>Backbase Open Api Tools will help you converting RAML to OpenAPI plus many more</description>
@@ -471,7 +471,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -542,4 +542,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.backbase.oss</groupId>
         <artifactId>backbase-openapi-tools</artifactId>
-        <version>0.15.5</version>
+        <version>0.15.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>tests</artifactId>
