Merge branch 'fix-reflection-warnings'

Author: cichli

src/cider/nrepl/middleware/content_type.clj

@@ -46,6 +46,7 @@
    [cider.nrepl.middleware.slurp :refer [slurp-reply]])
   (:import
    java.awt.Image
+   [java.awt.image RenderedImage]
    [java.io ByteArrayOutputStream File OutputStream]
    [java.net URI URL]
    java.nio.file.Path
@@ -94,7 +95,7 @@
     (assoc response
            :content-type ["message/external-body"
                           {"access-type" "URL"
-                           "URL" (.toString (as-url value))}]
+                           "URL" (.toString ^URL (as-url value))}]
            :body "")
 
     ;; FIXME (arrdem 2018-04-03):
@@ -107,7 +108,7 @@
     (instance? java.awt.Image value)
     (with-open [bos (ByteArrayOutputStream.)]
       (merge response
-             (when (ImageIO/write ^Image value "png" ^OutputStream bos)
+             (when (ImageIO/write ^RenderedImage value "png" ^OutputStream bos)
                (slurp-reply "" ["image/png" {}] (.toByteArray bos)))))
 
     :else response))

src/cider/nrepl/middleware/debug.clj

@@ -67,7 +67,7 @@
   []
   (letfn [(hex [] (format "%x" (rand-int 15)))
           (nhex [n] (apply str (repeatedly n hex)))]
-    (let [rhex (format "%x" (bit-or 0x8 (bit-and 0x3 (rand-int 14))))]
+    (let [rhex (format "%x" (bit-or 0x8 (bit-and 0x3 ^int (rand-int 14))))]
       (str (nhex 8) "-" (nhex 4) "-4" (nhex 3)
            "-" rhex (nhex 3) "-" (nhex 12)))))
 
@@ -140,7 +140,7 @@
   (if (map? *msg*)
     (do
       (transport/send (:transport *msg*) (response-for *msg* :value 'QUIT))
-      (.stop (:thread (meta (:session *msg*)))))
+      (.stop ^Thread (:thread (meta (:session *msg*)))))
     ;; We can't really abort if there's no *msg*, so we do our best
     ;; impression of that. This is only used in some panic situations,
     ;; the user won't be offered the :quit option if there's no *msg*.
@@ -381,7 +381,7 @@ this map (identified by a key), and will `dissoc` it afterwards."}
             (throw (ex-info "Invalid input from `read-debug-input`."
                             {:response-raw response-raw})))))))
 
-(defn print-step-indented [depth form value]
+(defn print-step-indented [^long depth form value]
   (print (apply str (repeat (dec depth) "| ")))
   (binding [*print-length* 4
             *print-level*  2]

src/cider/nrepl/middleware/slurp.clj

@@ -11,8 +11,8 @@
    [nrepl.misc :refer [response-for]]
    [nrepl.transport :as transport])
   (:import
-   (java.io ByteArrayOutputStream)
-   (java.net MalformedURLException URL)
+   (java.io ByteArrayOutputStream InputStream)
+   (java.net MalformedURLException URL URLConnection)
    (java.nio.file Files Path Paths)
    (java.util Base64)))
 
@@ -61,7 +61,7 @@
   [^bytes buff]
   (.encodeToString (Base64/getEncoder) buff))
 
-(defn slurp-reply [location content-type buff]
+(defn slurp-reply [location content-type ^bytes buff]
   (let [^String real-type (first content-type)
         binary? (= "application/octet-stream" real-type)
         text? (.contains real-type "text")]
@@ -82,21 +82,21 @@
 (defn slurp-url-to-content+body
   "Attempts to parse and then to slurp a URL, producing a content-typed response."
   [url-str]
-  (if-let [url (try (URL. url-str)
-                    (catch MalformedURLException e nil))]
+  (if-let [^URL url (try (URL. url-str)
+                         (catch MalformedURLException e nil))]
     (if (= (.getProtocol url) "file") ;; expected common case
       (let [^Path p (Paths/get (.toURI url))
             content-type (normalize-content-type (get-file-content-type p))
             buff (Files/readAllBytes p)]
         (slurp-reply p content-type buff))
 
       ;; It's not a file, so just try to open it on up
-      (let [conn (.openConnection url)
+      (let [^URLConnection conn (.openConnection url)
             content-type (normalize-content-type
                           (.getContentType conn))
             ;; FIXME (arrdem 2018-04-03):
             ;;   There's gotta be a better way here
-            is (.getInputStream conn)
+            ^InputStream is (.getInputStream conn)
             os (ByteArrayOutputStream.)]
         (loop []
           (let [b (.read is)]

src/cider/nrepl/middleware/util/instrument.clj

@@ -252,8 +252,8 @@
   [x y]
   (if (seq x)
     (if (seq y)
-      (let [fa (first x)
-            fb (first y)]
+      (let [^int fa (first x)
+            ^int fb (first y)]
         (if (= fa fb)
           (recur (rest x) (rest y))
           (< fa fb)))

src/cider/nrepl/print_method.clj

@@ -74,7 +74,7 @@
 ;;; Agents, futures, delays, promises, etc
 (defn- deref-name [c]
   (let [class-name (translate-class-name c)]
-    (if-let [[_ short-name] (re-find #"^clojure\.lang\.([^.]+)" class-name)]
+    (if-let [[_ ^String short-name] (re-find #"^clojure\.lang\.([^.]+)" class-name)]
       (.toLowerCase short-name)
       (case (second (re-find #"^clojure\.core/(.+)/reify" class-name))
         "future-call" "future"