move settings

Author: ianardee

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

@@ -9,6 +9,7 @@
 import com.mindee.pdf.PdfBoxApi;
 import com.mindee.pdf.PdfOperation;
 import com.mindee.pdf.SplitQuery;
+import com.mindee.v1.MindeeSettings;
 import com.mindee.v1.clientOptions.PredictOptions;
 import com.mindee.v1.clientOptions.WorkflowOptions;
 import com.mindee.v1.http.Endpoint;

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

@@ -2,6 +2,7 @@
 
 import com.mindee.input.LocalInputSource;
 import com.mindee.input.URLInputSource;
+import com.mindee.v2.MindeeSettings;
 import com.mindee.v2.clientOptions.BaseParameters;
 import com.mindee.v2.http.MindeeApiV2;
 import com.mindee.v2.http.MindeeHttpApiV2;
@@ -206,9 +207,9 @@ private <TResponse extends CommonResponse> TResponse pollAndFetch(
   }
 
   private static MindeeApiV2 createDefaultApiV2(String apiKey) {
-    MindeeSettingsV2 settings = apiKey == null || apiKey.trim().isEmpty()
-        ? new MindeeSettingsV2()
-        : new MindeeSettingsV2(apiKey);
+    MindeeSettings settings = apiKey == null || apiKey.trim().isEmpty()
+        ? new MindeeSettings()
+        : new MindeeSettings(apiKey);
     return MindeeHttpApiV2.builder().mindeeSettings(settings).build();
   }
 }

…main/java/com/mindee/MindeeSettings.java …n/java/com/mindee/v1/MindeeSettings.javasrc/main/java/com/mindee/MindeeSettings.java renamed to src/main/java/com/mindee/v1/MindeeSettings.java src/main/java/com/mindee/MindeeSettings.java renamed to src/main/java/com/mindee/v1/MindeeSettings.java

@@ -1,4 +1,4 @@
-package com.mindee;
+package com.mindee.v1;
 
 import java.util.Optional;
 import lombok.Getter;

src/main/java/com/mindee/v1/http/MindeeHttpApi.java

@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.mindee.MindeeException;
-import com.mindee.MindeeSettings;
+import com.mindee.v1.MindeeSettings;
 import com.mindee.v1.parsing.common.ApiResponse;
 import com.mindee.v1.parsing.common.AsyncPredictResponse;
 import com.mindee.v1.parsing.common.ErrorDetails;

…in/java/com/mindee/MindeeSettingsV2.java …n/java/com/mindee/v2/MindeeSettings.javasrc/main/java/com/mindee/MindeeSettingsV2.java renamed to src/main/java/com/mindee/v2/MindeeSettings.java src/main/java/com/mindee/MindeeSettingsV2.java renamed to src/main/java/com/mindee/v2/MindeeSettings.java

@@ -1,4 +1,4 @@
-package com.mindee;
+package com.mindee.v2;
 
 import java.util.Optional;
 import lombok.Builder;
@@ -9,25 +9,25 @@
  */
 @Getter
 @Builder
-public class MindeeSettingsV2 {
+public class MindeeSettings {
 
   private static final String DEFAULT_MINDEE_V2_API_URL = "https://api-v2.mindee.net/v2";
   private final String apiKey;
   private final String baseUrl;
 
-  public MindeeSettingsV2() {
+  public MindeeSettings() {
     this("", "");
   }
 
   public Optional<String> getApiKey() {
     return Optional.ofNullable(apiKey);
   }
 
-  public MindeeSettingsV2(String apiKey) {
+  public MindeeSettings(String apiKey) {
     this(apiKey, "");
   }
 
-  public MindeeSettingsV2(String apiKey, String baseUrl) {
+  public MindeeSettings(String apiKey, String baseUrl) {
 
     if (apiKey == null || apiKey.trim().isEmpty()) {
       String apiKeyFromEnv = System.getenv("MINDEE_V2_API_KEY");

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

@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.mindee.MindeeException;
-import com.mindee.MindeeSettingsV2;
 import com.mindee.input.LocalInputSource;
 import com.mindee.input.URLInputSource;
+import com.mindee.v2.MindeeSettings;
 import com.mindee.v2.clientOptions.BaseParameters;
 import com.mindee.v2.parsing.CommonResponse;
 import com.mindee.v2.parsing.ErrorResponse;
@@ -38,19 +38,19 @@ public final class MindeeHttpApiV2 extends MindeeApiV2 {
   /**
    * The MindeeSetting needed to make the api call.
    */
-  private final MindeeSettingsV2 mindeeSettings;
+  private final MindeeSettings mindeeSettings;
   /**
    * The HttpClientBuilder used to create HttpClient objects used to make api calls over http.
    * Defaults to HttpClientBuilder.create().useSystemProperties()
    */
   private final HttpClientBuilder httpClientBuilder;
 
-  public MindeeHttpApiV2(MindeeSettingsV2 mindeeSettings) {
+  public MindeeHttpApiV2(MindeeSettings mindeeSettings) {
     this(mindeeSettings, null);
   }
 
   @Builder
-  private MindeeHttpApiV2(MindeeSettingsV2 mindeeSettings, HttpClientBuilder httpClientBuilder) {
+  private MindeeHttpApiV2(MindeeSettings mindeeSettings, HttpClientBuilder httpClientBuilder) {
     this.mindeeSettings = mindeeSettings;
 
     if (httpClientBuilder != null) {

src/test/java/com/mindee/http/MindeeHttpApiTest.java

@@ -13,7 +13,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import com.mindee.MindeeSettings;
+import com.mindee.v1.MindeeSettings;
 import com.mindee.v1.clientOptions.PredictOptions;
 import com.mindee.v1.http.Endpoint;
 import com.mindee.v1.http.MindeeHttpApi;

…/java/com/mindee/MindeeSettingsTest.java …va/com/mindee/v1/MindeeSettingsTest.javasrc/test/java/com/mindee/MindeeSettingsTest.java renamed to src/test/java/com/mindee/v1/MindeeSettingsTest.java src/test/java/com/mindee/MindeeSettingsTest.java renamed to src/test/java/com/mindee/v1/MindeeSettingsTest.java

@@ -1,4 +1,4 @@
-package com.mindee;
+package com.mindee.v1;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

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

@@ -0,0 +1,17 @@
+package com.mindee.v2;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.SetEnvironmentVariable;
+
+public class MindeeSettingsTest {
+
+  @Test
+  @SetEnvironmentVariable(key = "MINDEE_V2_API_KEY", value = "abcd")
+  @SetEnvironmentVariable(key = "MINDEE_V2_API_URL", value = "https://example.com")
+  void setEnvironmentVariablesAndEmptyParams() {
+    MindeeSettings settings = new MindeeSettings("", "");
+    Assertions.assertEquals("abcd", settings.getApiKey().orElse(""));
+    Assertions.assertEquals("https://example.com", settings.getBaseUrl());
+  }
+}