Skip to content

Commit 3f5addf

Browse files
authored
dev cleanup: turf old remnant needed for JDK7 (#42)
Our min is JDK8. Simplify code. Closes #40
1 parent 9d73e5d commit 3f5addf

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

src/clj_http/lite/util.clj

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
(:require [clojure.java.io :as io])
44
(:import (java.io ByteArrayInputStream ByteArrayOutputStream InputStream)
55
(java.net URLEncoder URLDecoder)
6+
(java.util Base64)
67
(java.util.zip InflaterInputStream DeflaterInputStream
78
GZIPInputStream GZIPOutputStream)))
89

@@ -30,15 +31,10 @@
3031
[^String unencoded]
3132
(URLEncoder/encode unencoded "UTF-8"))
3233

33-
(defmacro base64-encode
34+
(defn base64-encode
3435
"Encode an array of `unencoded` bytes into a base64 encoded string."
3536
[unencoded]
36-
(if (try (import 'javax.xml.bind.DatatypeConverter)
37-
(catch Exception _))
38-
`(javax.xml.bind.DatatypeConverter/printBase64Binary ~unencoded)
39-
(do
40-
(import 'java.util.Base64)
41-
`(.encodeToString (java.util.Base64/getEncoder) ~unencoded))))
37+
(.encodeToString (Base64/getEncoder) unencoded))
4238

4339
(defn to-byte-array
4440
"Returns a byte array for InputStream `is`."
@@ -52,7 +48,6 @@
5248
(recur (.read ^InputStream is buffer 0 chunk-size))))
5349
(.toByteArray baos)))
5450

55-
5651
(defn gunzip
5752
"Returns a gunzip'd version of byte array `b`."
5853
[b]

0 commit comments

Comments
 (0)