File publisher support & tests

src/java_http_clj/core.clj

@@ -13,6 +13,8 @@
             HttpRequest$Builder
             HttpResponse
             HttpResponse$BodyHandlers]
+           [java.io File]
+           [java.nio.file Path]
            [java.util.concurrent CompletableFuture]
            [java.util.function Function Supplier]))
 
@@ -79,7 +81,13 @@
     (HttpRequest$BodyPublishers/ofInputStream (input-stream-supplier body))
 
     (instance? byte-array-class body)
-    (HttpRequest$BodyPublishers/ofByteArray body)))
+    (HttpRequest$BodyPublishers/ofByteArray body)
+
+    (instance? File body)
+    (HttpRequest$BodyPublishers/ofFile (.toPath ^File body))
+
+    (instance? Path body)
+    (HttpRequest$BodyPublishers/ofFile ^Path body)))
 
 (def ^:private convert-headers-xf
   (mapcat

test/java_http_clj/integration_test.clj

@@ -8,6 +8,7 @@
             [java-http-clj.specs]
             [mount.core :as mount])
   (:import [java.net.http HttpResponse]
+           [java.io File]
            [java.util Arrays]
            [java.util.concurrent CompletableFuture]))
 
@@ -46,20 +47,32 @@
       (is (= :http1.1 version))))
 
   (testing "request-body-types"
-    (let [send-and-get-body
+    (let [file-content
+          "hello"
+
+          file
+          (doto (File/createTempFile "tmp" ".tmp")
+            (spit file-content))
+
+          path
+          (.toPath file)
+
+          send-and-get-body
           (fn [body]
             (:body (f {:uri (make-url "echo")
                        :method :post
                        :body body})))]
       (is (= "ROOT" (:body (send (make-url)))))
       (is (= s (send-and-get-body s)))
       (is (= s (send-and-get-body (.getBytes s))))
+      (is (= file-content (send-and-get-body file)))
+      (is (= file-content (send-and-get-body path)))
       (is (= s (send-and-get-body (io/input-stream (.getBytes s)))))))
 
   (testing "response-body-types"
     (let [send-echo (fn [opts] (f (make-url "echo" {:message s}) opts))]
       (is (= s (:body (send-echo {:as :string}))))
-      (is (Arrays/equals (.getBytes s) (:body (send-echo {:as :byte-array}))))
+      (is (Arrays/equals (.getBytes s) ^bytes (:body (send-echo {:as :byte-array}))))
       (is (= s (-> (send-echo {:as :input-stream}) :body slurp)))))
 
   (testing "raw-opt"

test/java_http_clj/test_server.clj

@@ -1,4 +1,5 @@
 (ns ^:skip-test java-http-clj.test-server
+  (:import org.eclipse.jetty.server.Server)
   (:require [clojure.java.io :as io]
             [clojure.test :refer :all]
             [compojure.core :refer :all]
@@ -34,4 +35,4 @@
       {:port port
        :websockets {"/ws" ws-handler}
        :join? false}))
-  :stop (.stop server))
+  :stop (.stop ^Server server))