Fix reflection warnings in tests

Author: eerohele

ring-core/test/ring/middleware/multipart_params/test/byte_array.clj

@@ -11,4 +11,4 @@
                  :stream (string-input-stream "foo")})]
     (is (= (:filename result) "foo.txt"))
     (is (= (:content-type result) "text/plain"))
-    (is (= (String. (:bytes result)) "foo"))))
+    (is (= (String. ^bytes (:bytes result)) "foo"))))

ring-core/test/ring/middleware/multipart_params/test/request_context.clj

@@ -1,7 +1,8 @@
 (ns ring.middleware.multipart-params.test.request-context
   (:require [clojure.test :refer :all]
-            [ring.middleware.multipart-params :as mp]))
+            [ring.middleware.multipart-params :as mp])
+  (:import [org.apache.commons.fileupload2.core RequestContext]))
 
 (deftest test-default-content-length
   (is (= -1
-         (.getContentLength (#'mp/request-context {} nil)))))
+         (.getContentLength ^RequestContext (#'mp/request-context {} nil)))))

ring-core/test/ring/middleware/multipart_params/test/temp_file.clj

@@ -1,7 +1,8 @@
 (ns ring.middleware.multipart-params.test.temp-file
   (:require [clojure.test :refer :all]
             [ring.middleware.multipart-params.temp-file :refer :all]
-            [ring.util.io :refer [string-input-stream]]))
+            [ring.util.io :refer [string-input-stream]])
+  (:import [java.io File]))
 
 (deftest test-temp-file-store
   (let [store  (temp-file-store)
@@ -12,11 +13,11 @@
     (is (= (:filename result) "foo.txt"))
     (is (= (:content-type result) "text/plain"))
     (is (= (:size result) 3))
-    (is (instance? java.io.File (:tempfile result)))
-    (is (.exists (:tempfile result)))
+    (is (instance? File (:tempfile result)))
+    (is (.exists ^File (:tempfile result)))
     (is (= (slurp (:tempfile result)) "foo"))))
 
-(defn eventually [check n d]
+(defn eventually [check n ^long d]
   (loop [i n]
     (if (check)
       true
@@ -30,9 +31,9 @@
                 {:filename "foo.txt"
                  :content-type "text/plain"
                  :stream (string-input-stream "foo")})]
-    (is (.exists (:tempfile result)))
+    (is (.exists ^File (:tempfile result)))
     (Thread/sleep 2000)
-    (let [deleted? (eventually #(not (.exists (:tempfile result))) 120 250)]
+    (let [deleted? (eventually #(not (.exists ^File (:tempfile result))) 120 250)]
       (is deleted?))))
 
 (defn all-threads []

ring-core/test/ring/middleware/session/test/cookie.clj

@@ -3,7 +3,9 @@
             [ring.middleware.session.store :refer :all]
             [ring.middleware.session.cookie :as cookie :refer [cookie-store]]
             [ring.util.codec :as codec]
-            [crypto.random :as random]))
+            [crypto.random :as random])
+  (:import [java.io Writer]
+           [java.time Instant]))
 
 (deftest cookie-session-read-not-exist
   (let [store (cookie-store)]
@@ -58,14 +60,14 @@
        (cookie-store {:key (.getBytes "012345678901234567890")}))))
 
 ; setup for serializing/deserializing Instant.
-(defmethod print-method java.time.Instant [dt out]
+(defmethod print-method Instant [^Instant dt ^Writer out]
   (.write out (str "#foo/instant \"" (.toString dt) "\"")))
 
-(defn parse-instant [x] (java.time.Instant/parse x))
+(defn parse-instant [x] (Instant/parse x))
 
 (deftest cookie-session-custom-type
   (let [store    (cookie-store {:readers {'foo/instant #'parse-instant}})
-        now      (java.time.Instant/now)
+        now      (Instant/now)
         sess-key (write-session store nil {:foo now})]
     (is (not (nil? sess-key)))
     (is (= (read-session store sess-key)

ring-core/test/ring/middleware/test/file.clj

@@ -10,9 +10,9 @@
   (is (thrown-with-msg? Exception #".*Directory does not exist.*"
                         (wrap-file (constantly test-response) "not_here"))))
 
-(def public-dir "test/ring/assets")
-(def index-html (File. ^String public-dir "index.html"))
-(def foo-html   (File. ^String public-dir "foo.html"))
+(def ^String public-dir "test/ring/assets")
+(def index-html (File. public-dir "index.html"))
+(def foo-html   (File. public-dir "foo.html"))
 
 (def app (wrap-file (constantly test-response) public-dir))
 

ring-core/test/ring/middleware/test/file_info.clj

@@ -15,10 +15,11 @@
   "Lets us use a known file modification time for tests, without permanently changing
    the file's modification time."
   [[file new-time] form]
-  `(let [old-time# (.lastModified ~file)]
-     (.setLastModified ~file ~(* new-time 1000))
-     (try ~form
-          (finally (.setLastModified ~file old-time#)))))
+  (let [file (vary-meta file assoc :tag `File)]
+    `(let [old-time# (.lastModified ~file)]
+       (.setLastModified ~file ~(* new-time 1000))
+       (try ~form
+         (finally (.setLastModified ~file old-time#))))))
 
 (def custom-type-app
   (wrap-file-info

ring-core/test/ring/middleware/test/multipart_params.clj

@@ -161,7 +161,7 @@
                  :body (string-input-stream form-body)}
         response (handler request)]
     (let [upload (get-in response [:multipart-params "upload"])]
-      (is (java.util.Arrays/equals (:bytes upload) (.getBytes "foo"))))))
+      (is (java.util.Arrays/equals ^bytes (:bytes upload) (.getBytes "foo"))))))
 
 (deftest forced-encoding-option-works
   (let [form-body (str "--XXXX\r\n"

ring-core/test/ring/middleware/test/resource.clj

@@ -24,7 +24,7 @@
 (deftest resource-loader-test
   (let [root-loader (->> (Thread/currentThread)
                          .getContextClassLoader
-                         (iterate (memfn getParent))
+                         (iterate (memfn ^ClassLoader getParent))
                          (take-while identity)
                          last)
         jarfile     (io/file "test/resource.jar")

ring-core/test/ring/middleware/test/session.clj

@@ -24,10 +24,10 @@
 (defn get-cookies [response]
   (get-in response [:headers "Set-Cookie"]))
 
-(defn is-session-cookie? [c]
+(defn is-session-cookie? [^String c]
   (.contains c "ring-session="))
 
-(defn get-session-cookie [response]
+(defn get-session-cookie ^String [response]
   (first (filter is-session-cookie? (get-cookies response))))
 
 (deftest session-is-read

ring-devel/test/ring/middleware/test/stacktrace.clj

@@ -13,18 +13,18 @@
   (binding [*err* (java.io.StringWriter.)]
     (doseq [app [exception-app assert-app]]
       (testing "requests with Accept: text/html"
-        (let [{:keys [status headers body]} (app html-req)]
+        (let [{:keys [status headers ^String body]} (app html-req)]
           (is (= 500 status))
           (is (= {"Content-Type" "text/html"} headers))
           (is (.startsWith body "<!DOCTYPE html>"))))
       (testing "requests with Accept: application/javascript"
-        (let [{:keys [status headers body]} (app js-req)]
+        (let [{:keys [status headers ^String body]} (app js-req)]
           (is (= 500 status))
           (is (= {"Content-Type" "text/plain"} headers))
           (is (or (.startsWith body "java.lang.Exception")
                   (.startsWith body "java.lang.AssertionError")))))
       (testing "requests without Accept header"
-        (let [{:keys [status headers body]} (app plain-req)]
+        (let [{:keys [status headers ^String body]} (app plain-req)]
           (is (= 500 status))
           (is (= {"Content-Type" "text/plain"} headers))
           (is (or (.startsWith body "java.lang.Exception")