add some shortcuts for using ContentType with accepts and contentType…

… methods
Kong · Apr 3, 2024 · b335b7a · b335b7a
1 parent 7375923
commit b335b7a
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 1 deletion.
diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderTest.java
@@ -430,6 +430,17 @@ public void onRequest(HttpRequest<?> request, Config config) {
         assertContains(headers, "beatles", "ringo");
     }
 
+    @Test
+    void passInMediaTypeAsAcceptsAndContentType() {
+        Unirest.post(MockServer.POST)
+                .accept(ContentType.IMAGE_JPEG)
+                .contentType(ContentType.APPLICATION_JSON)
+                .asObject(RequestCapture.class)
+                .getBody()
+                .assertAccepts(ContentType.IMAGE_JPEG)
+                .assertContentType(ContentType.APPLICATION_JSON);
+    }
+
     private void assertContains(Collection<Header> headers, String key, String value) {
         assertTrue(headers.stream().anyMatch(h -> key.equalsIgnoreCase(key) && value.equalsIgnoreCase(value)),
                 "Missing header " + key + " with value " + value);

diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/RequestCapture.java b/unirest-bdd-tests/src/test/java/BehaviorTests/RequestCapture.java
@@ -276,6 +276,10 @@ public void setStatus(int i) {
         this.status = i;
     }
 
+    public RequestCapture assertContentType(ContentType content) {
+        return assertContentType(content.getMimeType());
+    }
+
     public RequestCapture assertContentType(String content) {
         return assertHeader("Content-Type", content);
     }
@@ -329,6 +333,10 @@ public RequestCapture assertBodyPart(String name, Consumer<MultiPart> validator)
         return this;
     }
 
+    public RequestCapture assertAccepts(ContentType type) {
+        return assertHeader("Accept", type.toString());
+    }
+
     public static class MultiPart {
         public ListMultimap<String, String> headers = LinkedListMultimap.create();
         public String content;

diff --git a/unirest/src/main/java/kong/unirest/core/ContentType.java b/unirest/src/main/java/kong/unirest/core/ContentType.java
@@ -111,4 +111,8 @@ public ContentType withCharset(Charset charset) {
     public boolean isBinary() {
         return isBinary;
     }
+
+    public Charset getCharset() {
+        return encoding;
+    }
 }
diff --git a/unirest/src/main/java/kong/unirest/core/HttpRequest.java b/unirest/src/main/java/kong/unirest/core/HttpRequest.java
@@ -31,6 +31,7 @@
 import java.time.Instant;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
@@ -75,7 +76,17 @@ public interface HttpRequest<R extends HttpRequest>  {
     R basicAuth(String username, String password);
 
     /**
-     * The Accept header to send (e.g. application/json
+     * The Accept header to send (e.g. application/json)
+     * @param value a valid mime type for the Accept header
+     * @return this request builder
+     */
+    default R accept(ContentType value){
+        Objects.requireNonNull(value);
+        return accept(value.toString());
+    }
+
+    /**
+     * The Accept header to send (e.g. application/json)
      * @param value a valid mime type for the Accept header
      * @return this request builder
      */

diff --git a/unirest/src/main/java/kong/unirest/core/HttpRequestWithBody.java b/unirest/src/main/java/kong/unirest/core/HttpRequestWithBody.java
@@ -32,6 +32,7 @@
 import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * A request Builder for POST and PUT operations with a body.
@@ -183,6 +184,15 @@ default HttpRequestWithBody noCharset() {
      */
     Charset getCharset();
 
+    /**
+     * @param type The content mime type
+     * @return this request builder
+     */
+    default HttpRequestWithBody contentType(ContentType type){
+        Objects.requireNonNull(type);
+        return contentType(type.toString()).charset(type.getCharset());
+    }
+
     /**
      * @param type The content mime type
      * @return this request builder