feat(specs): introduce multifeed composition behavior for beta release (generated)

algolia/api-clients-automation#5828

Co-authored-by: algolia-bot <[email protected]>
Co-authored-by: Gavin Wade <[email protected]>

Author: algolia-bot

algoliasearch/src/main/java/com/algolia/internal/HttpRequester.java

@@ -81,8 +81,8 @@ private <T> T execute(@Nonnull HttpRequest httpRequest, RequestOptions requestOp
 
     Request request = requestBuilder.build();
 
-    // Get or adjust the HTTP client according to request options.
-    OkHttpClient client = getOkHttpClient(requestOptions);
+    // Get or adjust the HTTP client according to request.
+    OkHttpClient client = getOkHttpClient(httpRequest, requestOptions);
 
     // Execute the request.
     Call call = client.newCall(request);
@@ -165,22 +165,52 @@ private Headers createHeaders(@Nonnull HttpRequest request, RequestOptions reque
 
   /** Returns a suitable OkHttpClient instance based on the provided request options. */
   @Nonnull
-  private OkHttpClient getOkHttpClient(RequestOptions requestOptions) {
-    // Return the default client if no request options are provided.
-    if (requestOptions == null) return httpClient;
-
-    // Create a new client builder from the default client and adjust timeouts if provided.
+  private OkHttpClient getOkHttpClient(HttpRequest httpRequest, RequestOptions requestOptions) {
     OkHttpClient.Builder builder = httpClient.newBuilder();
-    if (requestOptions.getReadTimeout() != null) {
-      builder.readTimeout(requestOptions.getReadTimeout());
-    }
-    if (requestOptions.getWriteTimeout() != null) {
-      builder.writeTimeout(requestOptions.getWriteTimeout());
+    // Determine if this is a read operation: either explicitly marked as read, or using GET method
+    boolean isRead = httpRequest.isRead() || "GET".equalsIgnoreCase(httpRequest.getMethod());
+    boolean changed = false;
+
+    // If this is a write operation, set readTimeout to the default writeTimeout value
+    if (!isRead) {
+      builder.readTimeout(Duration.ofMillis(httpClient.writeTimeoutMillis()));
+      changed = true;
     }
-    if (requestOptions.getConnectTimeout() != null) {
-      builder.connectTimeout(requestOptions.getConnectTimeout());
+
+    if (isRead && requestOptions != null) {
+      // For read operations, apply connectTimeout if provided
+      if (requestOptions.getConnectTimeout() != null) {
+        builder.connectTimeout(requestOptions.getConnectTimeout());
+        changed = true;
+      }
+      // For read operations, use the explicit readTimeout if provided
+      if (requestOptions.getReadTimeout() != null) {
+        builder.readTimeout(requestOptions.getReadTimeout());
+        changed = true;
+      }
+      // For read operations, set writeTimeout if provided
+      if (requestOptions.getWriteTimeout() != null) {
+        builder.writeTimeout(requestOptions.getWriteTimeout());
+        changed = true;
+      }
+    } else if (!isRead && requestOptions != null) {
+      // For write operations, apply connectTimeout if provided
+      if (requestOptions.getConnectTimeout() != null) {
+        builder.connectTimeout(requestOptions.getConnectTimeout());
+        changed = true;
+      }
+      // For write operations, use the explicit writeTimeout for both readTimeout and writeTimeout
+      // if provided
+      if (requestOptions.getWriteTimeout() != null) {
+        builder.readTimeout(requestOptions.getWriteTimeout());
+        builder.writeTimeout(requestOptions.getWriteTimeout());
+        changed = true;
+      }
     }
-    return builder.build();
+
+    // Return a new OkHttpClient instance if any timeout was changed, otherwise reuse the default
+    // client
+    return changed ? builder.build() : httpClient;
   }
 
   @Override

algoliasearch/src/main/java/com/algolia/model/composition/CompositionBehavior.java

@@ -7,23 +7,37 @@
 import com.fasterxml.jackson.databind.annotation.*;
 import java.util.Objects;
 
-/** CompositionBehavior */
+/** An object containing either an `injection` or `multifeed` behavior schema, but not both. */
 public class CompositionBehavior {
 
   @JsonProperty("injection")
   private Injection injection;
 
+  @JsonProperty("multifeed")
+  private Multifeed multifeed;
+
   public CompositionBehavior setInjection(Injection injection) {
     this.injection = injection;
     return this;
   }
 
   /** Get injection */
-  @javax.annotation.Nonnull
+  @javax.annotation.Nullable
   public Injection getInjection() {
     return injection;
   }
 
+  public CompositionBehavior setMultifeed(Multifeed multifeed) {
+    this.multifeed = multifeed;
+    return this;
+  }
+
+  /** Get multifeed */
+  @javax.annotation.Nullable
+  public Multifeed getMultifeed() {
+    return multifeed;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -33,19 +47,20 @@ public boolean equals(Object o) {
       return false;
     }
     CompositionBehavior compositionBehavior = (CompositionBehavior) o;
-    return Objects.equals(this.injection, compositionBehavior.injection);
+    return Objects.equals(this.injection, compositionBehavior.injection) && Objects.equals(this.multifeed, compositionBehavior.multifeed);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(injection);
+    return Objects.hash(injection, multifeed);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class CompositionBehavior {\n");
     sb.append("    injection: ").append(toIndentedString(injection)).append("\n");
+    sb.append("    multifeed: ").append(toIndentedString(multifeed)).append("\n");
     sb.append("}");
     return sb.toString();
   }

algoliasearch/src/main/java/com/algolia/model/composition/Multifeed.java

@@ -0,0 +1,101 @@
+// Code generated by OpenAPI Generator (https://openapi-generator.tech), manual changes will be lost
+// - read more on https://github.com/algolia/api-clients-automation. DO NOT EDIT.
+
+package com.algolia.model.composition;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Multifeed */
+public class Multifeed {
+
+  @JsonProperty("feeds")
+  private Map<String, Injection> feeds = new HashMap<>();
+
+  @JsonProperty("feedsOrder")
+  private List<String> feedsOrder;
+
+  public Multifeed setFeeds(Map<String, Injection> feeds) {
+    this.feeds = feeds;
+    return this;
+  }
+
+  public Multifeed putFeeds(String key, Injection feedsItem) {
+    this.feeds.put(key, feedsItem);
+    return this;
+  }
+
+  /**
+   * A key-value store of Feed ID to Feed. Currently, the only supported Feed type is an Injection.
+   */
+  @javax.annotation.Nonnull
+  public Map<String, Injection> getFeeds() {
+    return feeds;
+  }
+
+  public Multifeed setFeedsOrder(List<String> feedsOrder) {
+    this.feedsOrder = feedsOrder;
+    return this;
+  }
+
+  public Multifeed addFeedsOrder(String feedsOrderItem) {
+    if (this.feedsOrder == null) {
+      this.feedsOrder = new ArrayList<>();
+    }
+    this.feedsOrder.add(feedsOrderItem);
+    return this;
+  }
+
+  /**
+   * A list of Feed IDs that specifies the order in which to order the results in the response. The
+   * IDs should be a subset of those in the Feeds object, and only those specified will be
+   * processed. When this field is not set, all Feeds are processed and returned with a default
+   * ordering.
+   */
+  @javax.annotation.Nullable
+  public List<String> getFeedsOrder() {
+    return feedsOrder;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Multifeed multifeed = (Multifeed) o;
+    return Objects.equals(this.feeds, multifeed.feeds) && Objects.equals(this.feedsOrder, multifeed.feedsOrder);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(feeds, feedsOrder);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Multifeed {\n");
+    sb.append("    feeds: ").append(toIndentedString(feeds)).append("\n");
+    sb.append("    feedsOrder: ").append(toIndentedString(feedsOrder)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}