Skip to content

Commit 2214b11

Browse files
committed
getting closer
1 parent 8ddbdfa commit 2214b11

File tree

7 files changed

+28
-11
lines changed

7 files changed

+28
-11
lines changed

generators/src/main/java/com/algolia/codegen/cts/lambda/CSharpIdentifierLambda.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@
77

88
public class CSharpIdentifierLambda implements Mustache.Lambda {
99

10+
private final String client;
11+
12+
public CSharpIdentifierLambda(String client) {
13+
this.client = client;
14+
}
15+
1016
@Override
1117
public void execute(Template.Fragment frag, Writer out) throws IOException {
1218
String text = frag.execute();
13-
if (text.equals("source")) {
19+
if (client.equals("search") && text.equals("source")) {
1420
out.write("varSource");
1521

1622
return;

generators/src/main/java/com/algolia/codegen/cts/manager/CSharpCTSManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio
4848

4949
@Override
5050
public void addMustacheLambdas(Map<String, Lambda> lambdas) {
51-
lambdas.put("identifier", new CSharpIdentifierLambda());
51+
lambdas.put("identifier", new CSharpIdentifierLambda(client));
5252
}
5353
}

generators/src/main/java/com/algolia/codegen/cts/tests/ParametersWithDataType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,8 @@ private String getObjectNameForLanguage(String objectName) {
547547
return "int";
548548
case "String":
549549
return "string";
550+
case "search":
551+
return "Algolia.Search.Models.Composition.Search"; // conflict with the Search namespace
550552
}
551553
break;
552554
case "go":

templates/csharp/snippets/method.mustache

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66
using Action = Algolia.Search.Models.Search.Action;
77
using Range = Algolia.Search.Models.Search.Range;
88
{{/isSearchClient}}
9-
{{^isSearchClient}}
9+
{{#isIngestionClient}}
1010
using Action = Algolia.Search.Models.Ingestion.Action;
11-
{{/isSearchClient}}
11+
{{/isIngestionClient}}
12+
{{#isCompositionClient}}
13+
using Action = Algolia.Search.Models.Composition.Action;
14+
{{/isCompositionClient}}
1215

1316
public class Snippet{{client}}
1417
{

templates/csharp/tests/e2e/e2e.mustache

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@ using dotenv.net;
1212
using Action = Algolia.Search.Models.Search.Action;
1313
using Range = Algolia.Search.Models.Search.Range;
1414
{{/isSearchClient}}
15-
{{^isSearchClient}}
15+
{{#isIngestionClient}}
1616
using Action = Algolia.Search.Models.Ingestion.Action;
17-
{{/isSearchClient}}
17+
{{/isIngestionClient}}
18+
{{#isCompositionClient}}
19+
using Action = Algolia.Search.Models.Composition.Action;
20+
{{/isCompositionClient}}
1821

1922
namespace Algolia.Search.e2e;
2023

templates/csharp/tests/requests/requests.mustache

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@ using dotenv.net;
1212
using Action = Algolia.Search.Models.Search.Action;
1313
using Range = Algolia.Search.Models.Search.Range;
1414
{{/isSearchClient}}
15-
{{^isSearchClient}}
15+
{{#isIngestionClient}}
1616
using Action = Algolia.Search.Models.Ingestion.Action;
17-
{{/isSearchClient}}
17+
{{/isIngestionClient}}
18+
{{#isCompositionClient}}
19+
using Action = Algolia.Search.Models.Composition.Action;
20+
{{/isCompositionClient}}
1821

1922
namespace Algolia.Search.requests;
2023

templates/swift/client_configuration.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public struct {{#lambda.client-to-name}}{{{client}}}{{/lambda.client-to-name}}Cl
2929
readTimeout: TimeInterval = {{#lambda.toSeconds}}{{x-timeouts.server.read}}{{/lambda.toSeconds}},
3030
logLevel: LogLevel = DefaultConfiguration.default.logLevel,
3131
defaultHeaders: [String: String]? = DefaultConfiguration.default.defaultHeaders,
32-
hosts: [RetryableHost]? = nil{{#isSearchClient}},
33-
compression: CompressionAlgorithm = .none{{/isSearchClient}}
32+
hosts: [RetryableHost]? = nil,
33+
compression: CompressionAlgorithm = .none
3434
) throws {
3535
guard !appID.isEmpty else {
3636
throw AlgoliaError.invalidCredentials("appId")
@@ -50,7 +50,7 @@ public struct {{#lambda.client-to-name}}{{{client}}}{{/lambda.client-to-name}}Cl
5050
"X-Algolia-API-Key": apiKey,
5151
"Content-Type": "application/json"
5252
].merging(defaultHeaders ?? [:]) { (_, new) in new }
53-
self.compression = {{#isSearchClient}}compression{{/isSearchClient}}{{^isSearchClient}}.none{{/isSearchClient}}
53+
self.compression = compression
5454

5555
UserAgentController.append(UserAgent(title: "{{#lambda.client-to-name}}{{client}}{{/lambda.client-to-name}}", version: Version.current.description))
5656

0 commit comments

Comments
 (0)