apply fixes to match latest test syntaxes

Author: sebastianMindee

docs/code_samples/default_v2.txt

@@ -1,5 +1,5 @@
 import com.mindee.MindeeClientV2;
-import com.mindee.InferencePredictOptions;
+import com.mindee.InferenceOptions;
 import com.mindee.input.LocalInputSource;
 import com.mindee.parsing.v2.InferenceResponse;
 import java.io.File;
@@ -19,7 +19,7 @@ public class SimpleMindeeClient {
 
     // Prepare the enqueueing options
     // Note: modelId is mandatory.
-    InferencePredictOptions options = InferencePredictOptions.builder("MY_MODEL_ID").build();
+    InferenceOptions options = InferenceOptions.builder("MY_MODEL_ID").build();
 
     // Parse the file
     InferenceResponse response =  mindeeClient.enqueueAndParse(

…/com/mindee/InferencePredictOptions.java …in/java/com/mindee/InferenceOptions.javasrc/main/java/com/mindee/InferencePredictOptions.java renamed to src/main/java/com/mindee/InferenceOptions.java src/main/java/com/mindee/InferencePredictOptions.java renamed to src/main/java/com/mindee/InferenceOptions.java

@@ -12,7 +12,7 @@
  */
 @Getter
 @Data
-public final class InferencePredictOptions {
+public final class InferenceOptions {
   /**
    * ID of the model (required).
    */
@@ -54,7 +54,7 @@ public static Builder builder(String modelId) {
   }
 
   /**
-   * Fluent builder for {@link InferencePredictOptions}.
+   * Fluent builder for {@link InferenceOptions}.
    */
   public static final class Builder {
 
@@ -106,9 +106,9 @@ public Builder pollingOptions(AsyncPollingOptions pollingOptions) {
       return this;
     }
 
-    /** Build an immutable {@link InferencePredictOptions} instance. */
-    public InferencePredictOptions build() {
-      return new InferencePredictOptions(
+    /** Build an immutable {@link InferenceOptions} instance. */
+    public InferenceOptions build() {
+      return new InferenceOptions(
           modelId,
           fullText,
           rag,

src/main/java/com/mindee/MindeeClientV2.java

@@ -44,7 +44,7 @@ public MindeeClientV2(PdfOperation pdfOperation, MindeeApiV2 mindeeApi) {
    */
   public JobResponse enqueue(
       LocalInputSource inputSource,
-      InferencePredictOptions options) throws IOException {
+      InferenceOptions options) throws IOException {
     LocalInputSource finalInput;
     if (options.getPageOptions() != null) {
       finalInput = new LocalInputSource(getSplitFile(inputSource, options.getPageOptions()), inputSource.getFilename());
@@ -74,7 +74,7 @@ public CommonResponse parseQueued(String jobId) {
    */
   public InferenceResponse enqueueAndParse(
       LocalInputSource inputSource,
-      InferencePredictOptions options) throws IOException, InterruptedException {
+      InferenceOptions options) throws IOException, InterruptedException {
 
     validatePollingOptions(options.getPollingOptions());
 

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

@@ -1,6 +1,6 @@
 package com.mindee.http;
 
-import com.mindee.InferencePredictOptions;
+import com.mindee.InferenceOptions;
 import com.mindee.input.LocalInputSource;
 import com.mindee.parsing.v2.CommonResponse;
 import com.mindee.parsing.v2.JobResponse;
@@ -15,7 +15,7 @@ abstract public class MindeeApiV2 extends MindeeApiCommon {
    */
   abstract public JobResponse enqueuePost(
       LocalInputSource inputSource,
-      InferencePredictOptions options
+      InferenceOptions options
   ) throws IOException;
 
   /**

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

@@ -1,7 +1,7 @@
 package com.mindee.http;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.mindee.InferencePredictOptions;
+import com.mindee.InferenceOptions;
 import com.mindee.MindeeException;
 import com.mindee.MindeeSettingsV2;
 import com.mindee.input.LocalInputSource;
@@ -74,7 +74,7 @@ private MindeeHttpApiV2(
    */
   public JobResponse enqueuePost(
       LocalInputSource inputSource,
-      InferencePredictOptions options
+      InferenceOptions options
   ) {
     String url = this.mindeeSettings.getBaseUrl() + "/inferences/enqueue";
     HttpPost post = buildHttpPost(url, inputSource, options);
@@ -149,7 +149,7 @@ private MindeeHttpExceptionV2 getHttpError(ClassicHttpResponse response) {
 
   private HttpEntity buildHttpBody(
       LocalInputSource inputSource,
-      InferencePredictOptions options
+      InferenceOptions options
   ) {
     MultipartEntityBuilder builder = MultipartEntityBuilder.create();
     builder.setMode(HttpMultipartMode.EXTENDED);
@@ -187,7 +187,7 @@ private HttpEntity buildHttpBody(
   private HttpPost buildHttpPost(
       String url,
       LocalInputSource inputSource,
-      InferencePredictOptions options
+      InferenceOptions options
   ) {
     HttpPost post;
     try {

src/main/java/com/mindee/parsing/v2/Inference.java

@@ -43,18 +43,19 @@ public class Inference {
 
   @Override
   public String toString() {
-    StringJoiner sj = new StringJoiner("\n");
-    sj.add("#########")
+    StringJoiner joiner = new StringJoiner("\n");
+    joiner
         .add("Inference")
         .add("#########")
-        .add(":Model: " + (model != null ? model.getId() : ""))
-        .add(":File:")
-        .add("  :Name: " + (file != null ? file.getName() : ""))
-        .add("  :Alias: " + (file != null ? file.getAlias() : ""))
+        .add("Model")
+        .add("=====")
+        .add(":ID: " + (model != null ? model.getId() : ""))
+        .add("")
+        .add("File")
+        .add("====")
+        .add(file != null ? file.toString() : "")
         .add("")
-        .add("Result")
-        .add("======")
         .add(result != null ? result.toString() : "");
-    return sj.toString().trim();
+    return joiner.toString().trim() + "\n";
   }
 }

src/main/java/com/mindee/parsing/v2/InferenceResult.java

@@ -34,9 +34,13 @@ public final class InferenceResult {
   @Override
   public String toString() {
     StringJoiner joiner = new StringJoiner("\n");
+    joiner.add("Fields")
+          .add("======");
     joiner.add(fields.toString());
-    if (options != null) {
-      joiner.add(options.toString());
+    if (this.getOptions() != null) {
+      joiner.add("Options")
+          .add("=======")
+          .add(this.getOptions().toString());
     }
     return joiner.toString();
   }

src/main/java/com/mindee/parsing/v2/InferenceResultFile.java

@@ -27,4 +27,8 @@ public class InferenceResultFile {
    */
   @JsonProperty("alias")
   private String alias;
+
+  public String toString() {
+    return ":Name: " + name + "\n:Alias:" + (alias != null ? " " + alias : "");
+  }
 }

src/main/java/com/mindee/parsing/v2/field/BaseField.java

@@ -1,8 +1,21 @@
 package com.mindee.parsing.v2.field;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
 /**
  * Base class for V2 fields.
  */
 public abstract class BaseField {
+  /**
+   * Field's location.
+   */
+  @JsonProperty("locations")
+  private List<FieldLocation> page;
 
+  /**
+   * Confidence associated with the field.
+   */
+  @JsonProperty("confidence")
+  private FieldConfidence confidence;
 }

src/main/java/com/mindee/parsing/v2/field/FieldConfidence.java

@@ -0,0 +1,38 @@
+package com.mindee.parsing.v2.field;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Confidence level of a field as returned by the V2 API.
+ */
+public enum FieldConfidence {
+  Certain("Certain"),
+  High("High"),
+  Medium("Medium"),
+  Low("Low");
+
+  private final String json;
+
+  FieldConfidence(String json) {
+    this.json = json;
+  }
+
+  @JsonValue
+  public String toJson() {
+    return json;
+  }
+
+  @JsonCreator
+  public static FieldConfidence fromJson(String value) {
+    if (value == null) {
+      return null;
+    }
+    for (FieldConfidence level : values()) {
+      if (level.json.equalsIgnoreCase(value)) {
+        return level;
+      }
+    }
+    throw new IllegalArgumentException("Unknown confidence level '" + value + "'.");
+  }
+}