Skip to content

Commit 1bf109c

Browse files
fluorumlabsdependabot[bot]
fluorumlabs
and
dependabot[bot]
authored
chore(deps): bump swagger-codegen to 3.0.27 (#11743)
* Bump swagger-codegen to 3.0.27 * Fix formatting * Fix formatting * chore(deps): bump jetty.version (#11722) Bumps `jetty.version` from 9.4.27.v20200227 to 9.4.43.v20210629. Updates `jetty-maven-plugin` from 9.4.27.v20200227 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](jetty/jetty.project@jetty-9.4.27.v20200227...jetty-9.4.43.v20210629) Updates `jetty-webapp` from 9.4.27.v20200227 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](jetty/jetty.project@jetty-9.4.27.v20200227...jetty-9.4.43.v20210629) Updates `jetty-continuation` from 9.4.27.v20200227 to 9.4.43.v20210629 Updates `jetty-annotations` from 9.4.27.v20200227 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](jetty/jetty.project@jetty-9.4.27.v20200227...jetty-9.4.43.v20210629) Updates `websocket-server` from 9.4.27.v20200227 to 9.4.43.v20210629 --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-continuation dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-server dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump maven-clean-plugin from 3.0.0 to 3.1.0 (#11728) Bumps [maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](apache/maven-clean-plugin@maven-clean-plugin-3.0.0...maven-clean-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump equalsverifier from 3.0 to 3.7.1 (#11723) Bumps [equalsverifier](https://github.com/jqno/equalsverifier) from 3.0 to 3.7.1. - [Release notes](https://github.com/jqno/equalsverifier/releases) - [Changelog](https://github.com/jqno/equalsverifier/blob/main/CHANGELOG.md) - [Commits](jqno/equalsverifier@equalsverifier-3.0...equalsverifier-3.7.1) --- updated-dependencies: - dependency-name: nl.jqno.equalsverifier:equalsverifier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump maven-enforcer-plugin from 1.4.1 to 3.0.0 (#11724) Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 1.4.1 to 3.0.0. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](apache/maven-enforcer@enforcer-1.4.1...enforcer-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump exec-maven-plugin from 1.6.0 to 3.0.0 (#11727) Bumps [exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 1.6.0 to 3.0.0. - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](mojohaus/exec-maven-plugin@exec-maven-plugin-1.6.0...exec-maven-plugin-3.0.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump maven-dependency-plugin from 2.8 to 3.2.0 (#11738) Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 2.8 to 3.2.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](apache/maven-dependency-plugin@maven-dependency-plugin-2.8...maven-dependency-plugin-3.2.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump validation-api from 2.0.0.Final to 2.0.1.Final (#11735) Bumps [validation-api](https://github.com/beanvalidation/beanvalidation-api) from 2.0.0.Final to 2.0.1.Final. - [Release notes](https://github.com/beanvalidation/beanvalidation-api/releases) - [Commits](jakartaee/validation@2.0.0.Final...2.0.1.Final) --- updated-dependencies: - dependency-name: javax.validation:validation-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump hsqldb from 2.2.6 to 2.6.0 (#11737) Bumps hsqldb from 2.2.6 to 2.6.0. --- updated-dependencies: - dependency-name: org.hsqldb:hsqldb dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump mockito-core from 3.10.0 to 3.12.4 (#11733) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.10.0 to 3.12.4. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v3.10.0...v3.12.4) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: organize dependency versions and update vulnerable jackson-databind version for fusion-endpoint (#11659) * Organize dependency versions * Retrigger validation * Update tests to reflect changes in FasterXML/jackson-databind#2643 * chore(deps): Override frontend-plugin-core dependencies (#11732) This overrides outdated and vulnerable jackson-databind and httpclient with a more recent yet compatible versions. Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent ddbc599 commit 1bf109c

File tree

8 files changed

+125
-10
lines changed

8 files changed

+125
-10
lines changed

‎fusion-endpoint/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<spring.autoconfigure.version>2.2.0.RELEASE</spring.autoconfigure.version>
1717
<javax.annotation.api.version>1.3.2</javax.annotation.api.version>
1818
<javaparser.version>3.23.0</javaparser.version>
19-
<swagger.codegen.version>3.0.2</swagger.codegen.version>
20-
<swagger.codegen.generators.version>1.0.2</swagger.codegen.generators.version>
19+
<swagger.codegen.version>3.0.27</swagger.codegen.version>
20+
<swagger.codegen.generators.version>1.0.27</swagger.codegen.generators.version>
2121
</properties>
2222

2323
<dependencies>

‎fusion-endpoint/src/main/java/com/vaadin/fusion/generator/typescript/CodeGenerator.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import io.swagger.codegen.v3.CodegenType;
4343
import io.swagger.codegen.v3.DefaultGenerator;
4444
import io.swagger.codegen.v3.generators.typescript.AbstractTypeScriptClientCodegen;
45+
import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
4546
import io.swagger.util.Json;
4647
import io.swagger.v3.oas.models.OpenAPI;
4748
import io.swagger.v3.oas.models.Operation;
@@ -229,10 +230,10 @@ public CodegenOperation fromOperation(String path, String httpMethod,
229230

230231
@Override
231232
@SuppressWarnings("unchecked")
232-
public CodegenParameter fromRequestBody(RequestBody body,
233-
Map<String, Schema> schemas, Set<String> imports) {
234-
CodegenParameter codegenParameter = super.fromRequestBody(body, schemas,
235-
imports);
233+
public CodegenParameter fromRequestBody(RequestBody body, String name,
234+
Schema schema, Map<String, Schema> schemas, Set<String> imports) {
235+
CodegenParameter codegenParameter = super.fromRequestBody(body, name,
236+
schema, schemas, imports);
236237
Schema requestBodySchema = getRequestBodySchema(body);
237238
if (requestBodySchema != null) {
238239
imports.addAll(collectImportsFromSchema(requestBodySchema));
@@ -304,7 +305,7 @@ public String getTypeDeclaration(Schema schema) {
304305
return String.format("ReadonlyArray<%s>%s",
305306
this.getTypeDeclaration(inner), optionalSuffix);
306307
} else if (GeneratorUtils.isNotBlank(schema.get$ref())) {
307-
return getSimpleRef(schema.get$ref()) + optionalSuffix;
308+
return OpenAPIUtil.getSimpleRef(schema.get$ref()) + optionalSuffix;
308309
} else if (schema.getAdditionalProperties() != null) {
309310
Schema inner = (Schema) schema.getAdditionalProperties();
310311
return String.format("Readonly<Record<string, %s>>%s",
@@ -417,7 +418,7 @@ public String toModelName(String name) {
417418
}
418419

419420
@Override
420-
protected void addImport(CodegenModel m, String type) {
421+
public void addImport(CodegenModel m, String type) {
421422
if (!Objects.equals(m.getName(), type)) {
422423
super.addImport(m, type);
423424
}
@@ -486,7 +487,7 @@ private void adjustImportInformationForModel(
486487
private Set<String> collectImportsFromSchema(Schema schema) {
487488
Set<String> imports = new HashSet<>();
488489
if (GeneratorUtils.isNotBlank(schema.get$ref())) {
489-
imports.add(getSimpleRef(schema.get$ref()));
490+
imports.add(OpenAPIUtil.getSimpleRef(schema.get$ref()));
490491
}
491492
if (schema instanceof ArraySchema) {
492493
imports.addAll(collectImportsFromSchema(

‎fusion-endpoint/src/test/resources/com/vaadin/fusion/generator/endpoints/inheritedmodel/expected-model-media.ArraySchema.ts

-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ import Schema from './Schema';
55
* All changes to this file are overridden. Please consider to make changes in the corresponding Java file if necessary.
66
*/
77
export default interface ArraySchema extends Schema {
8-
readonly type?: string;
98
readonly items?: Schema;
109
}

‎fusion-endpoint/src/test/resources/com/vaadin/fusion/generator/endpoints/inheritedmodel/expected-model-media.Schema.ts

+1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ export default interface Schema {
4040
readonly extensions?: Readonly<Record<string, any | undefined>>;
4141
readonly _enum?: ReadonlyArray<any | undefined>;
4242
readonly discriminator?: Discriminator;
43+
readonly exampleSetFlag: boolean;
4344
}

‎fusion-endpoint/src/test/resources/com/vaadin/fusion/generator/openapi/multiple-tags-operation.json

+30
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,35 @@
3737
}
3838
}
3939
}
40+
},
41+
"components" : {
42+
"schemas" : {
43+
"Role" : {
44+
"type" : "object",
45+
"properties" : {
46+
"roleName" : {
47+
"type" : "string"
48+
}
49+
},
50+
"description" : "Role bean"
51+
},
52+
"User" : {
53+
"type" : "object",
54+
"properties" : {
55+
"name" : {
56+
"type" : "string"
57+
},
58+
"password" : {
59+
"type" : "string"
60+
},
61+
"roles" : {
62+
"type" : "object",
63+
"additionalProperties" : {
64+
"$ref" : "#/components/schemas/Role"
65+
}
66+
}
67+
}
68+
}
69+
}
4070
}
4171
}

‎fusion-endpoint/src/test/resources/com/vaadin/fusion/generator/openapi/multiplelines-description.json

+30
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,35 @@
3737
}
3838
}
3939
}
40+
},
41+
"components" : {
42+
"schemas" : {
43+
"Role" : {
44+
"type" : "object",
45+
"properties" : {
46+
"roleName" : {
47+
"type" : "string"
48+
}
49+
},
50+
"description" : "Role bean"
51+
},
52+
"User" : {
53+
"type" : "object",
54+
"properties" : {
55+
"name" : {
56+
"type" : "string"
57+
},
58+
"password" : {
59+
"type" : "string"
60+
},
61+
"roles" : {
62+
"type" : "object",
63+
"additionalProperties" : {
64+
"$ref" : "#/components/schemas/Role"
65+
}
66+
}
67+
}
68+
}
69+
}
4070
}
4171
}

‎fusion-endpoint/src/test/resources/com/vaadin/fusion/generator/openapi/no-tag-operation.json

+30
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,35 @@
3636
}
3737
}
3838
}
39+
},
40+
"components" : {
41+
"schemas" : {
42+
"Role" : {
43+
"type" : "object",
44+
"properties" : {
45+
"roleName" : {
46+
"type" : "string"
47+
}
48+
},
49+
"description" : "Role bean"
50+
},
51+
"User" : {
52+
"type" : "object",
53+
"properties" : {
54+
"name" : {
55+
"type" : "string"
56+
},
57+
"password" : {
58+
"type" : "string"
59+
},
60+
"roles" : {
61+
"type" : "object",
62+
"additionalProperties" : {
63+
"$ref" : "#/components/schemas/Role"
64+
}
65+
}
66+
}
67+
}
68+
}
3969
}
4070
}

‎fusion-endpoint/src/test/resources/com/vaadin/fusion/generator/openapi/parameters-and-return-tsdoc.json

+24
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,30 @@
7575
}
7676
}
7777
}
78+
},
79+
"ComplexRequest" : {
80+
"type" : "object",
81+
"properties" : {
82+
"valueA" : {
83+
"type" : "string"
84+
},
85+
"valueB" : {
86+
"type" : "string"
87+
}
88+
},
89+
"description" : "ComplexRequest bean"
90+
},
91+
"ComplexResponse" : {
92+
"type" : "object",
93+
"properties" : {
94+
"valueC" : {
95+
"type" : "string"
96+
},
97+
"valueD" : {
98+
"type" : "string"
99+
}
100+
},
101+
"description" : "ComplexResponse bean"
78102
}
79103
},
80104
"securitySchemes" : {

0 commit comments

Comments
 (0)