rework v2 parameters

Author: ianardee

src/main/java/com/mindee/InferenceParameters.java

@@ -1,7 +1,6 @@
 package com.mindee;
 
 import com.mindee.v2.clientOptions.BaseParameters;
-import java.util.Objects;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
@@ -96,21 +95,16 @@ public static Builder builder(String modelId) {
   /**
    * Fluent builder for {@link InferenceParameters}.
    */
-  public static final class Builder {
-
-    private final String modelId;
+  public static final class Builder extends BaseParameters.BaseBuilder<Builder> {
     private Boolean rag = null;
     private Boolean rawText = null;
     private Boolean polygon = null;
     private Boolean confidence = null;
-    private String alias;
-    private String[] webhookIds = new String[] {};
     private String textContext;
     private String dataSchema;
-    private AsyncPollingOptions pollingOptions = AsyncPollingOptions.builder().build();
 
-    private Builder(String modelId) {
-      this.modelId = Objects.requireNonNull(modelId, "modelId must not be null");
+    Builder(String modelId) {
+      super(modelId);
     }
 
     /** Enhance extraction accuracy with Retrieval-Augmented Generation. */
@@ -140,18 +134,6 @@ public Builder confidence(Boolean confidence) {
       return this;
     }
 
-    /** Set an alias for the uploaded document. */
-    public Builder alias(String alias) {
-      this.alias = alias;
-      return this;
-    }
-
-    /** Provide IDs of webhooks to forward the API response to. */
-    public Builder webhookIds(String[] webhookIds) {
-      this.webhookIds = webhookIds;
-      return this;
-    }
-
     /** Provide additional text context used by the model during inference. */
     public Builder textContext(String textContext) {
       this.textContext = textContext;
@@ -164,12 +146,6 @@ public Builder dataSchema(String dataSchema) {
       return this;
     }
 
-    /** Set polling options. */
-    public Builder pollingOptions(AsyncPollingOptions pollingOptions) {
-      this.pollingOptions = pollingOptions;
-      return this;
-    }
-
     /** Build an immutable {@link InferenceParameters} instance. */
     public InferenceParameters build() {
       return new InferenceParameters(

src/main/java/com/mindee/v2/clientOptions/BaseParameters.java

@@ -1,6 +1,7 @@
 package com.mindee.v2.clientOptions;
 
 import com.mindee.AsyncPollingOptions;
+import java.util.Objects;
 import lombok.Data;
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
 
@@ -38,4 +39,39 @@ public MultipartEntityBuilder buildHttpBody(MultipartEntityBuilder builder) {
     }
     return builder;
   }
+
+  protected static abstract class BaseBuilder<T extends BaseBuilder<T>> {
+    protected final String modelId;
+    protected String alias;
+    protected String[] webhookIds;
+    protected AsyncPollingOptions pollingOptions;
+
+    @SuppressWarnings("unchecked")
+    protected T self() {
+      return (T) this;
+    }
+
+    protected BaseBuilder(String modelId) {
+      this.modelId = Objects.requireNonNull(modelId, "modelId must not be null");
+    }
+
+    /** Set an alias for the uploaded document. */
+    public T alias(String alias) {
+      this.alias = alias;
+      return self();
+    }
+
+    /** Provide IDs of webhooks to forward the API response to. */
+    public T webhookIds(String[] webhookIds) {
+      this.webhookIds = webhookIds;
+      return self();
+    }
+
+    /** Set polling options. */
+    public T pollingOptions(AsyncPollingOptions pollingOptions) {
+      this.pollingOptions = pollingOptions;
+      return self();
+    }
+  }
+
 }

src/test/java/com/mindee/MindeeClientV2IT.java

@@ -212,7 +212,7 @@ void invalidJob_mustThrowError() {
   }
 
   @Test
-  @DisplayName("URL input source - A url param should not raise errors.")
+  @DisplayName("URL input source - A URL param should not raise errors.")
   void urlInputSource_mustNotRaiseErrors() throws IOException, InterruptedException {
     URLInputSource urlSource = URLInputSource
       .builder(System.getenv("MINDEE_V2_SE_TESTS_BLANK_PDF_URL"))