will it blend?

Author: ianardee

src/main/java/com/mindee/v2/MindeeClient.java

@@ -14,6 +14,7 @@
 import com.mindee.v2.parsing.search.BaseSearchResponse;
 import com.mindee.v2.parsing.search.SearchResponse;
 import com.mindee.v2.product.extraction.ExtractionResponse;
+import com.mindee.v2.search.models.ModelSearchParameters;
 import java.io.IOException;
 import java.util.concurrent.CancellationException;
 
@@ -213,7 +214,7 @@ public <TSearchResponse extends BaseSearchResponse> TSearchResponse search(
    */
   @Deprecated
   public SearchResponse searchModels() {
-    return searchModels(null, null);
+    return search(SearchResponse.class, null);
   }
 
   /**
@@ -225,7 +226,7 @@ public SearchResponse searchModels() {
    */
   @Deprecated
   public SearchResponse searchModels(String modelName) {
-    return searchModels(modelName, null);
+    return search(SearchResponse.class, ModelSearchParameters.builder().name(modelName).build());
   }
 
   /**
@@ -238,7 +239,10 @@ public SearchResponse searchModels(String modelName) {
    */
   @Deprecated
   public SearchResponse searchModels(String modelName, String modelType) {
-    return mindeeApi.reqGetSearchModels(modelName, modelType);
+    return search(
+      SearchResponse.class,
+      ModelSearchParameters.builder().name(modelName).modelType(modelType).build()
+    );
   }
 
   /**

src/main/java/com/mindee/v2/http/MindeeApiV2.java

@@ -10,7 +10,6 @@
 import com.mindee.v2.parsing.JobResponse;
 import com.mindee.v2.parsing.error.ErrorResponse;
 import com.mindee.v2.parsing.search.BaseSearchResponse;
-import com.mindee.v2.parsing.search.SearchResponse;
 import com.mindee.v2.product.ProductAttributes;
 import java.io.IOException;
 
@@ -74,15 +73,6 @@ public abstract <TSearchResponse extends BaseSearchResponse> TSearchResponse req
       BaseSearchParameters parameters
   );
 
-  /**
-   * Retrieves a list of models.
-   *
-   * @param modelName search term for model name
-   * @param modelType search term for model type
-   */
-  @Deprecated
-  public abstract SearchResponse reqGetSearchModels(String modelName, String modelType);
-
   /**
    * Creates an "unknown error" response from an HTTP status code.
    */
@@ -102,7 +92,7 @@ protected ProductAttributes getResponseProductInfo(
     var productInfo = responseClass.getAnnotation(ProductAttributes.class);
     if (productInfo == null) {
       throw new MindeeException(
-        "The class " + responseClass.getSimpleName() + " is not annotated with @ProductInfo"
+        "The class " + responseClass.getSimpleName() + " is not annotated with @ProductAttributes"
       );
     }
     return productInfo;
@@ -114,7 +104,7 @@ protected ProductAttributes getParamsProductAttributes(
     var productInfo = responseClass.getAnnotation(ProductAttributes.class);
     if (productInfo == null) {
       throw new MindeeException(
-        "The class " + responseClass.getSimpleName() + " is not annotated with @ProductInfo"
+        "The class " + responseClass.getSimpleName() + " is not annotated with @ProductAttributes"
       );
     }
     return productInfo;

src/main/java/com/mindee/v2/http/MindeeHttpApiV2.java

@@ -12,7 +12,6 @@
 import com.mindee.v2.parsing.JobResponse;
 import com.mindee.v2.parsing.error.ErrorResponse;
 import com.mindee.v2.parsing.search.BaseSearchResponse;
-import com.mindee.v2.parsing.search.SearchResponse;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
@@ -173,25 +172,6 @@ public <TSearchResponse extends BaseSearchResponse> TSearchResponse reqGetSearch
     return this.executeAPIRequest(get, responseClass);
   }
 
-  @Override
-  @Deprecated
-  public SearchResponse reqGetSearchModels(String modelName, String modelType) {
-    URIBuilder url;
-    try {
-      url = new URIBuilder(this.mindeeSettings.getBaseUrl() + "/search/models");
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
-    }
-    if (modelName != null) {
-      url.addParameter("name", modelName);
-    }
-    if (modelType != null) {
-      url.addParameter("model_type", modelType);
-    }
-    var get = new HttpGet(url.toString());
-    return executeAPIRequest(get, SearchResponse.class);
-  }
-
   /**
    * Ensures that a caller-supplied inference URL targets the configured Mindee
    * base URL so the {@code Authorization} header attached by

src/main/java/com/mindee/v2/parsing/search/SearchResponse.java

@@ -1,6 +1,7 @@
 package com.mindee.v2.parsing.search;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.mindee.v2.product.ProductAttributes;
 import com.mindee.v2.search.models.ModelSearchResponse;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -14,6 +15,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @AllArgsConstructor
 @Deprecated
+@ProductAttributes(slug = "models")
 public class SearchResponse extends ModelSearchResponse {
 
 }

src/test/java/com/mindee/v2/MindeeClientTest.java

@@ -17,7 +17,6 @@
 import com.mindee.v2.parsing.CommonResponse;
 import com.mindee.v2.parsing.JobResponse;
 import com.mindee.v2.parsing.search.BaseSearchResponse;
-import com.mindee.v2.parsing.search.SearchResponse;
 import com.mindee.v2.product.extraction.ExtractionResponse;
 import com.mindee.v2.product.extraction.params.ExtractionParameters;
 import com.mindee.v2.search.models.ModelSearchResponse;
@@ -69,12 +68,6 @@ public <TSearchResponse extends BaseSearchResponse> TSearchResponse reqGetSearch
       return (TSearchResponse) new ModelSearchResponse();
     }
 
-    @Override
-    @Deprecated
-    public SearchResponse reqGetSearchModels(String modelName, String modelType) {
-      return new SearchResponse();
-    }
-
     @Override
     public <TResponse extends CommonResponse> TResponse reqGetResultById(
         Class<TResponse> tResponseClass,