Skip to content

Commit 43a8c11

Browse files
DevAganiDevAgani
authored
Merge branch 'main' into chore/dynamic-switch-msdk
2 parents 63aab9c + 18ca231 commit 43a8c11

File tree

13 files changed

+22
-40
lines changed

13 files changed

+22
-40
lines changed

‎README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ It currently consists of
1414

1515
# Release Notes
1616
BOAT is still under development and subject to change.
17+
## 0.17.59
18+
* Fix bug where java-spring generator puts `@Valid` annoation on return type of Api methods, cause service to blame
19+
client for invalid generated response with a 400 status.
20+
## 0.17.58
21+
22+
## 0.17.57
23+
1724
## 0.17.56
1825
* Added new `flattenOutput` parameter into `bundle` execution to generate the bundled APIs directly into `output` directory, even though the respective `input` files are located within a subdirectory in the `input`.
1926
## 0.17.55

‎boat-engine/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<version>0.17.59-SNAPSHOT</version>
8+
<version>0.17.60-SNAPSHOT</version>
99
</parent>
1010
<artifactId>boat-engine</artifactId>
1111
<packaging>jar</packaging>

‎boat-maven-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<version>0.17.59-SNAPSHOT</version>
8+
<version>0.17.60-SNAPSHOT</version>
99
</parent>
1010
<artifactId>boat-maven-plugin</artifactId>
1111

‎boat-quay/boat-quay-lint/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>boat-quay</artifactId>
8-
<version>0.17.59-SNAPSHOT</version>
8+
<version>0.17.60-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>boat-quay-lint</artifactId>

‎boat-quay/boat-quay-rules/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>boat-quay</artifactId>
8-
<version>0.17.59-SNAPSHOT</version>
8+
<version>0.17.60-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>boat-quay-rules</artifactId>

‎boat-quay/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<version>0.17.59-SNAPSHOT</version>
8+
<version>0.17.60-SNAPSHOT</version>
99
</parent>
1010

1111

‎boat-scaffold/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.backbase.oss</groupId>
77
<artifactId>backbase-openapi-tools</artifactId>
8-
<version>0.17.59-SNAPSHOT</version>
8+
<version>0.17.60-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>boat-scaffold</artifactId>
@@ -102,7 +102,7 @@
102102
<dependency>
103103
<groupId>com.backbase.oss</groupId>
104104
<artifactId>boat-trail-resources</artifactId>
105-
<version>0.17.59-SNAPSHOT</version>
105+
<version>0.17.60-SNAPSHOT</version>
106106
<scope>test</scope>
107107
</dependency>
108108
<dependency>

‎boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,9 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
392392
codegenParameter.paramName = "httpServletRequest";
393393
codegenOperation.allParams.add(codegenParameter);
394394
}
395+
if (codegenOperation.returnType != null) {
396+
codegenOperation.returnType = codegenOperation.returnType.replace("@Valid", "");
397+
}
395398
return codegenOperation;
396399
}
397400

‎boat-scaffold/src/main/templates/boat-swift5/Podspec.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = '{{projectName}}'
33
s.version = '{{podVersion}}'{{#projectDescription}}
4-
s.summary = '{{projectDescription}}'{{/projectDescription}}{{#podDescription}}
4+
s.summary = '{{projectDescription}}. API Spec Version: {{appVersion}}'{{/projectDescription}}{{#podDescription}}
55
s.description = '{{podDescription}}'{{/podDescription}}
66
s.license = '{{#podLicense}}{{& podLicense}}{{/podLicense}}'{{^podLicense}}'Proprietary'{{/podLicense}}
77
s.homepage = '{{podHomepage}}{{^podHomepage}}https://github.com/Backbase/backbase-openapi-tools{{/podHomepage}}'{{#podAuthors}}

‎boat-scaffold/src/main/templates/boat-swift5/api.mustache‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,6 @@ extension {{moduleName}}Client {
2424
/// {{classname}} protocol defines a blueprint of methods, properties, and other requirements for {{classname}} functionality.
2525
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} protocol {{classname}}Protocol {
2626
{{#operation}}
27-
28-
{{#hasParams}}
29-
/**
30-
{{#summary}}
31-
{{{summary}}}
32-
{{/summary}}
33-
- {{httpMethod}} {{{path}}}{{#notes}}
34-
- {{{notes}}}{{/notes}}{{#subresourceOperation}}
35-
- subresourceOperation: {{subresourceOperation}}{{/subresourceOperation}}{{#defaultResponse}}
36-
- defaultResponse: {{defaultResponse}}{{/defaultResponse}}
37-
{{#authMethods}}
38-
- {{#isBasic}}BASIC{{/isBasic}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}:
39-
- type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeaer}}(HEADER){{/isKeyInHeaer}}{{/keyParamName}}
40-
- name: {{name}}
41-
{{/authMethods}}
42-
{{#hasResponseHeaders}}
43-
- responseHeaders: [{{#responseHeaders}}{{{baseName}}}({{{dataType}}}){{^-last}}, {{/-last}}{{/responseHeaders}}]
44-
{{/hasResponseHeaders}}
45-
{{#externalDocs}}
46-
- externalDocs: {{externalDocs}}
47-
{{/externalDocs}}
48-
{{#allParams}}
49-
- parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
50-
{{/allParams}}
51-
- returns: Call<{{#returnType}}{{#isResponseFile}}Data{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}NoResponse{{/returnType}}> {{description}}
52-
*/
53-
@available(*, deprecated, message: "This method is deprecated in favor of the alternative method with {{classname}}.{{operationIdCamelCase}}RequestParams class.")
54-
func {{operationId}}Call({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}{{{dataType}}}{{/isContainer}}{{^isContainer}}{{classname}}.{{{datatypeWithEnum}}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) throws -> Call<{{#returnType}}{{#isResponseFile}}Data{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}NoResponse{{/returnType}}>
55-
{{/hasParams}}
5627

5728
/**
5829
{{#summary}}
@@ -229,6 +200,7 @@ extension {{moduleName}}Client {
229200
}
230201
}
231202
{{/useResult}}
203+
232204
{{#hasParams}}
233205
/**
234206
{{#summary}}

0 commit comments

Comments
 (0)