some fixes

Author: millotp

.github/workflows/check.yml

@@ -316,6 +316,8 @@ jobs:
       ALGOLIA_APPLICATION_ID: ${{ secrets.ALGOLIA_APPLICATION_ID }}
       ALGOLIA_ADMIN_KEY: ${{ secrets.ALGOLIA_ADMIN_KEY }}
       MONITORING_API_KEY: ${{ secrets.MONITORING_API_KEY }}
+      METIS_APPLICATION_ID: ${{ secrets.METIS_APPLICATION_ID }}
+      METIS_API_KEY: ${{ secrets.METIS_API_KEY }}
     outputs:
       hasBreakingChanges: ${{ steps.breakingChanges.outputs.hasBreakingChanges }}
     name: client ${{ matrix.client.language }}@${{ matrix.client.version }}

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

@@ -161,7 +161,7 @@ public static String formatIdentifier(String text) {
   }
 
   public static Boolean isReservedModelName(String name, String client) {
-    return reservedModelNames.contains(name.toLowerCase());
+    return client.equalsIgnoreCase("composition") || reservedModelNames.contains(name.toLowerCase());
   }
 
   public static String prefixReservedModelName(String name, String client) {

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

@@ -640,26 +640,26 @@ private String inferDataType(Object param, CodegenParameter spec, Map<String, Ob
   }
 
   private void transferPrimitiveData(IJsonSchemaValidationProperties spec, Map<String, Object> output) throws CTSException {
-    switch (getTypeName(spec)) {
-      case "String":
+    switch (getTypeName(spec).toLowerCase()) {
+      case "string":
         output.put("isString", true);
         break;
-      case "UUID":
+      case "uuid":
         output.put("isString", true);
         break;
-      case "Integer":
+      case "integer":
         output.put("isInteger", true);
         output.put("isNumber", true);
         break;
-      case "Long":
+      case "long":
         output.put("isLong", true);
         output.put("isNumber", true);
         break;
-      case "Double":
+      case "double":
         output.put("isDouble", true);
         output.put("isNumber", true);
         break;
-      case "Boolean":
+      case "boolean":
         output.put("isBoolean", true);
         break;
       case "oas_any_type_not_mapped":

tests/CTS/requests/composition/multipleBatch.json

@@ -15,8 +15,7 @@
                       "index": "bar"
                     }
                   }
-                },
-                "injectedItems": []
+                }
               }
             }
           }
@@ -39,7 +38,6 @@
             "body": {
               "behavior": {
                 "injection": {
-                  "injectedItems": [],
                   "main": {
                     "source": {
                       "search": {

tests/output/javascript/yarn.lock

@@ -5,12 +5,6 @@ __metadata:
   version: 8
   cacheKey: 10
 
-"@algolia/client-composition@link:../../../clients/algoliasearch-client-javascript/packages/client-composition::locator=javascript-tests%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@algolia/client-composition@link:../../../clients/algoliasearch-client-javascript/packages/client-composition::locator=javascript-tests%40workspace%3A."
-  languageName: node
-  linkType: soft
-
 "@algolia/composition@link:../../../clients/algoliasearch-client-javascript/packages/composition::locator=javascript-tests%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@algolia/composition@link:../../../clients/algoliasearch-client-javascript/packages/composition::locator=javascript-tests%40workspace%3A."
@@ -1019,7 +1013,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "javascript-tests@workspace:."
   dependencies:
-    "@algolia/client-composition": "link:../../../clients/algoliasearch-client-javascript/packages/client-composition"
     "@algolia/composition": "link:../../../clients/algoliasearch-client-javascript/packages/composition"
     "@algolia/requester-testing": "link:../../../clients/algoliasearch-client-javascript/packages/requester-testing"
     "@types/node": "npm:22.18.1"