Skip to content

Commit 2648029

Browse files
committed
fix csharp and swift
1 parent aa04a0c commit 2648029

File tree

4 files changed

+27
-5
lines changed

4 files changed

+27
-5
lines changed

clients/algoliasearch-client-kotlin/client/src/commonMain/kotlin/com/algolia/client/extensions/SearchForHits.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public fun SearchForHits.Companion.from(
8484
replaceSynonymsInHighlight = searchParamsObject.replaceSynonymsInHighlight,
8585
minProximity = searchParamsObject.minProximity,
8686
responseFields = searchParamsObject.responseFields,
87-
maxFacetHits = searchParamsObject.maxFacetHits,
8887
maxValuesPerFacet = searchParamsObject.maxValuesPerFacet,
8988
sortFacetValuesBy = searchParamsObject.sortFacetValuesBy,
9089
attributeCriteriaComputedByMinProximity = searchParamsObject.attributeCriteriaComputedByMinProximity,

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.algolia.codegen.exceptions.*;
44
import com.algolia.codegen.utils.*;
5+
import com.google.common.collect.ImmutableMap.Builder;
56
import com.samskivert.mustache.Mustache;
7+
import com.samskivert.mustache.Mustache.Lambda;
68
import io.swagger.v3.oas.models.OpenAPI;
79
import io.swagger.v3.oas.models.Operation;
810
import io.swagger.v3.oas.models.servers.Server;
@@ -156,4 +158,23 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
156158
public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, List<Server> servers) {
157159
return Helpers.specifyCustomRequest(super.fromOperation(path, httpMethod, operation, servers));
158160
}
161+
162+
/** Convert a Seq type to a valid class name. */
163+
private String typeToName(String content) {
164+
String[] parts = content.split("<");
165+
String name = "";
166+
for (int i = 0; i < parts.length; i++) {
167+
name += Helpers.capitalize(parts[i].replace(">", "").replace(",", "").replace(" ", ""));
168+
}
169+
return name;
170+
}
171+
172+
@Override
173+
protected Builder<String, Lambda> addMustacheLambdas() {
174+
Builder<String, Lambda> lambdas = super.addMustacheLambdas();
175+
176+
lambdas.put("type-to-name", (Mustache.Lambda) (fragment, writer) -> writer.write(typeToName(fragment.execute())));
177+
178+
return lambdas;
179+
}
159180
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,14 @@ public class AlgoliaSwiftGenerator extends Swift5ClientCodegen {
7373
"highlightresultoption",
7474
"ignoreplurals",
7575
"indexsettingsassearchparams",
76+
"insideBoundingBox",
7677
"languages",
7778
"matchedgeolocation",
7879
"matchlevel",
7980
"mode",
8081
"numericfilters",
8182
"optionalfilters",
83+
"optionalWords",
8284
"params",
8385
"personalization",
8486
"promote",

templates/csharp/modelOneOf.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/// Initializes a new instance of the {{classname}} class
3131
/// with a {{#lambdaCref}}{{{dataType}}}{{/lambdaCref}}
3232
/// </summary>
33-
/// <param name="actualInstance">An instance of {{dataType}}.</param>
33+
/// <param name="actualInstance">An instance of {{{dataType}}}.</param>
3434
public {{classname}}({{{dataType}}} actualInstance)
3535
{
3636
ActualInstance = actualInstance{{^model.isNullable}}{{^isPrimitiveType}}{{^allowableValues}} ?? throw new ArgumentException("Invalid instance found. Must not be null."){{/allowableValues}}{{/isPrimitiveType}}{{#isPrimitiveType}}{{#isArray}} ?? throw new ArgumentException("Invalid instance found. Must not be null."){{/isArray}}{{#isFreeFormObject}} ?? throw new ArgumentException("Invalid instance found. Must not be null."){{/isFreeFormObject}}{{#isString}} ?? throw new ArgumentException("Invalid instance found. Must not be null."){{/isString}}{{/isPrimitiveType}}{{/model.isNullable}};
@@ -44,7 +44,7 @@
4444
/// Initializes a new instance of the {{classname}} class
4545
/// with a {{#lambdaCref}}{{{dataType}}}{{/lambdaCref}}
4646
/// </summary>
47-
/// <param name="actualInstance">An instance of {{dataType}}.</param>
47+
/// <param name="actualInstance">An instance of {{{dataType}}}.</param>
4848
public {{classname}}(object actualInstance)
4949
{
5050
ActualInstance = actualInstance{{^model.isNullable}}{{^isPrimitiveType}}{{^allowableValues}} ?? throw new ArgumentException("Invalid instance found. Must not be null."){{/allowableValues}}{{/isPrimitiveType}}{{#isPrimitiveType}}{{#isArray}} ?? throw new ArgumentException("Invalid instance found. Must not be null."){{/isArray}}{{#isFreeFormObject}} ?? throw new ArgumentException("Invalid instance found. Must not be null."){{/isFreeFormObject}}{{#isString}} ?? throw new ArgumentException("Invalid instance found. Must not be null."){{/isString}}{{/isPrimitiveType}}{{/model.isNullable}};
@@ -65,7 +65,7 @@
6565
/// the InvalidClassException will be thrown{{/lambda.escape-generic}}
6666
/// </summary>
6767
/// <returns>An instance of {{#lambda.escape-generic}}{{dataType}}{{/lambda.escape-generic}}</returns>
68-
public {{{dataType}}}{{#vendorExtensions.x-has-child-generic}}<T>{{/vendorExtensions.x-has-child-generic}} As{{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}}{{#lambda.titlecase}}{{{items.dataType}}}{{/lambda.titlecase}}()
68+
public {{{dataType}}}{{#vendorExtensions.x-has-child-generic}}<T>{{/vendorExtensions.x-has-child-generic}} As{{#lambda.type-to-name}}{{{datatypeWithEnum}}}{{/lambda.type-to-name}}()
6969
{
7070
return ({{{dataType}}}{{#vendorExtensions.x-has-child-generic}}<T>{{/vendorExtensions.x-has-child-generic}})ActualInstance;
7171
}
@@ -81,7 +81,7 @@
8181
/// {{#lambda.escape-generic}}Check if the actual instance is of `{{{dataType}}}` type.{{/lambda.escape-generic}}
8282
/// </summary>
8383
/// <returns>Whether or not the instance is the type</returns>
84-
public bool Is{{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}}{{#lambda.titlecase}}{{{items.dataType}}}{{/lambda.titlecase}}()
84+
public bool Is{{#lambda.type-to-name}}{{{datatypeWithEnum}}}{{/lambda.type-to-name}}()
8585
{
8686
return ActualInstance.GetType() == typeof({{{dataType}}}{{#vendorExtensions.x-has-child-generic}}<T>{{/vendorExtensions.x-has-child-generic}});
8787
}

0 commit comments

Comments
 (0)