Properly enforce HTTP 1.1

dice-group · Feb 8, 2024 · 9c293d6 · 9c293d6
1 parent fdbffa4
commit 9c293d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorker.java
@@ -124,6 +124,7 @@ public Supplier<InputStream> getStreamSupplier() {
                             .POST(HttpRequest.BodyPublishers.ofInputStream(new CustomStreamSupplier().getStreamSupplier()));
                 }
             }
+
             return request.build();
         }
     }
@@ -423,6 +424,7 @@ private HttpExecutionResult executeHttpRequest(Duration timeout) {
 
     private HttpClient buildHttpClient() {
         return HttpClient.newBuilder()
+                .version(HttpClient.Version.HTTP_1_1)
                 .executor(Executors.newFixedThreadPool(1))
                 .followRedirects(HttpClient.Redirect.ALWAYS)
                 .connectTimeout(config().timeout())

diff --git a/src/test/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorkerTest.java b/src/test/java/org/aksw/iguana/cc/worker/impl/SPARQLProtocolWorkerTest.java
@@ -120,7 +120,6 @@ public void testRequestFactory(SPARQLProtocolWorker worker) {
                         .withBasicAuth("testUser", "password")
                         .withRequestBody(equalTo(QUERY))
                         .willReturn(aResponse().withStatus(200).withBody("Non-Empty-Body")));
-                return;
             }
             case POST_UPDATE -> {
                 wm.stubFor(post(urlPathEqualTo("/ds/query"))
@@ -129,7 +128,6 @@ public void testRequestFactory(SPARQLProtocolWorker worker) {
                         .withBasicAuth("testUser", "password")
                         .withRequestBody(equalTo(QUERY))
                         .willReturn(aResponse().withStatus(200).withBody("Non-Empty-Body")));
-                return; // TODO: wiremock behaves really weirdly when the request body is streamed
             }
 
             case POST_URL_ENC_QUERY -> wm.stubFor(post(urlPathEqualTo("/ds/query"))