Merge branch 'master' into cdx-428-java-sdk-support-passing-multiple-emails-in

Author: Mudaafi

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # Define which individuals or teams that are responsible for code in a repository
 
-* @Mudaafi @esezen
+* @Constructor-io/integrations-static-lib-java-admins

constructorio-client/pom.xml

@@ -4,7 +4,7 @@
 	<groupId>io.constructor.client</groupId>
 	<artifactId>constructorio-client</artifactId>
 	<packaging>jar</packaging>
-	<version>7.2.0</version>
+	<version>7.4.1</version>
 	<name>constructorio-client</name>
 	<url>https://github.com/Constructor-io/constructorio-java</url>
 	<dependencies>

constructorio-client/src/main/java/io/constructor/client/ConstructorIO.java

@@ -10,8 +10,10 @@
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -33,6 +35,10 @@
 /** Constructor.io Client */
 public class ConstructorIO {
 
+    /** Valid file extensions for catalog uploads */
+    private static final Set<String> VALID_CATALOG_EXTENSIONS =
+            new LinkedHashSet<>(Arrays.asList(".csv", ".json", ".jsonl"));
+
     /** the HTTP client used by all instances */
     private static OkHttpClient client =
             new OkHttpClient.Builder()
@@ -1854,6 +1860,17 @@ public String recommendationsAsJSON(RecommendationsRequest req, UserInfo userInf
                 }
             }
 
+            if (StringUtils.isNotBlank(req.getVariationId())) {
+                if (req.getItemIds() == null || req.getItemIds().size() != 1) {
+                    throw new IllegalArgumentException(
+                            "variationId requires exactly one itemId to be specified");
+                }
+                url =
+                        url.newBuilder()
+                                .addQueryParameter("variation_id", req.getVariationId())
+                                .build();
+            }
+
             if (StringUtils.isNotBlank(req.getTerm())) {
                 url = url.newBuilder().addQueryParameter("term", req.getTerm()).build();
             }
@@ -2090,13 +2107,60 @@ protected static String getResponseBody(Response response) throws ConstructorExc
         throw new ConstructorException(errorMessage, errorCode);
     }
 
+    /**
+     * Validates and extracts the file extension from a File object for catalog uploads.
+     *
+     * @param file the File object containing the actual file
+     * @param fileName the logical file name (items, variations, item_groups)
+     * @return the validated file extension (including the dot, e.g., ".csv", ".json", or ".jsonl")
+     * @throws ConstructorException if the file extension is not in VALID_CATALOG_EXTENSIONS
+     */
+    private static String getValidatedFileExtension(File file, String fileName)
+            throws ConstructorException {
+        if (file == null) {
+            throw new ConstructorException(
+                    "Invalid file for '" + fileName + "': file cannot be null.");
+        }
+
+        String actualFileName = file.getName();
+        if (actualFileName == null || actualFileName.isEmpty()) {
+            throw new ConstructorException(
+                    "Invalid file for '" + fileName + "': file name cannot be empty.");
+        }
+
+        int lastDotIndex = actualFileName.lastIndexOf('.');
+        if (lastDotIndex == -1 || lastDotIndex == actualFileName.length() - 1) {
+            throw new ConstructorException(
+                    "Invalid file for '"
+                            + fileName
+                            + "': file must have "
+                            + VALID_CATALOG_EXTENSIONS
+                            + " extension. Found: "
+                            + actualFileName);
+        }
+
+        String extension = actualFileName.substring(lastDotIndex).toLowerCase();
+
+        if (!VALID_CATALOG_EXTENSIONS.contains(extension)) {
+            throw new ConstructorException(
+                    "Invalid file type for '"
+                            + fileName
+                            + "': file must have "
+                            + VALID_CATALOG_EXTENSIONS
+                            + " extension. Found: "
+                            + actualFileName);
+        }
+
+        return extension;
+    }
+
     /**
      * Grabs the version number (hard coded ATM)
      *
      * @return version number
      */
     protected String getVersion() {
-        return "ciojava-7.2.0";
+        return "ciojava-7.4.1";
     }
 
     /**
@@ -2369,9 +2433,12 @@ protected static JSONArray transformItemsAPIV2Response(JSONArray results) {
     /**
      * Send a full catalog to replace the current one (sync)
      *
-     * @param req the catalog request
-     * @return a string of JSON
-     * @throws ConstructorException if the request is invalid.
+     * <p>Supports CSV, JSON, and JSONL file formats. The file type is automatically detected from
+     * the file extension (.csv, .json, or .jsonl).
+     *
+     * @param req the catalog request containing files with .csv, .json, or .jsonl extensions
+     * @return a string of JSON containing task information
+     * @throws ConstructorException if the request is invalid or file extensions are not supported
      */
     public String replaceCatalog(CatalogRequest req) throws ConstructorException {
         try {
@@ -2399,10 +2466,11 @@ public String replaceCatalog(CatalogRequest req) throws ConstructorException {
                 for (Map.Entry<String, File> entry : files.entrySet()) {
                     String fileName = entry.getKey();
                     File file = entry.getValue();
+                    String fileExtension = getValidatedFileExtension(file, fileName);
 
                     multipartBuilder.addFormDataPart(
                             fileName,
-                            fileName + ".csv",
+                            fileName + fileExtension,
                             RequestBody.create(MediaType.parse("application/octet-stream"), file));
                 }
             }
@@ -2428,9 +2496,12 @@ public String replaceCatalog(CatalogRequest req) throws ConstructorException {
     /**
      * Send a partial catalog to update specific items (delta)
      *
-     * @param req the catalog request
-     * @return a string of JSON
-     * @throws ConstructorException if the request is invalid.
+     * <p>Supports CSV, JSON, and JSONL file formats. The file type is automatically detected from
+     * the file extension (.csv, .json, or .jsonl).
+     *
+     * @param req the catalog request containing files with .csv, .json, or .jsonl extensions
+     * @return a string of JSON containing task information
+     * @throws ConstructorException if the request is invalid or file extensions are not supported
      */
     public String updateCatalog(CatalogRequest req) throws ConstructorException {
         try {
@@ -2458,10 +2529,11 @@ public String updateCatalog(CatalogRequest req) throws ConstructorException {
                 for (Map.Entry<String, File> entry : files.entrySet()) {
                     String fileName = entry.getKey();
                     File file = entry.getValue();
+                    String fileExtension = getValidatedFileExtension(file, fileName);
 
                     multipartBuilder.addFormDataPart(
                             fileName,
-                            fileName + ".csv",
+                            fileName + fileExtension,
                             RequestBody.create(MediaType.parse("application/octet-stream"), file));
                 }
             }
@@ -2488,9 +2560,12 @@ public String updateCatalog(CatalogRequest req) throws ConstructorException {
     /**
      * Send a patch delta catalog to update specific items (delta)
      *
-     * @param req the catalog request
-     * @return a string of JSON
-     * @throws ConstructorException if the request is invalid.
+     * <p>Supports CSV, JSON, and JSONL file formats. The file type is automatically detected from
+     * the file extension (.csv, .json, or .jsonl).
+     *
+     * @param req the catalog request containing files with .csv, .json, or .jsonl extensions
+     * @return a string of JSON containing task information
+     * @throws ConstructorException if the request is invalid or file extensions are not supported
      */
     public String patchCatalog(CatalogRequest req) throws ConstructorException {
         try {
@@ -2523,10 +2598,11 @@ public String patchCatalog(CatalogRequest req) throws ConstructorException {
                 for (Map.Entry<String, File> entry : files.entrySet()) {
                     String fileName = entry.getKey();
                     File file = entry.getValue();
+                    String fileExtension = getValidatedFileExtension(file, fileName);
 
                     multipartBuilder.addFormDataPart(
                             fileName,
-                            fileName + ".csv",
+                            fileName + fileExtension,
                             RequestBody.create(MediaType.parse("application/octet-stream"), file));
                 }
             }

constructorio-client/src/main/java/io/constructor/client/RecommendationsRequest.java

@@ -12,6 +12,7 @@ public class RecommendationsRequest {
     private String term;
     private int numResults;
     private List<String> itemIds;
+    private String variationId;
     private Map<String, List<String>> facets;
     private String section;
     private String preFilterExpression;
@@ -32,6 +33,7 @@ public RecommendationsRequest(String podId) throws IllegalArgumentException {
         this.podId = podId;
         this.numResults = 10;
         this.itemIds = null;
+        this.variationId = null;
         this.term = null;
         this.section = "Products";
         this.variationsMap = null;
@@ -97,6 +99,22 @@ public List<String> getItemIds() {
         return itemIds;
     }
 
+    /**
+     * @param variationId the variation id to set. Can be used with exactly one item_id specified in
+     *     the request. Applicable for alternative_items, complementary_items, and bundles pod
+     *     types.
+     */
+    public void setVariationId(String variationId) {
+        this.variationId = variationId;
+    }
+
+    /**
+     * @return the variation id
+     */
+    public String getVariationId() {
+        return variationId;
+    }
+
     /**
      * @param section the section to set
      */

constructorio-client/src/main/java/io/constructor/client/models/RelatedBrowsePage.java

@@ -0,0 +1,75 @@
+package io.constructor.client.models;
+
+import com.google.gson.annotations.SerializedName;
+
+/** Constructor.io Related Browse Page - uses Gson/Reflection to load data in */
+public class RelatedBrowsePage {
+
+    @SerializedName("filter_name")
+    private String filterName;
+
+    @SerializedName("filter_value")
+    private String filterValue;
+
+    @SerializedName("display_name")
+    private String displayName;
+
+    @SerializedName("image_url")
+    private String imageUrl;
+
+    /**
+     * @return the filter name
+     */
+    public String getFilterName() {
+        return filterName;
+    }
+
+    /**
+     * @return the filter value
+     */
+    public String getFilterValue() {
+        return filterValue;
+    }
+
+    /**
+     * @return the display name
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * @return the image URL
+     */
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    /**
+     * @param filterName the filter name to set
+     */
+    public void setFilterName(String filterName) {
+        this.filterName = filterName;
+    }
+
+    /**
+     * @param filterValue the filter value to set
+     */
+    public void setFilterValue(String filterValue) {
+        this.filterValue = filterValue;
+    }
+
+    /**
+     * @param displayName the display name to set
+     */
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+     * @param imageUrl the image URL to set
+     */
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+}

constructorio-client/src/main/java/io/constructor/client/models/RelatedSearch.java

@@ -0,0 +1,24 @@
+package io.constructor.client.models;
+
+import com.google.gson.annotations.SerializedName;
+
+/** Constructor.io Related Search - uses Gson/Reflection to load data in */
+public class RelatedSearch {
+
+    @SerializedName("query")
+    private String query;
+
+    /**
+     * @return the related search query
+     */
+    public String getQuery() {
+        return query;
+    }
+
+    /**
+     * @param query the related search query to set
+     */
+    public void setQuery(String query) {
+        this.query = query;
+    }
+}

constructorio-client/src/main/java/io/constructor/client/models/SearchResponseInner.java

@@ -15,6 +15,12 @@ public class SearchResponseInner extends BaseResultsResponse {
     @SerializedName("features")
     private List<Feature> features;
 
+    @SerializedName("related_searches")
+    private List<RelatedSearch> relatedSearches;
+
+    @SerializedName("related_browse_pages")
+    private List<RelatedBrowsePage> relatedBrowsePages;
+
     /**
      * @return redirect data
      */
@@ -47,4 +53,32 @@ public void setRefinedContent(List<RefinedContent> refinedContent) {
     public void setFeatures(List<Feature> features) {
         this.features = features;
     }
+
+    /**
+     * @return list of related searches
+     */
+    public List<RelatedSearch> getRelatedSearches() {
+        return relatedSearches;
+    }
+
+    /**
+     * @return list of related browse pages
+     */
+    public List<RelatedBrowsePage> getRelatedBrowsePages() {
+        return relatedBrowsePages;
+    }
+
+    /**
+     * @param relatedSearches list of related searches to set
+     */
+    public void setRelatedSearches(List<RelatedSearch> relatedSearches) {
+        this.relatedSearches = relatedSearches;
+    }
+
+    /**
+     * @param relatedBrowsePages list of related browse pages to set
+     */
+    public void setRelatedBrowsePages(List<RelatedBrowsePage> relatedBrowsePages) {
+        this.relatedBrowsePages = relatedBrowsePages;
+    }
 }