Remove JDK7 compatibility code

Author: cichli

project.clj

@@ -127,8 +127,7 @@
                        :cljfmt {:indents {as-> [[:inner 0]]
                                           with-debug-bindings [[:inner 0]]
                                           merge-meta [[:inner 0]]
-                                          try-if-let [[:block 1]]
-                                          if-class [[:block 1]]}}}]
+                                          try-if-let [[:block 1]]}}}]
 
              :eastwood [:test
                         {:plugins [[jonase/eastwood "0.3.4"]]

src/cider/nrepl/middleware/slurp.clj

@@ -11,24 +11,13 @@
    [nrepl.misc :refer [response-for]]
    [nrepl.transport :as transport])
   (:import
-   [java.net MalformedURLException URL]
-   java.io.ByteArrayOutputStream
-   [java.nio.file Files Path Paths]))
+   (java.io ByteArrayOutputStream)
+   (java.net MalformedURLException URL)
+   (java.nio.file Files Path Paths)
+   (java.util Base64)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defmacro if-class
-  "Conditional compilation macro for when a given class is available.
-
-  If the given class can be resolved, expands to `then-expr`,
-  otherwise expands to `else-expr`. `else-expr` defaults to `nil`."
-  ([classname then-expr]
-   `(if-class ~classname ~then-expr nil))
-  ([classname then-expr else-expr]
-   (if (try (eval `(import ~classname)) true
-            (catch ClassNotFoundException e false))
-     then-expr else-expr)))
-
 (def known-content-types
   (->> (io/resource "content-types.edn")
        (io/reader)
@@ -68,12 +57,9 @@
       (Files/probeContentType p)
       "application/octet-stream"))
 
-;; FIXME (arrdem 2018-04-11):
-;;   Remove this if-class when we have jdk1.8 min
 (defn base64-bytes
   [^bytes buff]
-  (if-class java.util.Base64
-    (.encodeToString (Base64/getEncoder) buff)))
+  (.encodeToString (Base64/getEncoder) buff))
 
 (defn slurp-reply [location content-type buff]
   (let [^String real-type (first content-type)
@@ -119,8 +105,6 @@
               (recur))))
         (slurp-reply url content-type (.toByteArray os))))))
 
-;; FIXME (arrdem 2018-04-11):
-;;   Remove this if-class when we have jdk1.8 min
 (defn handle-slurp
   "Message handler which just responds to slurp ops.
 
@@ -129,10 +113,7 @@
   (let [{:keys [op url transport]} msg]
     (if (and (= "slurp" op) url)
       (do (transport/send transport
-                          (response-for msg
-                                        (if-class java.util.Base64
-                                          (slurp-url-to-content+body url)
-                                          {:error "`java.util.Base64` cannot be found, `slurp` op is disabled."})))
+                          (response-for msg (slurp-url-to-content+body url)))
           (transport/send transport
                           (response-for msg {:status ["done"]})))
       (handler msg))))

test/clj/cider/nrepl/middleware/slurp_test.clj

@@ -1,33 +1,28 @@
 (ns cider.nrepl.middleware.slurp-test
   (:require
-   [cider.nrepl.middleware.slurp :refer [if-class slurp-url-to-content+body]]
+   [cider.nrepl.middleware.slurp :refer [slurp-url-to-content+body]]
    [clojure.java.io :as io]
    [clojure.test :as t]
    [clojure.string :as str]))
 
-;; FIXME (arrdem 2018-04-11):
-;;   Remove these if-classes when we have jdk1.8 min
-(if-class java.util.Base64
-  (t/deftest test-project-clj-is-clj
-    (let [resp (slurp-url-to-content+body
-                (.toString
-                 (.toURL
-                  (io/file "project.clj"))))]
-      (t/is (= ["text/clojure" {}] (:content-type resp)))
-      (t/is (not= "base64" (:content-transfer-encoding resp))))))
+(t/deftest test-project-clj-is-clj
+  (let [resp (slurp-url-to-content+body
+              (.toString
+               (.toURL
+                (io/file "project.clj"))))]
+    (t/is (= ["text/clojure" {}] (:content-type resp)))
+    (t/is (not= "base64" (:content-transfer-encoding resp)))))
 
-(if-class java.util.Base64
-  (t/deftest test-sum-types-is-base64
-    (let [resp (slurp-url-to-content+body
-                (.toString
-                 (io/resource "sum-types-are-cool.jpg")))]
-      (t/is (= ["image/jpeg" {}] (:content-type resp)))
-      (t/is (= "base64" (:content-transfer-encoding resp))))))
+(t/deftest test-sum-types-is-base64
+  (let [resp (slurp-url-to-content+body
+              (.toString
+               (io/resource "sum-types-are-cool.jpg")))]
+    (t/is (= ["image/jpeg" {}] (:content-type resp)))
+    (t/is (= "base64" (:content-transfer-encoding resp)))))
 
-(if-class java.util.Base64
-  (t/deftest test-unrecognized-file
-    (let [resp (slurp-url-to-content+body
-                (.toString (io/resource "unknown.bin")))]
-      (t/is (= ["application/octet-stream" {}] (:content-type resp)))
-      (t/is (str/starts-with? (:body resp) "#binary[location="))
-      (t/is (str/ends-with? (:body resp) ",size=3]")))))
+(t/deftest test-unrecognized-file
+  (let [resp (slurp-url-to-content+body
+              (.toString (io/resource "unknown.bin")))]
+    (t/is (= ["application/octet-stream" {}] (:content-type resp)))
+    (t/is (str/starts-with? (:body resp) "#binary[location="))
+    (t/is (str/ends-with? (:body resp) ",size=3]"))))