CLJS-2377: The CLJS compiled uses deprecated modules on Java 9

src/main/clojure/cljs/repl.cljc

@@ -28,7 +28,7 @@
             [cljs.source-map :as sm])
   (:import [java.io File PushbackReader FileWriter PrintWriter]
            [java.net URL]
-           [javax.xml.bind DatatypeConverter]
+           [java.util Base64]
            [clojure.lang IExceptionInfo]
            [java.util.regex Pattern]
            [com.google.common.base Throwables]))
@@ -449,6 +449,11 @@
              (println st)))
          (println st))))))
 
+(defn- bytes-to-base64-str
+  "Convert a byte array into a base-64 encoded string."
+  [^bytes bytes]
+  (.encodeToString (Base64/getEncoder) bytes))
+
 (defn evaluate-form
   "Evaluate a ClojureScript form in the JavaScript environment. Returns a
   string which is the ClojureScript return value. This string may or may
@@ -488,7 +493,7 @@
                  (str js
                    "\n//# sourceURL=repl-" t ".js"
                    "\n//# sourceMappingURL=data:application/json;base64,"
-                   (DatatypeConverter/printBase64Binary
+                   (bytes-to-base64-str
                      (.getBytes
                        (sm/encode
                          {(str "repl-" t ".cljs")

src/main/clojure/cljs/util.cljc

@@ -14,8 +14,7 @@
             [clojure.edn :as edn])
   (:import [java.io File]
            [java.net URL URLDecoder]
-           [java.security MessageDigest]
-           [javax.xml.bind DatatypeConverter]))
+           [java.security MessageDigest]))
 
 ;; next line is auto-generated by the build-script - Do not edit!
 (def ^:dynamic *clojurescript-version*)
@@ -297,14 +296,28 @@
                     xs seen)))]
      (step coll #{}))))
 
+(def ^:private hex-digits (char-array "0123456789ABCDEF"))
+
+(defn- bytes-to-hex-str
+  "Convert an array of bytes into a hex encoded string."
+  [^bytes bytes]
+  (loop [index (int 0)
+         buffer (StringBuilder. (int (* 2 (alength bytes))))]
+    (if (== (alength bytes) index)
+      (.toString buffer)
+      (let [byte (aget bytes index)]
+        (.append buffer (aget ^chars hex-digits (bit-and (bit-shift-right byte 4) 0xF)))
+        (.append buffer (aget ^chars hex-digits (bit-and byte 0xF)))
+        (recur (inc index) buffer)))))
+
 (defn content-sha
   ([^String s]
    (content-sha s nil))
   ([^String s ^Long n]
    (let [digest (MessageDigest/getInstance "SHA-1")
          _ (.reset digest)
          _ (.update digest (.getBytes s "utf8"))
-         sha (DatatypeConverter/printHexBinary (.digest digest))]
+         sha (bytes-to-hex-str (.digest digest))]
      (if-not (nil? n)
        (apply str (take n sha))
        sha))))

src/test/clojure/cljs/repl_tests.clj

@@ -41,3 +41,6 @@
       (is file)
       (and file
            (is (io/resource file))))))
+
+(deftest test-bytes-to-base64-str
+  (is (= "YWJj" (#'repl/bytes-to-base64-str (.getBytes "abc")))))

src/test/clojure/cljs/util_tests.clj

@@ -45,3 +45,10 @@
 (deftest test-path
   (is (= (.getAbsolutePath (io/file "src/main/clojure/cljs/closure.clj"))
          (util/path (io/as-url (io/file "src/main/clojure/cljs/closure.clj"))))))
+
+(deftest test-bytes-to-hex-str
+  (is (= "09616263" (#'util/bytes-to-hex-str (.getBytes "\u0009abc")))))
+
+(deftest test-content-sha
+  (is (= "40BD001563085FC35165329EA1FF5C5ECBDBBEEF" (util/content-sha "123")))
+  (is (= "40BD0" (util/content-sha "123" 5))))