refactor v2 internals

Author: sebastianMindee

src/main/java/com/mindee/InferencePredictOptions.java

@@ -13,7 +13,6 @@
 @Getter
 @Data
 public final class InferencePredictOptions {
-
   /**
    * ID of the model (required).
    */

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

@@ -27,13 +27,13 @@ public class Inference {
    * Model info.
    */
   @JsonProperty("model")
-  private InferenceModel model;
+  private InferenceResultModel model;
 
   /**
    * File info.
    */
   @JsonProperty("file")
-  private InferenceFile file;
+  private InferenceResultFile file;
 
   /**
    * Model result values.

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

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mindee.parsing.v2.field.InferenceFields;
 import java.util.StringJoiner;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -28,7 +29,7 @@ public final class InferenceResult {
    * Options.
    */
   @JsonProperty("options")
-  private InferenceOptions options;
+  private InferenceResultOptions options;
 
   @Override
   public String toString() {

…com/mindee/parsing/v2/InferenceFile.java …ndee/parsing/v2/InferenceResultFile.javasrc/main/java/com/mindee/parsing/v2/InferenceFile.java renamed to src/main/java/com/mindee/parsing/v2/InferenceResultFile.java src/main/java/com/mindee/parsing/v2/InferenceFile.java renamed to src/main/java/com/mindee/parsing/v2/InferenceResultFile.java

@@ -15,7 +15,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @AllArgsConstructor
 @NoArgsConstructor
-public class InferenceFile {
+public class InferenceResultFile {
   /**
    * File name.
    */

…om/mindee/parsing/v2/InferenceModel.java …dee/parsing/v2/InferenceResultModel.javasrc/main/java/com/mindee/parsing/v2/InferenceModel.java renamed to src/main/java/com/mindee/parsing/v2/InferenceResultModel.java src/main/java/com/mindee/parsing/v2/InferenceModel.java renamed to src/main/java/com/mindee/parsing/v2/InferenceResultModel.java

@@ -15,7 +15,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @AllArgsConstructor
 @NoArgsConstructor
-public class InferenceModel {
+public class InferenceResultModel {
 
   /**
    * The ID of the model.

…/mindee/parsing/v2/InferenceOptions.java …e/parsing/v2/InferenceResultOptions.javasrc/main/java/com/mindee/parsing/v2/InferenceOptions.java renamed to src/main/java/com/mindee/parsing/v2/InferenceResultOptions.java src/main/java/com/mindee/parsing/v2/InferenceOptions.java renamed to src/main/java/com/mindee/parsing/v2/InferenceResultOptions.java

@@ -8,7 +8,7 @@
  * Option response for V2 API inference.
  */
 @Getter
-public final class InferenceOptions {
+public final class InferenceResultOptions {
 
   @JsonProperty("raw_texts")
   private List<RawText> rawTexts;

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

@@ -80,5 +80,5 @@ public final class Job {
    * Polling URL.
    */
   @JsonProperty("webhooks")
-  private List<Webhook> webhooks;
+  private List<JobResponseWebhook> webhooks;
 }

…/java/com/mindee/parsing/v2/Webhook.java …indee/parsing/v2/JobResponseWebhook.javasrc/main/java/com/mindee/parsing/v2/Webhook.java renamed to src/main/java/com/mindee/parsing/v2/JobResponseWebhook.java src/main/java/com/mindee/parsing/v2/Webhook.java renamed to src/main/java/com/mindee/parsing/v2/JobResponseWebhook.java

@@ -11,14 +11,14 @@
 import lombok.NoArgsConstructor;
 
 /**
- * Webhook info.
+ * JobResponseWebhook info.
  */
 @Getter
 @EqualsAndHashCode
 @JsonIgnoreProperties(ignoreUnknown = true)
 @AllArgsConstructor
 @NoArgsConstructor
-public final class Webhook {
+public final class JobResponseWebhook {
 
   /**
    * ID of the webhook.

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

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -15,10 +14,15 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class RawText {
-
+  /*
+   * Page Number the text was found on.
+   */
   @JsonProperty("page")
   private Integer page;
 
+  /*
+   * Content of the raw text.
+   */
   @JsonProperty("content")
   private String content;
 }

…ava/com/mindee/parsing/v2/BaseField.java …m/mindee/parsing/v2/field/BaseField.javasrc/main/java/com/mindee/parsing/v2/BaseField.java renamed to src/main/java/com/mindee/parsing/v2/field/BaseField.java src/main/java/com/mindee/parsing/v2/BaseField.java renamed to src/main/java/com/mindee/parsing/v2/field/BaseField.java

@@ -1,4 +1,4 @@
-package com.mindee.parsing.v2;
+package com.mindee.parsing.v2.field;
 
 /**
  * Base class for V2 fields.