let's see if java 25 is happy

Author: ianardee

pom.xml

@@ -290,8 +290,8 @@
     </dependency>
     <dependency>
       <artifactId>jackson-databind</artifactId>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <version>${com.fasterxml.jackson.version}</version>
+      <groupId>tools.jackson.core</groupId>
+      <version>${tools.jackson.core.databind.version}</version>
     </dependency>
     <dependency>
       <artifactId>jackson-datatype-jsr310</artifactId>
@@ -366,7 +366,6 @@
       <artifactId>junit-pioneer</artifactId>
       <groupId>org.junit-pioneer</groupId>
       <scope>test</scope>
-      <!-- version 2.0 is not compatible with java 8 -->
       <version>${org.junit.pioneer.version}</version>
     </dependency>
     <dependency>
@@ -418,8 +417,8 @@
     <!-- MINDEE VERSION GOES HERE -->
     <revision>5.0.0-alpha1</revision>
 
-    <com.fasterxml.jackson.version>2.15.4</com.fasterxml.jackson.version>
-    <com.fasterxml.jackson.datatype.version>2.15.4</com.fasterxml.jackson.datatype.version>
+    <tools.jackson.core.databind.version>3.1.1</tools.jackson.core.databind.version>
+    <com.fasterxml.jackson.datatype.version>2.21.2</com.fasterxml.jackson.datatype.version>
     <com.squareup.okhttp3.version>4.12.0</com.squareup.okhttp3.version>
     <info.picocli.version>4.7.6</info.picocli.version>
     <maven.compiler.source>11</maven.compiler.source>
@@ -441,7 +440,7 @@
     <org.apache.pdfbox.version>3.0.5</org.apache.pdfbox.version>
     <org.junit.jupiter.version>5.8.2</org.junit.jupiter.version>
     <org.junit.pioneer.version>1.9.1</org.junit.pioneer.version>
-    <org.junit.platform.version>1.8.2</org.junit.platform.version>
+    <org.junit.platform.version>1.9.2</org.junit.platform.version>
     <org.hamcrest.version>2.2</org.hamcrest.version>
     <org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
     <org.mockito.inline.version>4.11.0</org.mockito.inline.version>

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

@@ -39,6 +39,9 @@ public abstract <DocT extends Inference> PredictResponse<DocT> predictPost(
       RequestParameters requestParameters
   ) throws IOException;
 
+  /**
+   * Execute a workflow.
+   */
   public abstract <DocT extends Inference> WorkflowResponse<DocT> executeWorkflowPost(
       Class<DocT> documentClass,
       String workflowId,

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

@@ -10,7 +10,6 @@
 import com.mindee.v2.parsing.ErrorResponse;
 import com.mindee.v2.parsing.JobResponse;
 import com.mindee.v2.product.extraction.ExtractionResponse;
-import com.mindee.v2.product.extraction.params.ExtractionParameters;
 import java.io.IOException;
 
 /**
@@ -34,26 +33,6 @@ public MindeeClient(MindeeApiV2 mindeeApi) {
     this.mindeeApi = mindeeApi;
   }
 
-  /**
-   * @deprecated use `enqueue` instead.
-   */
-  public JobResponse enqueueInference(
-      LocalInputSource inputSource,
-      ExtractionParameters params
-  ) throws IOException {
-    return enqueue(inputSource, params);
-  }
-
-  /**
-   * @deprecated use `enqueue` instead.
-   */
-  public JobResponse enqueueInference(
-      URLInputSource inputSource,
-      ExtractionParameters params
-  ) throws IOException {
-    return enqueue(inputSource, params);
-  }
-
   /**
    * Enqueue a document in the asynchronous queue.
    *
@@ -88,13 +67,6 @@ public JobResponse getJob(String jobId) {
     return mindeeApi.reqGetJob(jobId);
   }
 
-  /**
-   * @deprecated use `getResult` instead.
-   */
-  public ExtractionResponse getInference(String inferenceId) {
-    return getResult(ExtractionResponse.class, inferenceId);
-  }
-
   /**
    * Get the result of an inference that was previously enqueued.
    * The inference will only be available after it has finished processing.
@@ -109,26 +81,6 @@ public <TResponse extends CommonResponse> TResponse getResult(
     return mindeeApi.reqGetResult(responseClass, inferenceId);
   }
 
-  /**
-   * @deprecated use `enqueueAndGetResult` instead.
-   */
-  public ExtractionResponse enqueueAndGetInference(
-      LocalInputSource inputSource,
-      ExtractionParameters options
-  ) throws IOException, InterruptedException {
-    return enqueueAndGetResult(ExtractionResponse.class, inputSource, options);
-  }
-
-  /**
-   * @deprecated use `enqueueAndGetResult` instead.
-   */
-  public ExtractionResponse enqueueAndGetInference(
-      URLInputSource inputSource,
-      ExtractionParameters options
-  ) throws IOException, InterruptedException {
-    return enqueueAndGetResult(ExtractionResponse.class, inputSource, options);
-  }
-
   /**
    * Send a local file to an async queue, poll, and parse when complete.
    *

src/test/java/com/mindee/TestingUtilities.java

@@ -25,11 +25,6 @@ public static String getV1ResourcePathString(String filePath) {
     return getV1ResourcePath(filePath).toString();
   }
 
-  public static String readFileAsString(Path path) throws IOException {
-    byte[] encoded = Files.readAllBytes(path);
-    return new String(encoded);
-  }
-
   public static void assertStringEqualsFile(String expected, String filePath) throws IOException {
     String[] actualLines = expected.split(System.lineSeparator());
     List<String> expectedLines = Files.readAllLines(Paths.get(filePath));

src/test/java/com/mindee/input/URLInputSourceTest.java

@@ -1,7 +1,6 @@
 package com.mindee.input;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,6 +10,7 @@
 import java.nio.file.Paths;
 import lombok.Setter;
 import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
 
 public class URLInputSourceTest {
 
@@ -31,7 +31,7 @@ public void tearDown() {
   void fetchFile_shouldSaveFileLocally() throws IOException {
     urlInputSource.fetchFile();
 
-    File savedFile = new File(urlInputSource.getLocalFilename());
+    var savedFile = new File(urlInputSource.getLocalFilename());
     assertTrue(savedFile.exists(), "The file should be saved locally");
 
     Files.deleteIfExists(savedFile.toPath());
@@ -47,7 +47,7 @@ void fetchFile_shouldThrowIOException_onFailedFetch() {
 
   @Test
   void fetchFile_shouldHandleRedirects() throws IOException {
-    urlInputSource.setMockResponseCode(HttpURLConnection.HTTP_MOVED_TEMP);
+    urlInputSource.setMockResponseCode(HttpURLConnection.HTTP_OK);
     urlInputSource.setMockRedirectUrl("https://example.com/redirectedfile.pdf");
 
     urlInputSource.setMockResponseCode(HttpURLConnection.HTTP_OK);
@@ -84,7 +84,7 @@ void toLocalInputSource_shouldCreateLocalInputSource() throws IOException {
     urlInputSource.cleanup();
   }
 
-  class TestableURLInputSource extends URLInputSource {
+  static class TestableURLInputSource extends URLInputSource {
 
     @Setter
     private int mockResponseCode = HttpURLConnection.HTTP_OK;
@@ -98,23 +98,51 @@ public TestableURLInputSource(String url) {
 
     @Override
     protected HttpURLConnection createConnection(String urlString) throws IOException {
-      HttpURLConnection mockConnection = mock(HttpURLConnection.class);
-
-      when(mockConnection.getResponseCode()).thenReturn(mockResponseCode);
+      java.net.URL url = new java.net.URL(urlString);
+      boolean wasRedirected = isRedirected;
 
-      Path path = Paths.get("src/test/resources/file_types/pdf/multipage.pdf");
-      if (isRedirected) {
-        when(mockConnection.getHeaderField("Location")).thenReturn(null);
-        when(mockConnection.getInputStream()).thenReturn(Files.newInputStream(path));
-      } else {
-        when(mockConnection.getHeaderField("Location")).thenReturn(mockRedirectUrl);
-        when(mockConnection.getResponseCode()).thenReturn(HttpURLConnection.HTTP_MOVED_TEMP);
+      if (!isRedirected && mockRedirectUrl != null) {
         isRedirected = true;
-        return mockConnection;
       }
 
-      when(mockConnection.getInputStream()).thenReturn(Files.newInputStream(path));
-      return mockConnection;
+      return new HttpURLConnection(url) {
+        @Override
+        public void disconnect() {
+        }
+
+        @Override
+        public boolean usingProxy() {
+          return false;
+        }
+
+        @Override
+        public void connect() {
+        }
+
+        @Override
+        public int getResponseCode() {
+          if (mockRedirectUrl != null && !wasRedirected) {
+            return HttpURLConnection.HTTP_MOVED_TEMP;
+          }
+          return mockResponseCode;
+        }
+
+        @Override
+        public String getHeaderField(String name) {
+          if ("Location".equalsIgnoreCase(name)) {
+            if (mockRedirectUrl != null && !wasRedirected) {
+              return mockRedirectUrl;
+            }
+          }
+          return null;
+        }
+
+        @Override
+        public java.io.InputStream getInputStream() throws IOException {
+          Path path = Paths.get("src/test/resources/file_types/pdf/multipage.pdf");
+          return Files.newInputStream(path);
+        }
+      };
     }
   }
 }

src/test/java/com/mindee/v1/FakeMindeeApiV1.java

@@ -0,0 +1,71 @@
+package com.mindee.v1;
+
+import com.mindee.v1.http.Endpoint;
+import com.mindee.v1.http.MindeeApiV1;
+import com.mindee.v1.http.RequestParameters;
+import com.mindee.v1.parsing.common.AsyncPredictResponse;
+import com.mindee.v1.parsing.common.Inference;
+import com.mindee.v1.parsing.common.PredictResponse;
+import com.mindee.v1.parsing.common.WorkflowResponse;
+import java.io.IOException;
+
+public class FakeMindeeApiV1<T extends Inference> extends MindeeApiV1 {
+
+  private final AsyncPredictResponse<T> asyncPredictResponse;
+  private final PredictResponse<T> predictResponse;
+  private final WorkflowResponse<T> workflowResponse;
+
+  public FakeMindeeApiV1(AsyncPredictResponse<T> asyncPredictResponse) {
+    this.asyncPredictResponse = asyncPredictResponse;
+    this.predictResponse = null;
+    this.workflowResponse = null;
+  }
+
+  public FakeMindeeApiV1(PredictResponse<T> predictResponse) {
+    this.asyncPredictResponse = null;
+    this.predictResponse = predictResponse;
+    this.workflowResponse = null;
+  }
+
+  public FakeMindeeApiV1(WorkflowResponse<T> workflowResponse) {
+    this.asyncPredictResponse = null;
+    this.predictResponse = null;
+    this.workflowResponse = workflowResponse;
+  }
+
+  @Override
+  public <DocT extends Inference> AsyncPredictResponse<DocT> documentQueueGet(
+      Class<DocT> documentClass,
+      Endpoint endpoint,
+      String jobId
+  ) {
+    return (AsyncPredictResponse<DocT>) asyncPredictResponse;
+  }
+
+  @Override
+  public <DocT extends Inference> AsyncPredictResponse<DocT> predictAsyncPost(
+      Class<DocT> documentClass,
+      Endpoint endpoint,
+      RequestParameters requestParameters
+  ) throws IOException {
+    return (AsyncPredictResponse<DocT>) asyncPredictResponse;
+  }
+
+  @Override
+  public <DocT extends Inference> PredictResponse<DocT> predictPost(
+      Class<DocT> documentClass,
+      Endpoint endpoint,
+      RequestParameters requestParameters
+  ) throws IOException {
+    return (PredictResponse<DocT>) predictResponse;
+  }
+
+  @Override
+  public <DocT extends Inference> WorkflowResponse<DocT> executeWorkflowPost(
+      Class<DocT> documentClass,
+      String workflowId,
+      RequestParameters requestParameters
+  ) throws IOException {
+    return (WorkflowResponse<DocT>) workflowResponse;
+  }
+}