Merge branch 'main' into fix/predict-specs

Author: shortcuts

clients/algoliasearch-client-java-2/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [4.0.0-SNAPSHOT](https://github.com/algolia/algoliasearch-client-java-2/compare/4.0.0-SNAPSHOT...4.0.0-SNAPSHOT)
+
+- [fbe774da](https://github.com/algolia/api-clients-automation/commit/fbe774da) docs(java): document browse and waitForApiKey ([#956](https://github.com/algolia/api-clients-automation/pull/956)) by [@millotp](https://github.com/millotp/)
+- [68ff7ee4](https://github.com/algolia/api-clients-automation/commit/68ff7ee4) feat(java): browse objects/synonyms/rules ([#952](https://github.com/algolia/api-clients-automation/pull/952)) by [@millotp](https://github.com/millotp/)
+- [a54e901f](https://github.com/algolia/api-clients-automation/commit/a54e901f) fix(java): freeze snapshot version to 4.0.0 ([#955](https://github.com/algolia/api-clients-automation/pull/955)) by [@millotp](https://github.com/millotp/)
+- [b7edbea6](https://github.com/algolia/api-clients-automation/commit/b7edbea6) fix(java): more flexible json parser ([#954](https://github.com/algolia/api-clients-automation/pull/954)) by [@millotp](https://github.com/millotp/)
+
 ## [4.0.0-SNAPSHOT](https://github.com/algolia/algoliasearch-client-java-2/next)
 
 - [4c1596df](https://github.com/algolia/api-clients-automation/commit/4c1596df) fix(clients): list available regions when region is missing ([#916](https://github.com/algolia/api-clients-automation/pull/916)) by [@shortcuts](https://github.com/shortcuts/)

clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/SearchClient.java

@@ -35,9 +35,6 @@ public class SynonymHit {
   @JsonProperty("replacements")
   private List<String> replacements;
 
-  @JsonProperty("_highlightResult")
-  private SynonymHitHighlightResult highlightResult;
-
   public SynonymHit setObjectID(String objectID) {
     this.objectID = objectID;
     return this;
@@ -182,21 +179,6 @@ public List<String> getReplacements() {
     return replacements;
   }
 
-  public SynonymHit setHighlightResult(SynonymHitHighlightResult highlightResult) {
-    this.highlightResult = highlightResult;
-    return this;
-  }
-
-  /**
-   * Get highlightResult
-   *
-   * @return highlightResult
-   */
-  @javax.annotation.Nullable
-  public SynonymHitHighlightResult getHighlightResult() {
-    return highlightResult;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -214,14 +196,13 @@ public boolean equals(Object o) {
       Objects.equals(this.word, synonymHit.word) &&
       Objects.equals(this.corrections, synonymHit.corrections) &&
       Objects.equals(this.placeholder, synonymHit.placeholder) &&
-      Objects.equals(this.replacements, synonymHit.replacements) &&
-      Objects.equals(this.highlightResult, synonymHit.highlightResult)
+      Objects.equals(this.replacements, synonymHit.replacements)
     );
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(objectID, type, synonyms, input, word, corrections, placeholder, replacements, highlightResult);
+    return Objects.hash(objectID, type, synonyms, input, word, corrections, placeholder, replacements);
   }
 
   @Override
@@ -236,7 +217,6 @@ public String toString() {
     sb.append("    corrections: ").append(toIndentedString(corrections)).append("\n");
     sb.append("    placeholder: ").append(toIndentedString(placeholder)).append("\n");
     sb.append("    replacements: ").append(toIndentedString(replacements)).append("\n");
-    sb.append("    highlightResult: ").append(toIndentedString(highlightResult)).append("\n");
     sb.append("}");
     return sb.toString();
   }

clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/search/SynonymHit.java

@@ -1,3 +1,7 @@
+## [5.0.0-alpha.12](https://github.com/algolia/algoliasearch-client-javascript/compare/5.0.0-alpha.11...5.0.0-alpha.12)
+
+- [ff02ba09](https://github.com/algolia/api-clients-automation/commit/ff02ba09) fix(javascript): revert: do not send user-agent for Predict  (#957) ([#919](https://github.com/algolia/api-clients-automation/pull/919)) by [@shortcuts](https://github.com/shortcuts/)
+
 ## [5.0.0-alpha.11](https://github.com/algolia/algoliasearch-client-javascript/compare/5.0.0-alpha.10...5.0.0-alpha.11)
 
 - [3b85c763](https://github.com/algolia/api-clients-automation/commit/3b85c763) fix(javascript): use `exports` field to pick correct bundle ([#947](https://github.com/algolia/api-clients-automation/pull/947)) by [@francoischalifour](https://github.com/francoischalifour/)

clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/search/SynonymHitHighlightResult.java

@@ -96,7 +96,6 @@ export * from './sortRemainingBy';
 export * from './source';
 export * from './standardEntries';
 export * from './synonymHit';
-export * from './synonymHitHighlightResult';
 export * from './synonymType';
 export * from './tagFilters';
 export * from './taskStatus';

clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/retry/ApiKeyOperation.java renamed to clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/ApiKeyOperation.java

@@ -1,6 +1,5 @@
 // This file is generated, manual changes will be lost - read more on https://github.com/algolia/api-clients-automation.
 
-import type { SynonymHitHighlightResult } from './synonymHitHighlightResult';
 import type { SynonymType } from './synonymType';
 
 /**
@@ -43,6 +42,4 @@ export type SynonymHit = {
    * List of query words that will match the token.
    */
   replacements?: string[];
-
-  _highlightResult?: SynonymHitHighlightResult;
 };

clients/algoliasearch-client-javascript/CHANGELOG.md

@@ -22,7 +22,7 @@ import type {
 import type { SearchMethodParams } from '../model/searchMethodParams';
 import type { SearchResponses } from '../model/searchResponses';
 
-export const apiClientVersion = '5.0.0-alpha.11';
+export const apiClientVersion = '5.0.0-alpha.12';
 
 function getDefaultHosts(appId: string): Host[] {
   return (

clients/algoliasearch-client-javascript/packages/algoliasearch/lite/model/index.ts

@@ -1,6 +1,6 @@
 {
   "name": "algoliasearch",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0-alpha.12",
   "description": "A fully-featured and blazing-fast JavaScript API client to interact with Algolia API.",
   "repository": "algolia/algoliasearch-client-javascript",
   "license": "MIT",
@@ -59,13 +59,13 @@
     "test": "jest"
   },
   "dependencies": {
-    "@algolia/client-abtesting": "5.0.0-alpha.11",
-    "@algolia/client-analytics": "5.0.0-alpha.11",
-    "@algolia/client-common": "5.0.0-alpha.11",
-    "@algolia/client-personalization": "5.0.0-alpha.11",
-    "@algolia/client-search": "5.0.0-alpha.11",
-    "@algolia/requester-browser-xhr": "5.0.0-alpha.11",
-    "@algolia/requester-node-http": "5.0.0-alpha.11"
+    "@algolia/client-abtesting": "5.0.0-alpha.12",
+    "@algolia/client-analytics": "5.0.0-alpha.12",
+    "@algolia/client-common": "5.0.0-alpha.12",
+    "@algolia/client-personalization": "5.0.0-alpha.12",
+    "@algolia/client-search": "5.0.0-alpha.12",
+    "@algolia/requester-browser-xhr": "5.0.0-alpha.12",
+    "@algolia/requester-node-http": "5.0.0-alpha.12"
   },
   "devDependencies": {
     "@types/jest": "28.1.7",

clients/algoliasearch-client-javascript/packages/algoliasearch/lite/model/synonymHit.ts

@@ -1,6 +1,6 @@
 {
   "name": "@algolia/client-abtesting",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0-alpha.12",
   "description": "JavaScript client for client-abtesting",
   "repository": "algolia/algoliasearch-client-javascript",
   "license": "MIT",
@@ -38,9 +38,9 @@
     "clean": "rm -rf ./dist || true"
   },
   "dependencies": {
-    "@algolia/client-common": "5.0.0-alpha.11",
-    "@algolia/requester-browser-xhr": "5.0.0-alpha.11",
-    "@algolia/requester-node-http": "5.0.0-alpha.11"
+    "@algolia/client-common": "5.0.0-alpha.12",
+    "@algolia/requester-browser-xhr": "5.0.0-alpha.12",
+    "@algolia/requester-node-http": "5.0.0-alpha.12"
   },
   "devDependencies": {
     "@types/node": "16.11.47",

clients/algoliasearch-client-javascript/packages/algoliasearch/lite/model/synonymHitHighlightResult.ts

@@ -29,7 +29,7 @@ import type {
 } from '../model/clientMethodProps';
 import type { ListABTestsResponse } from '../model/listABTestsResponse';
 
-export const apiClientVersion = '5.0.0-alpha.11';
+export const apiClientVersion = '5.0.0-alpha.12';
 
 export const REGIONS = ['de', 'us'] as const;
 export type Region = typeof REGIONS[number];

clients/algoliasearch-client-javascript/packages/algoliasearch/lite/src/liteClient.ts

@@ -1,6 +1,6 @@
 {
   "name": "@algolia/client-analytics",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0-alpha.12",
   "description": "JavaScript client for client-analytics",
   "repository": "algolia/algoliasearch-client-javascript",
   "license": "MIT",
@@ -38,9 +38,9 @@
     "clean": "rm -rf ./dist || true"
   },
   "dependencies": {
-    "@algolia/client-common": "5.0.0-alpha.11",
-    "@algolia/requester-browser-xhr": "5.0.0-alpha.11",
-    "@algolia/requester-node-http": "5.0.0-alpha.11"
+    "@algolia/client-common": "5.0.0-alpha.12",
+    "@algolia/requester-browser-xhr": "5.0.0-alpha.12",
+    "@algolia/requester-node-http": "5.0.0-alpha.12"
   },
   "devDependencies": {
     "@types/node": "16.11.47",

clients/algoliasearch-client-javascript/packages/algoliasearch/package.json

@@ -55,7 +55,7 @@ import type { GetTopHitsResponse } from '../model/getTopHitsResponse';
 import type { GetTopSearchesResponse } from '../model/getTopSearchesResponse';
 import type { GetUsersCountResponse } from '../model/getUsersCountResponse';
 
-export const apiClientVersion = '5.0.0-alpha.11';
+export const apiClientVersion = '5.0.0-alpha.12';
 
 export const REGIONS = ['de', 'us'] as const;
 export type Region = typeof REGIONS[number];

clients/algoliasearch-client-javascript/packages/client-abtesting/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algolia/client-common",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0-alpha.12",
   "description": "Common package for the Algolia JavaScript API client.",
   "repository": "algolia/algoliasearch-client-javascript",
   "license": "MIT",

clients/algoliasearch-client-javascript/packages/client-abtesting/src/abtestingClient.ts

@@ -110,15 +110,12 @@ export function createTransporter({
         : {};
 
     const queryParameters: QueryParameters = {
+      'x-algolia-agent': algoliaAgent.value,
       ...baseQueryParameters,
       ...request.queryParameters,
       ...dataQueryParameters,
     };
 
-    if (algoliaAgent.value) {
-      queryParameters['x-algolia-agent'] = algoliaAgent.value;
-    }
-
     if (requestOptions && requestOptions.queryParameters) {
       for (const key of Object.keys(requestOptions.queryParameters)) {
         // We want to keep `undefined` and `null` values,

clients/algoliasearch-client-javascript/packages/client-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algolia/client-insights",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0-alpha.12",
   "description": "JavaScript client for client-insights",
   "repository": "algolia/algoliasearch-client-javascript",
   "license": "MIT",
@@ -38,9 +38,9 @@
     "clean": "rm -rf ./dist || true"
   },
   "dependencies": {
-    "@algolia/client-common": "5.0.0-alpha.11",
-    "@algolia/requester-browser-xhr": "5.0.0-alpha.11",
-    "@algolia/requester-node-http": "5.0.0-alpha.11"
+    "@algolia/client-common": "5.0.0-alpha.12",
+    "@algolia/requester-browser-xhr": "5.0.0-alpha.12",
+    "@algolia/requester-node-http": "5.0.0-alpha.12"
   },
   "devDependencies": {
     "@types/node": "16.11.47",

clients/algoliasearch-client-javascript/packages/client-analytics/src/analyticsClient.ts

@@ -23,7 +23,7 @@ import type {
 import type { InsightEvents } from '../model/insightEvents';
 import type { PushEventsResponse } from '../model/pushEventsResponse';
 
-export const apiClientVersion = '5.0.0-alpha.11';
+export const apiClientVersion = '5.0.0-alpha.12';
 
 export const REGIONS = ['de', 'us'] as const;
 export type Region = typeof REGIONS[number];

clients/algoliasearch-client-javascript/packages/client-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algolia/client-personalization",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0-alpha.12",
   "description": "JavaScript client for client-personalization",
   "repository": "algolia/algoliasearch-client-javascript",
   "license": "MIT",
@@ -38,9 +38,9 @@
     "clean": "rm -rf ./dist || true"
   },
   "dependencies": {
-    "@algolia/client-common": "5.0.0-alpha.11",
-    "@algolia/requester-browser-xhr": "5.0.0-alpha.11",
-    "@algolia/requester-node-http": "5.0.0-alpha.11"
+    "@algolia/client-common": "5.0.0-alpha.12",
+    "@algolia/requester-browser-xhr": "5.0.0-alpha.12",
+    "@algolia/requester-node-http": "5.0.0-alpha.12"
   },
   "devDependencies": {
     "@types/node": "16.11.47",