issue #511 allow setting version on a per-request basis

ryber · ryber · commit 11993b3ad087 · 2024-01-09T09:16:51.000-06:00
diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/Http2Test.java b/unirest-bdd-tests/src/test/java/BehaviorTests/Http2Test.java
@@ -34,6 +34,7 @@
 import java.net.http.HttpClient;
 
 public class Http2Test extends BddTest  {
+
     @Test @Disabled
     void canMakeHttp2Requests() {
         Unirest.config().version(HttpClient.Version.HTTP_2);
@@ -69,4 +70,30 @@ void dontSendHttp2HeadersForHttp1() {
                 .assertNoHeader("Upgrade")
                 .assertNoHeader("HTTP2-Settings");
     }
+
+    @Test
+    void overrideConfigPerRequest() {
+        Unirest.config().version(HttpClient.Version.HTTP_1_1);
+
+        Unirest.get(MockServer.GET)
+                .version(HttpClient.Version.HTTP_2)
+                .asObject(RequestCapture.class)
+                .getBody()
+                .assertHeader("Connection", "Upgrade, HTTP2-Settings")
+                .assertHeader("Upgrade", "h2c")
+                .assertHeader("HTTP2-Settings", "AAEAAEAAAAIAAAABAAMAAABkAAQBAAAAAAUAAEAA");
+    }
+
+    @Test
+    void overrideConfigPerRequest2() {
+        Unirest.config().version(HttpClient.Version.HTTP_2);
+
+        Unirest.get(MockServer.GET)
+                .version(HttpClient.Version.HTTP_1_1)
+                .asObject(RequestCapture.class)
+                .getBody()
+                .assertNoHeader("Connection")
+                .assertNoHeader("Upgrade")
+                .assertNoHeader("HTTP2-Settings");
+    }
 }
diff --git a/unirest/src/main/java/kong/unirest/core/BaseRequest.java b/unirest/src/main/java/kong/unirest/core/BaseRequest.java
@@ -26,6 +26,7 @@
 package kong.unirest.core;
 
 import java.io.File;
+import java.net.http.HttpClient;
 import java.nio.file.CopyOption;
 import java.time.Instant;
 import java.util.Collection;
@@ -51,6 +52,7 @@ abstract class BaseRequest<R extends HttpRequest> implements HttpRequest<R> {
     protected Path url;
     private Integer connectTimeout;
     private ProgressMonitor downloadMonitor;
+    private HttpClient.Version version;
 
     BaseRequest(BaseRequest httpRequest) {
         this.config = httpRequest.config;
@@ -59,6 +61,7 @@ abstract class BaseRequest<R extends HttpRequest> implements HttpRequest<R> {
         this.headers.putAll(httpRequest.headers);
         this.connectTimeout = httpRequest.connectTimeout;
         this.objectMapper = httpRequest.objectMapper;
+        this.version = httpRequest.version;
     }
 
     BaseRequest(Config config, HttpMethod method, String url) {
@@ -177,6 +180,12 @@ public R downloadMonitor(ProgressMonitor monitor) {
         return (R) this;
     }
 
+    @Override
+    public R version(HttpClient.Version value) {
+        this.version = value;
+        return (R) this;
+    }
+
     @Override
     public HttpResponse<Empty> asEmpty() {
         return request(BasicResponse::new, Empty.class);
@@ -424,6 +433,11 @@ public Instant getCreationTime() {
         return creation;
     }
 
+    @Override
+    public HttpClient.Version getVersion() {
+        return version;
+    }
+
     private <T> T valueOr(T x, Supplier<T> o) {
         if (x != null) {
             return x;
diff --git a/unirest/src/main/java/kong/unirest/core/HttpRequest.java b/unirest/src/main/java/kong/unirest/core/HttpRequest.java
@@ -26,6 +26,7 @@
 package kong.unirest.core;
 
 import java.io.File;
+import java.net.http.HttpClient;
 import java.nio.file.CopyOption;
 import java.time.Instant;
 import java.util.Collection;
@@ -186,6 +187,14 @@ public interface HttpRequest<R extends HttpRequest>  {
      */
     R downloadMonitor(ProgressMonitor monitor);
 
+
+    /**
+     * sets the HTTP version for the request. This will override any global config
+     * @param version the version
+     * @return this request builder
+     */
+    R version(HttpClient.Version version);
+
     /**
      * Executes the request and returns the response with the body mapped into a String
      * @return response
@@ -422,4 +431,10 @@ default Optional<Body> getBody(){
      * @return the instant the request object was created in UTC (not when it was sent).
      */
     Instant getCreationTime();
+
+    /**
+     * gets the version for the request, or null if not set.
+     * @return the version
+     */
+    HttpClient.Version getVersion();
 }
diff --git a/unirest/src/main/java/kong/unirest/core/java/JavaClient.java b/unirest/src/main/java/kong/unirest/core/java/JavaClient.java
@@ -82,7 +82,7 @@ private java.net.http.HttpRequest getRequest(HttpRequest<?> request) {
         try {
             var url = URI.create(request.getUrl());
             var jreq = newBuilder(url)
-                    .version(config.getVersion())
+                    .version(request.getVersion() != null ? request.getVersion() : config.getVersion())
                     .method(
                             request.getHttpMethod().name(),
                             new BodyBuilder(request).getBody()
