fix dart

Author: millotp

clients/algoliasearch-client-php/lib/FormDataProcessor.php

@@ -12,9 +12,9 @@
  */
 
 /**
- * Search API.
+ * Composition API.
  *
- * The Algolia Search API lets you search, configure, and manage your indices and records.  ## Client libraries  Use Algolia's API clients and libraries to reliably integrate Algolia's APIs with your apps. The official API clients are covered by Algolia's [Service Level Agreement](https://www.algolia.com/policies/sla/).  See: [Algolia's ecosystem](https://www.algolia.com/doc/guides/getting-started/how-algolia-works/in-depth/ecosystem/)  ## Base URLs  The base URLs for requests to the Search API are:  - `https://{APPLICATION_ID}.algolia.net` - `https://{APPLICATION_ID}-dsn.algolia.net`.   If your subscription includes a [Distributed Search Network](https://dashboard.algolia.com/infra),   this ensures that requests are sent to servers closest to users.  Both URLs provide high availability by distributing requests with load balancing.  **All requests must use HTTPS.**  ## Retry strategy  To guarantee high availability, implement a retry strategy for all API requests using the URLs of your servers as fallbacks:  - `https://{APPLICATION_ID}-1.algolianet.com` - `https://{APPLICATION_ID}-2.algolianet.com` - `https://{APPLICATION_ID}-3.algolianet.com`  These URLs use a different DNS provider than the primary URLs. You should randomize this list to ensure an even load across the three servers.  All Algolia API clients implement this retry strategy.  ## Authentication  To authenticate your API requests, add these headers:  - `x-algolia-application-id`. Your Algolia application ID. - `x-algolia-api-key`. An API key with the necessary permissions to make the request.   The required access control list (ACL) to make a request is listed in each endpoint's reference.  You can find your application ID and API key in the [Algolia dashboard](https://dashboard.algolia.com/account).  ## Request format  Depending on the endpoint, request bodies are either JSON objects or arrays of JSON objects,  ## Parameters  Parameters are passed as query parameters for GET and DELETE requests, and in the request body for POST and PUT requests.  Query parameters must be [URL-encoded](https://developer.mozilla.org/en-US/docs/Glossary/Percent-encoding). Non-ASCII characters must be UTF-8 encoded. Plus characters (`+`) are interpreted as spaces. Arrays as query parameters must be one of:  - A comma-separated string: `attributesToRetrieve=title,description` - A URL-encoded JSON array: `attributesToRetrieve=%5B%22title%22,%22description%22%D`  ## Response status and errors  The Search API returns JSON responses. Since JSON doesn't guarantee any specific ordering, don't rely on the order of attributes in the API response.  Successful responses return a `2xx` status. Client errors return a `4xx` status. Server errors are indicated by a `5xx` status. Error responses have a `message` property with more information.  ## Version  The current version of the Search API is version 1, as indicated by the `/1/` in each endpoint's URL.
+ * The Algolia Composition API lets you run composed search requests on your Compositions.  ## Client libraries  Use Algolia's API clients and libraries to reliably integrate Algolia's APIs with your apps.  See: [Algolia's ecosystem](https://www.algolia.com/doc/guides/getting-started/how-algolia-works/in-depth/ecosystem/)  ## Base URLs  The base URLs for requests to the Composition API are:  - `https://{APPLICATION_ID}.algolia.net` - `https://{APPLICATION_ID}-dsn.algolia.net`.   If your subscription includes a [Distributed Search Network](https://dashboard.algolia.com/infra),   this ensures that requests are sent to servers closest to users.  Both URLs provide high availability by distributing requests with load balancing.  **All requests must use HTTPS.**  ## Retry strategy  To guarantee high availability, implement a retry strategy for all API requests using the URLs of your servers as fallbacks:  - `https://{APPLICATION_ID}-1.algolianet.com` - `https://{APPLICATION_ID}-2.algolianet.com` - `https://{APPLICATION_ID}-3.algolianet.com`  These URLs use a different DNS provider than the primary URLs. You should randomize this list to ensure an even load across the three servers.  All Algolia API clients implement this retry strategy.  ## Authentication  To authenticate your API requests, add these headers:  - `x-algolia-application-id`. Your Algolia application ID. - `x-algolia-api-key`. An API key with the necessary permissions to make the request.   The required access control list (ACL) to make a request is listed in each endpoint's reference.  You can find your application ID and API key in the [Algolia dashboard](https://dashboard.algolia.com/account).  ## Request format  Depending on the endpoint, request bodies are either JSON objects or arrays of JSON objects,  ## Parameters  Parameters are passed in the request body for POST and PUT requests. Query parameters must be [URL-encoded](https://developer.mozilla.org/en-US/docs/Glossary/Percent-encoding). Non-ASCII characters must be UTF-8 encoded. Plus characters (`+`) are interpreted as spaces.  ## Response status and errors  The Composition API returns JSON responses. Since JSON doesn't guarantee any specific ordering, don't rely on the order of attributes in the API response.  Successful responses return a `2xx` status. Client errors return a `4xx` status. Server errors are indicated by a `5xx` status. Error responses have a `message` property with more information.  ## Version  The current version of the Composition API is version 1, as indicated by the `/1/` in each endpoint's URL.
  *
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://openapi-generator.tech
@@ -29,7 +29,7 @@
 
 namespace Algolia\AlgoliaSearch;
 
-use Algolia\AlgoliaSearch\Model\Search\ModelInterface;
+use Algolia\AlgoliaSearch\Model\Composition\ModelInterface;
 use DateTime;
 use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\StreamInterface;

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

@@ -3,8 +3,6 @@
 import static org.apache.commons.lang3.StringUtils.*;
 
 import com.algolia.codegen.utils.*;
-import com.google.common.collect.ImmutableMap;
-import com.samskivert.mustache.Mustache;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.servers.Server;
@@ -112,11 +110,6 @@ public void processOpts() {
     additionalProperties.put("packageVersion", version);
   }
 
-  @Override
-  protected ImmutableMap.Builder<String, Mustache.Lambda> addMustacheLambdas() {
-    return super.addMustacheLambdas();
-  }
-
   @Override
   public void processOpenAPI(OpenAPI openAPI) {
     super.processOpenAPI(openAPI);
@@ -153,6 +146,15 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
   public String toModelFilename(String name) {
     return support.classnames().contains(name) ? null : super.toModelFilename(name);
   }
+
+  @Override
+  public String toModelName(String name) {
+    if (name.equals("external")) {
+      return "External";
+    }
+
+    return super.toModelName(name);
+  }
 }
 
 class SchemaSupport {

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

@@ -2,6 +2,7 @@
 
 import com.algolia.codegen.exceptions.GeneratorException;
 import com.algolia.codegen.utils.*;
+import com.samskivert.mustache.Mustache.Lambda;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
@@ -51,4 +52,16 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
     supportingFiles.add(new SupportingFile("pubspec.tests.mustache", "tests/output/dart/pubspec.yaml"));
     supportingFiles.add(new SupportingFile("pubspec_overrides.tests.mustache", "tests/output/dart/pubspec_overrides.yaml"));
   }
+
+  @Override
+  public void addMustacheLambdas(Map<String, Lambda> lambdas) {
+    lambdas.put("identifier", (fragment, writer) -> {
+      String text = fragment.execute();
+      if (text.equals("external")) {
+        writer.write("external_");
+      } else {
+        writer.write(text);
+      }
+    });
+  }
 }

templates/dart/tests/request_param.mustache

@@ -1,5 +1,5 @@
 {{^isAdditionalProperty}}
-{{#lambda.camelcase}}{{{key}}}{{/lambda.camelcase}} : {{> tests/param_value}},
+{{#lambda.identifier}}{{{key}}}{{/lambda.identifier}} : {{> tests/param_value}},
 {{/isAdditionalProperty}}
 {{#isAdditionalProperty}}
 additionalProperties : { '{{{key}}}' : '{{{value}}}' },

tests/CTS/requests/composition/multipleBatch.json

@@ -36,6 +36,8 @@
           {
             "action": "upsert",
             "body": {
+              "objectID": "foo",
+              "name": "my first composition",
               "behavior": {
                 "injection": {
                   "main": {
@@ -46,9 +48,7 @@
                     }
                   }
                 }
-              },
-              "name": "my first composition",
-              "objectID": "foo"
+              }
             }
           },
           {