Merge branch 'main' into chore/rename-tag

Author: eunjae-lee

.github/.cache_version

@@ -1 +1 @@
-9.1.1
+9.2

.github/actions/cache/action.yml

@@ -400,8 +400,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/SearchClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/search/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/SearchClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/search/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -415,8 +415,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/RecommendClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/recommend/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/RecommendClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/recommend/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -430,8 +430,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/PersonalizationClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/personalization/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/PersonalizationClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/personalization/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -445,8 +445,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/AnalyticsClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/analytics/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/AnalyticsClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/analytics/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -460,8 +460,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/InsightsClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/insights/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/InsightsClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/insights/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -475,8 +475,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/AbtestingClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/abtesting/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/AbtestingClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/abtesting/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -490,8 +490,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/QuerySuggestionsClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/querySuggestions/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/QuerySuggestionsClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/querySuggestions/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -505,8 +505,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/PredictClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/predict/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/PredictClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/predict/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(

.github/actions/setup/action.yml

@@ -54,7 +54,7 @@ runs:
     - name: Compute cache common hash
       if: inputs.type != 'minimal'
       shell: bash
-      run: echo "CACHE_COMMON_HASH=${{ steps.diff.outputs.GITHUB_ACTIONS_CHANGED_HASH }}-${{ steps.diff.outputs.SCRIPTS_CHANGED_HASH }}" >> $GITHUB_ENV
+      run: echo "CACHE_COMMON_HASH=${{ steps.diff.outputs.COMMON_HASH }}" >> $GITHUB_ENV
 
     - name: Compute specs matrix
       if: inputs.type != 'minimal'

.github/workflows/check.yml

@@ -230,8 +230,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
-            ${{ format('{0}/algoliasearch-core/src/com/algolia/api/{1}.java', matrix.client.path, matrix.client.api) }}
-            ${{ format('{0}/algoliasearch-core/src/com/algolia/model/{1}/**', matrix.client.path, matrix.client.camelizedName) }}
+            ${{ format('{0}/algoliasearch-core/src/main/java/com/algolia/api/{1}.java', matrix.client.path, matrix.client.api) }}
+            ${{ format('{0}/algoliasearch-core/src/main/java/com/algolia/model/{1}/**', matrix.client.path, matrix.client.camelizedName) }}
           key: |
             ${{ env.CACHE_VERSION }}-${{
             hashFiles(
@@ -418,8 +418,6 @@ jobs:
     needs:
       - setup
       - cts
-      - client_javascript_tests
-      - client_javascript_algoliasearch
     if: |
       always() &&
       github.ref == 'refs/heads/main' &&

.gitignore

@@ -28,3 +28,4 @@ clients/algoliasearch-client-javascript/packages/*/.openapi-generator-ignore
 tests/output/*/.openapi-generator-ignore
 
 generators/bin
+*.doc.yml

.prettierrc

@@ -1,4 +1,12 @@
 {
   "trailingComma": "es5",
-  "singleQuote": true
+  "singleQuote": true,
+  "overrides" : [
+    {
+      "files": "*.php",
+      "options": {
+          "tabWidth": 4
+      }
+    }
+  ]
 }

clients/algoliasearch-client-java-2/.openapi-generator-ignore

@@ -16,9 +16,9 @@ pom.xml
 gradlew.bat
 
 # Selective source file
-algoliasearch-core/src/com/algolia/auth/**
-algoliasearch-core/src/com/algolia/ApiException.java
-algoliasearch-core/src/com/algolia/Configuration.java
-algoliasearch-core/src/com/algolia/Server*.java
-algoliasearch-core/src/com/algolia/StringUtil.java
-algoliasearch-core/src/com/algolia/GzipRequestInterceptor.java
+algoliasearch-core/src/main/java/com/algolia/auth/**
+algoliasearch-core/src/main/java/com/algolia/ApiException.java
+algoliasearch-core/src/main/java/com/algolia/Configuration.java
+algoliasearch-core/src/main/java/com/algolia/Server*.java
+algoliasearch-core/src/main/java/com/algolia/StringUtil.java
+algoliasearch-core/src/main/java/com/algolia/GzipRequestInterceptor.java

clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle

@@ -22,11 +22,3 @@ dependencies {
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
-
-sourceSets {
-    main {
-        java {
-            srcDirs = ["src"]
-        }
-    }
-}

clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/ApiCallback.java renamed to clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/ApiCallback.java

@@ -236,7 +236,7 @@ public Object del(String path, Map<String, Object> parameters)
   }
 
   public Object del(String path) throws AlgoliaRuntimeException {
-    return this.del(path, new HashMap<>());
+    return this.del(path, null);
   }
 
   /**
@@ -429,7 +429,7 @@ public Object get(String path, Map<String, Object> parameters)
   }
 
   public Object get(String path) throws AlgoliaRuntimeException {
-    return this.get(path, new HashMap<>());
+    return this.get(path, null);
   }
 
   /**
@@ -615,7 +615,7 @@ public ListABTestsResponse listABTests(Integer offset, Integer limit)
   }
 
   public ListABTestsResponse listABTests() throws AlgoliaRuntimeException {
-    return this.listABTests(0, 10);
+    return this.listABTests(null, null);
   }
 
   /**
@@ -725,7 +725,7 @@ public Object post(String path, Map<String, Object> parameters, Object body)
   }
 
   public Object post(String path) throws AlgoliaRuntimeException {
-    return this.post(path, new HashMap<>(), null);
+    return this.post(path, null, null);
   }
 
   /**
@@ -834,7 +834,7 @@ public Object put(String path, Map<String, Object> parameters, Object body)
   }
 
   public Object put(String path) throws AlgoliaRuntimeException {
-    return this.put(path, new HashMap<>(), null);
+    return this.put(path, null, null);
   }
 
   /**

clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/ApiClient.java renamed to clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/ApiClient.java

@@ -147,7 +147,7 @@ public Object del(String path, Map<String, Object> parameters)
   }
 
   public Object del(String path) throws AlgoliaRuntimeException {
-    return this.del(path, new HashMap<>());
+    return this.del(path, null);
   }
 
   /**
@@ -251,7 +251,7 @@ public Object get(String path, Map<String, Object> parameters)
   }
 
   public Object get(String path) throws AlgoliaRuntimeException {
-    return this.get(path, new HashMap<>());
+    return this.get(path, null);
   }
 
   /**
@@ -1475,7 +1475,7 @@ public GetSearchesNoClicksResponse getSearchesNoClicks(
 
   public GetSearchesNoClicksResponse getSearchesNoClicks(String index)
     throws AlgoliaRuntimeException {
-    return this.getSearchesNoClicks(index, null, null, 10, 0, null);
+    return this.getSearchesNoClicks(index, null, null, null, null, null);
   }
 
   /**
@@ -1661,7 +1661,7 @@ public GetSearchesNoResultsResponse getSearchesNoResults(
 
   public GetSearchesNoResultsResponse getSearchesNoResults(String index)
     throws AlgoliaRuntimeException {
-    return this.getSearchesNoResults(index, null, null, 10, 0, null);
+    return this.getSearchesNoResults(index, null, null, null, null, null);
   }
 
   /**
@@ -1938,7 +1938,7 @@ public GetTopCountriesResponse getTopCountries(
 
   public GetTopCountriesResponse getTopCountries(String index)
     throws AlgoliaRuntimeException {
-    return this.getTopCountries(index, null, null, 10, 0, null);
+    return this.getTopCountries(index, null, null, null, null, null);
   }
 
   /**
@@ -2133,7 +2133,15 @@ public GetTopFilterAttributesResponse getTopFilterAttributes(
 
   public GetTopFilterAttributesResponse getTopFilterAttributes(String index)
     throws AlgoliaRuntimeException {
-    return this.getTopFilterAttributes(index, null, null, null, 10, 0, null);
+    return this.getTopFilterAttributes(
+        index,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      );
   }
 
   /**
@@ -2358,8 +2366,8 @@ public GetTopFilterForAttributeResponse getTopFilterForAttribute(
         null,
         null,
         null,
-        10,
-        0,
+        null,
+        null,
         null
       );
   }
@@ -2564,7 +2572,15 @@ public GetTopFiltersNoResultsResponse getTopFiltersNoResults(
 
   public GetTopFiltersNoResultsResponse getTopFiltersNoResults(String index)
     throws AlgoliaRuntimeException {
-    return this.getTopFiltersNoResults(index, null, null, null, 10, 0, null);
+    return this.getTopFiltersNoResults(
+        index,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      );
   }
 
   /**
@@ -2772,7 +2788,7 @@ public GetTopHitsResponse getTopHits(
 
   public GetTopHitsResponse getTopHits(String index)
     throws AlgoliaRuntimeException {
-    return this.getTopHits(index, null, false, null, null, 10, 0, null);
+    return this.getTopHits(index, null, null, null, null, null, null, null);
   }
 
   /**
@@ -2998,13 +3014,13 @@ public GetTopSearchesResponse getTopSearches(String index)
     throws AlgoliaRuntimeException {
     return this.getTopSearches(
         index,
-        false,
         null,
         null,
-        OrderBy.SEARCH_COUNT,
-        Direction.ASC,
-        10,
-        0,
+        null,
+        null,
+        null,
+        null,
+        null,
         null
       );
   }
@@ -3294,7 +3310,7 @@ public Object post(String path, Map<String, Object> parameters, Object body)
   }
 
   public Object post(String path) throws AlgoliaRuntimeException {
-    return this.post(path, new HashMap<>(), null);
+    return this.post(path, null, null);
   }
 
   /**
@@ -3403,7 +3419,7 @@ public Object put(String path, Map<String, Object> parameters, Object body)
   }
 
   public Object put(String path) throws AlgoliaRuntimeException {
-    return this.put(path, new HashMap<>(), null);
+    return this.put(path, null, null);
   }
 
   /**

clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/ApiResponse.java renamed to clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/ApiResponse.java

@@ -147,7 +147,7 @@ public Object del(String path, Map<String, Object> parameters)
   }
 
   public Object del(String path) throws AlgoliaRuntimeException {
-    return this.del(path, new HashMap<>());
+    return this.del(path, null);
   }
 
   /**
@@ -251,7 +251,7 @@ public Object get(String path, Map<String, Object> parameters)
   }
 
   public Object get(String path) throws AlgoliaRuntimeException {
-    return this.get(path, new HashMap<>());
+    return this.get(path, null);
   }
 
   /**
@@ -358,7 +358,7 @@ public Object post(String path, Map<String, Object> parameters, Object body)
   }
 
   public Object post(String path) throws AlgoliaRuntimeException {
-    return this.post(path, new HashMap<>(), null);
+    return this.post(path, null, null);
   }
 
   /**
@@ -552,7 +552,7 @@ public Object put(String path, Map<String, Object> parameters, Object body)
   }
 
   public Object put(String path) throws AlgoliaRuntimeException {
-    return this.put(path, new HashMap<>(), null);
+    return this.put(path, null, null);
   }
 
   /**