fix(clients): correctly deserialize SearchResult (generated)

algolia/api-clients-automation#4756

Co-authored-by: algolia-bot <[email protected]>
Co-authored-by: Pierre Millot <[email protected]>

Author: algolia-bot

algoliasearch/src/main/java/com/algolia/api/SearchClient.java

@@ -5025,6 +5025,8 @@ public CompletableFuture<UpdatedAtResponse> saveSynonymsAsync(@Nonnull String in
    * Sends multiple search requests to one or more indices. This can be useful in these cases: -
    * Different indices for different purposes, such as, one index for products, another one for
    * marketing content. - Multiple searches to the same index—for example, with different filters.
+   * Use the helper `searchForHits` or `searchForFacets` to get the results in a more convenient
+   * format, if you already know the return type you want.
    *
    * @param searchMethodParams Muli-search request body. Results are returned in the same order as
    *     the requests. (required)
@@ -5045,6 +5047,8 @@ public <T> SearchResponses<T> search(
    * Sends multiple search requests to one or more indices. This can be useful in these cases: -
    * Different indices for different purposes, such as, one index for products, another one for
    * marketing content. - Multiple searches to the same index—for example, with different filters.
+   * Use the helper `searchForHits` or `searchForFacets` to get the results in a more convenient
+   * format, if you already know the return type you want.
    *
    * @param searchMethodParams Muli-search request body. Results are returned in the same order as
    *     the requests. (required)
@@ -5059,7 +5063,8 @@ public <T> SearchResponses<T> search(@Nonnull SearchMethodParams searchMethodPar
    * (asynchronously) Sends multiple search requests to one or more indices. This can be useful in
    * these cases: - Different indices for different purposes, such as, one index for products,
    * another one for marketing content. - Multiple searches to the same index—for example, with
-   * different filters.
+   * different filters. Use the helper `searchForHits` or `searchForFacets` to get the results in a
+   * more convenient format, if you already know the return type you want.
    *
    * @param searchMethodParams Muli-search request body. Results are returned in the same order as
    *     the requests. (required)
@@ -5088,7 +5093,8 @@ public <T> CompletableFuture<SearchResponses<T>> searchAsync(
    * (asynchronously) Sends multiple search requests to one or more indices. This can be useful in
    * these cases: - Different indices for different purposes, such as, one index for products,
    * another one for marketing content. - Multiple searches to the same index—for example, with
-   * different filters.
+   * different filters. Use the helper `searchForHits` or `searchForFacets` to get the results in a
+   * more convenient format, if you already know the return type you want.
    *
    * @param searchMethodParams Muli-search request body. Results are returned in the same order as
    *     the requests. (required)

algoliasearch/src/main/java/com/algolia/model/search/SearchResult.java

@@ -6,19 +6,34 @@
 import com.algolia.exceptions.AlgoliaRuntimeException;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.annotation.*;
+import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import java.io.IOException;
 import java.util.logging.Logger;
 
 /** SearchResult */
 @JsonDeserialize(using = SearchResult.Deserializer.class)
 public interface SearchResult<T> {
-  class Deserializer<T> extends JsonDeserializer<SearchResult<T>> {
+  class Deserializer<T> extends JsonDeserializer<SearchResult<T>> implements ContextualDeserializer {
 
     private static final Logger LOGGER = Logger.getLogger(Deserializer.class.getName());
 
+    private JavaType returnType;
+
+    public Deserializer() {}
+
+    private Deserializer(JavaType returnType) {
+      this.returnType = returnType;
+    }
+
+    @Override
+    public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property) {
+      JavaType contextualType = ctxt.getContextualType().containedType(0);
+      return new Deserializer(contextualType);
+    }
+
     @Override
     public SearchResult<T> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
       JsonNode tree = jp.readValueAsTree();
@@ -36,7 +51,12 @@ public SearchResult<T> deserialize(JsonParser jp, DeserializationContext ctxt) t
       // deserialize SearchResponse
       if (tree.isObject()) {
         try (JsonParser parser = tree.traverse(jp.getCodec())) {
-          return parser.readValueAs(new TypeReference<SearchResponse<T>>() {});
+          // For generic types, the innerType is erased by Java, we need to use the contextual type.
+          JavaType innerType = ctxt.getTypeFactory().constructParametricType(SearchResponse.class, returnType);
+          if (parser.getCurrentToken() == null) {
+            parser.nextToken();
+          }
+          return ctxt.readValue(parser, innerType);
         } catch (Exception e) {
           // deserialization failed, continue
           LOGGER.finest("Failed to deserialize oneOf SearchResponse (error: " + e.getMessage() + ") (type: SearchResponse)");