Skip to content

Commit 7a85692

Browse files
committed
fix the generator
1 parent c2f2994 commit 7a85692

File tree

9 files changed

+18
-11
lines changed

9 files changed

+18
-11
lines changed

generators/src/main/java/com/algolia/codegen/AlgoliaGoGenerator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ public void processOpts() {
4141
// Generation notice, added on every generated files
4242
Helpers.setGenerationBanner(additionalProperties);
4343

44+
typeMapping.put("object", "map[string]any");
45+
typeMapping.put("AnyType", "any");
46+
4447
apiTestTemplateFiles.clear();
4548
modelTestTemplateFiles.clear();
4649
apiDocTemplateFiles.clear();

generators/src/main/java/com/algolia/codegen/AlgoliaSwiftGenerator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.samskivert.mustache.Mustache;
1111
import io.swagger.v3.oas.models.OpenAPI;
1212
import io.swagger.v3.oas.models.Operation;
13-
import io.swagger.v3.oas.models.media.ArraySchema;
1413
import io.swagger.v3.oas.models.media.ComposedSchema;
1514
import io.swagger.v3.oas.models.media.Schema;
1615
import io.swagger.v3.oas.models.media.StringSchema;
@@ -374,7 +373,7 @@ public String getTypeDeclaration(Schema p) {
374373
Schema<?> schema = ModelUtils.unaliasSchema(this.openAPI, p, importMapping);
375374
Schema<?> target = ModelUtils.isGenerateAliasAsModel() ? p : schema;
376375
if (ModelUtils.isArraySchema(target)) {
377-
Schema<?> items = getSchemaItems((ArraySchema) schema);
376+
Schema<?> items = ModelUtils.getSchemaItems(schema);
378377
return ModelUtils.isSet(target) && ModelUtils.isObjectSchema(items)
379378
? "Set<" + getTypeDeclaration(items) + ">"
380379
: "[" + getTypeDeclaration(items) + "]";

playground/go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
1414
github.com/go-playground/locales v0.14.1 // indirect
1515
github.com/go-playground/universal-translator v0.18.1 // indirect
16-
github.com/go-playground/validator/v10 v10.21.0 // indirect
16+
github.com/go-playground/validator/v10 v10.22.0 // indirect
1717
github.com/leodido/go-urn v1.4.0 // indirect
1818
golang.org/x/crypto v0.22.0 // indirect
1919
golang.org/x/net v0.24.0 // indirect

playground/go/go.sum

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
88
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
99
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
1010
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
11-
github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4=
12-
github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
13-
github.com/go-playground/validator/v10 v10.21.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
11+
github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
12+
github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
1413
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
1514
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
1615
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=

playground/go/search.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func testSearch(appID, apiKey string) int {
1717
searchClient.NewApiAddOrUpdateObjectRequest(
1818
indexName,
1919
"1",
20-
map[string]interface{}{
20+
map[string]any{
2121
"name": "Foo",
2222
"age": 42,
2323
"city": "Paris",

scripts/install.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
# You can install this by running `source scripts/install.sh` or by adding this to your .bashrc/.zshrc:
55
# [[ -s "$HOME/<path to api-clients-automation>/scripts/install.sh" ]] && source "$HOME/<path to api-clients-automation>/scripts/install.sh"
66

7+
# for extra DX you could also add the following shortcuts to your .bashrc/.zshrc:
8+
# alias ag="apic generate"
9+
# alias acg="apic cts generate"
10+
# alias acr="apic cts run"
11+
712
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
813

914
apic() {

specs/common/schemas/IndexSettings.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,13 +778,14 @@ hitsPerPage:
778778
- Pagination
779779

780780
userData:
781+
type: object
781782
example:
782783
settingID: f2a7b51e3503acc6a39b3784ffb84300
783784
pluginVersion: 1.6.0
784785
description: |
785786
An object with custom data.
786787
787-
You can store up to 32&nbsp;kB as custom data.
788+
You can store up to 32kB as custom data.
788789
default: {}
789790
x-categories:
790791
- Advanced

tests/output/go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
1717
github.com/go-playground/locales v0.14.1 // indirect
1818
github.com/go-playground/universal-translator v0.18.1 // indirect
19-
github.com/go-playground/validator/v10 v10.21.0 // indirect
19+
github.com/go-playground/validator/v10 v10.22.0 // indirect
2020
github.com/leodido/go-urn v1.4.0 // indirect
2121
github.com/pmezard/go-difflib v1.0.0 // indirect
2222
golang.org/x/crypto v0.22.0 // indirect

tests/output/go/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
88
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
99
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
1010
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
11-
github.com/go-playground/validator/v10 v10.21.0 h1:4fZA11ovvtkdgaeev9RGWPgc1uj3H8W+rNYyH/ySBb0=
12-
github.com/go-playground/validator/v10 v10.21.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
11+
github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
12+
github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
1313
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
1414
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
1515
github.com/kinbiko/jsonassert v1.1.1 h1:DB12divY+YB+cVpHULLuKePSi6+ui4M/shHSzJISkSE=

0 commit comments

Comments
 (0)