Skip to content

Commit 92e24d5

Browse files
committed
migrate to v3
1 parent 61ea6ea commit 92e24d5

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

generators/src/main/java/com/algolia/codegen/utils/ModelPruner.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,12 @@ private void exploreGraph(OperationsMap operations) {
8686
}
8787
}
8888
for (CodegenParameter param : ope.allParams) {
89-
CodegenModel paramType = getModel(param.baseType != null ? param.baseType : param.dataType);
89+
String paramName = param.baseType != null ? param.baseType : param.dataType;
90+
// php has a fully qualified name for the parameter type
91+
if (paramName.contains("\\")) {
92+
paramName = paramName.substring(paramName.lastIndexOf("\\") + 1);
93+
}
94+
CodegenModel paramType = getModel(paramName);
9095
if (paramType != null) {
9196
visitedModels.add(paramType.name);
9297
}
@@ -121,7 +126,8 @@ public static void removeOrphans(CodegenConfig config, OperationsMap operations,
121126
String templateName = config.modelTemplateFiles().keySet().iterator().next();
122127

123128
for (String modelName : toRemove) {
124-
String filename = config.modelFilename(templateName, modelName);
129+
String suffix = config.modelTemplateFiles().get(templateName);
130+
String filename = config.modelFileFolder() + "/" + config.toModelFilename(modelName) + suffix;
125131
File file = new File(filename);
126132
if (file.exists()) {
127133
file.delete();

specs/common/schemas/IndexSettings.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,6 @@ widgets:
10351035
banners:
10361036
description: banners defined in the merchandising studio for the given search.
10371037
type: array
1038-
additionalProperties: false
10391038
items:
10401039
$ref: '#/banner'
10411040

templates/php/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ use Algolia\AlgoliaSearch\Exceptions\NotFoundException;
181181
{{/x-acl}}
182182
{{/vendorExtensions}}
183183
{{#allParams}}
184-
* @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}}
184+
* @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}}
185185
{{#isModel}}
186186
{{#vars}}
187187
* - ${{paramName}}{{> arrayParam}}

tests/output/kotlin/src/commonTest/kotlin/com/algolia/utils/HttpRequestBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ package com.algolia.utils
33
import io.ktor.client.plugins.*
44
import io.ktor.client.request.*
55

6-
val HttpRequestBuilder.socketTimeout: Long? get() = getCapabilityOrNull(HttpTimeout)?.socketTimeoutMillis
6+
val HttpRequestBuilder.socketTimeout: Long? get() = getCapabilityOrNull(HttpTimeoutCapability)?.socketTimeoutMillis
77

8-
val HttpRequestBuilder.connectTimeout: Long? get() = getCapabilityOrNull(HttpTimeout)?.connectTimeoutMillis
8+
val HttpRequestBuilder.connectTimeout: Long? get() = getCapabilityOrNull(HttpTimeoutCapability)?.connectTimeoutMillis

0 commit comments

Comments
 (0)