diff --git a/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/AbstractDoclingServeClientTests.java b/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/AbstractDoclingServeClientTests.java index 023d9ce4..da8157a4 100644 --- a/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/AbstractDoclingServeClientTests.java +++ b/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/AbstractDoclingServeClientTests.java @@ -221,6 +221,16 @@ void builderWorks() { .isInstanceOf(DoclingServeClient.class); } + // DoclingServeApiConfig.toBuilder() goes through the provider, which prefers Jackson 3, so deriving these clients + // from it would run the Jackson 2 suite against the Jackson 3 client + @Test + void everyClientIsTheImplementationUnderTest() { + var expectedType = getDoclingClient(false, false).getClass(); + + assertThat(getDoclingClient(true, false)).isExactlyInstanceOf(expectedType); + assertThat(getDoclingClient(false, true)).isExactlyInstanceOf(expectedType); + } + @Test void pathPartFromBaseUrl() { // From https://github.com/docling-project/docling-java/issues/294 diff --git a/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/DoclingServeJackson2ClientTests.java b/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/DoclingServeJackson2ClientTests.java index 150f7914..52ae6b10 100644 --- a/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/DoclingServeJackson2ClientTests.java +++ b/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/DoclingServeJackson2ClientTests.java @@ -14,6 +14,7 @@ import com.github.tomakehurst.wiremock.WireMockServer; import ai.docling.serve.api.DoclingServeApi; +import ai.docling.serve.api.DoclingServeApiConfig; import ai.docling.serve.api.validation.ValidationError; /** @@ -28,15 +29,20 @@ class DoclingServeJackson2ClientTests extends AbstractDoclingServeClientTests { @BeforeAll static void setUp() { wireMockServer.start(); - doclingClient = DoclingServeJackson2Client.builder() + doclingClient = newClient(DoclingServeApi.builder() .logRequests() .logResponses() .prettyPrint() .baseUrl(doclingContainer.getApiUrl()) - .build(); + .config()); + + authDoclingClient = newClient(doclingClient.config().toBuilder().apiKey("key").config()); + wiremockDoclingClient = newClient(doclingClient.config().toBuilder().baseUrl(wireMockServer.baseUrl()).config()); + } - authDoclingClient = doclingClient.config().toBuilder().apiKey("key").build(); - wiremockDoclingClient = doclingClient.config().toBuilder().baseUrl(wireMockServer.baseUrl()).build(); + // Not DoclingServeApiConfig.toBuilder().build(): it goes through the provider, which prefers Jackson 3 + private static DoclingServeApi newClient(DoclingServeApiConfig config) { + return DoclingServeJackson2Client.builder().config(config).build(); } @AfterAll diff --git a/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/DoclingServeJackson3ClientTests.java b/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/DoclingServeJackson3ClientTests.java index e5d3a5f5..abb504b2 100644 --- a/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/DoclingServeJackson3ClientTests.java +++ b/docling-serve/docling-serve-client/src/test/java/ai/docling/serve/client/DoclingServeJackson3ClientTests.java @@ -15,6 +15,7 @@ import com.github.tomakehurst.wiremock.WireMockServer; import ai.docling.serve.api.DoclingServeApi; +import ai.docling.serve.api.DoclingServeApiConfig; import ai.docling.serve.api.validation.ValidationError; /** @@ -29,15 +30,20 @@ class DoclingServeJackson3ClientTests extends AbstractDoclingServeClientTests { @BeforeAll static void setUp() { wireMockServer.start(); - doclingClient = DoclingServeJackson3Client.builder() + doclingClient = newClient(DoclingServeApi.builder() .logRequests() .logResponses() .prettyPrint() .baseUrl(doclingContainer.getApiUrl()) - .build(); + .config()); + + authDoclingClient = newClient(doclingClient.config().toBuilder().apiKey("key").config()); + wiremockDoclingClient = newClient(doclingClient.config().toBuilder().baseUrl(wireMockServer.baseUrl()).config()); + } - authDoclingClient = doclingClient.config().toBuilder().apiKey("key").build(); - wiremockDoclingClient = doclingClient.config().toBuilder().baseUrl(wireMockServer.baseUrl()).build(); + // Not DoclingServeApiConfig.toBuilder().build(): it goes through the provider, which prefers Jackson 3 + private static DoclingServeApi newClient(DoclingServeApiConfig config) { + return DoclingServeJackson3Client.builder().config(config).build(); } @AfterAll