Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update openapi-generator #3993

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generators/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories {
}

dependencies {
compileOnly 'org.openapitools:openapi-generator:7.8.0'
compileOnly 'org.openapitools:openapi-generator:7.9.0'
}

tasks.withType(JavaCompile) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@ private void exploreGraph(OperationsMap operations) {
}
}
for (CodegenParameter param : ope.allParams) {
CodegenModel paramType = getModel(param.baseType != null ? param.baseType : param.dataType);
String paramName = param.baseType != null ? param.baseType : param.dataType;
// php has a fully qualified name for the parameter type
if (paramName.contains("\\")) {
paramName = paramName.substring(paramName.lastIndexOf("\\") + 1);
}
CodegenModel paramType = getModel(paramName);
if (paramType != null) {
visitedModels.add(paramType.name);
}
Expand Down Expand Up @@ -121,7 +126,8 @@ public static void removeOrphans(CodegenConfig config, OperationsMap operations,
String templateName = config.modelTemplateFiles().keySet().iterator().next();

for (String modelName : toRemove) {
String filename = config.modelFilename(templateName, modelName);
String suffix = config.modelTemplateFiles().get(templateName);
String filename = config.modelFileFolder() + "/" + config.toModelFilename(modelName) + suffix;
File file = new File(filename);
if (file.exists()) {
file.delete();
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"website:build": "bash scripts/website/build.sh"
},
"devDependencies": {
"@openapitools/openapi-generator-cli": "2.13.13",
"@openapitools/openapi-generator-cli": "2.14.0",
"@redocly/cli": "1.25.5",
"eslint": "8.57.1",
"eslint-plugin-automation-custom": "1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/pre-gen/generateOpenapitools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export async function generateOpenapitools(
JSON.stringify(
{
'generator-cli': {
version: '7.8.0',
version: '7.9.0',
generators,
},
},
Expand Down
1 change: 0 additions & 1 deletion specs/common/schemas/IndexSettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,6 @@ widgets:
banners:
description: banners defined in the merchandising studio for the given search.
type: array
additionalProperties: false
items:
$ref: '#/banner'

Expand Down
2 changes: 1 addition & 1 deletion templates/php/api.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ use Algolia\AlgoliaSearch\Exceptions\NotFoundException;
{{/x-acl}}
{{/vendorExtensions}}
{{#allParams}}
* @param {{#isString}}string{{/isString}}{{#isLong}}int{{/isLong}}{{#isInteger}}int{{/isInteger}}{{#isBoolean}}bool{{/isBoolean}}{{^isString}}{{^isLong}}{{^isInteger}}{{^isBoolean}}array{{/isBoolean}}{{/isInteger}}{{/isLong}}{{/isString}} ${{paramName}}{{#description}} {{.}}{{/description}}{{^description}} {{paramName}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}}
* @param {{#isString}}string{{/isString}}{{#isLong}}int{{/isLong}}{{#isInteger}}int{{/isInteger}}{{#isBoolean}}bool{{/isBoolean}}{{^isString}}{{^isLong}}{{^isInteger}}{{^isBoolean}}array{{/isBoolean}}{{/isInteger}}{{/isLong}}{{/isString}} ${{paramName}}{{#description}} {{{.}}}{{/description}}{{^description}} {{paramName}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}}
{{#isModel}}
{{#vars}}
* - ${{paramName}}{{> arrayParam}}
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@algolia/api-client-automation@workspace:."
dependencies:
"@openapitools/openapi-generator-cli": "npm:2.13.13"
"@openapitools/openapi-generator-cli": "npm:2.14.0"
"@redocly/cli": "npm:1.25.5"
eslint: "npm:8.57.1"
eslint-plugin-automation-custom: "npm:1.0.0"
Expand Down Expand Up @@ -1416,9 +1416,9 @@ __metadata:
languageName: node
linkType: hard

"@openapitools/openapi-generator-cli@npm:2.13.13":
version: 2.13.13
resolution: "@openapitools/openapi-generator-cli@npm:2.13.13"
"@openapitools/openapi-generator-cli@npm:2.14.0":
version: 2.14.0
resolution: "@openapitools/openapi-generator-cli@npm:2.14.0"
dependencies:
"@nestjs/axios": "npm:3.0.3"
"@nestjs/common": "npm:10.4.3"
Expand All @@ -1440,7 +1440,7 @@ __metadata:
tslib: "npm:2.7.0"
bin:
openapi-generator-cli: main.js
checksum: 10/298735860feb5da01b46f5e0c85978ccdb4bb579515abe52f7a65dfc16ca04d713d8056725958fe75ccc3edd08d6677e7f13543e24bf9487bfa48851ddc36035
checksum: 10/4229f94af263695b6e899b8cfa2ed8217611a15ebda91541c5c1449af03cd76da148bb9d8084ceb3767d5e75ecd1cb22c61bb4f3608ebf238392a6c75ddda42e
languageName: node
linkType: hard

Expand Down
Loading