Skip to content

Commit e4a50a6

Browse files
committed
Replace data-codec use for base64 encoding with Base64 support built into the JDK as of Java 8
1 parent 63386cf commit e4a50a6

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
</parent>
3737

3838
<dependencies>
39-
<dependency>
40-
<groupId>org.clojure</groupId>
41-
<artifactId>data.codec</artifactId>
42-
<version>0.1.1</version>
43-
<scope>compile</scope>
44-
</dependency>
4539
<dependency>
4640
<groupId>org.clojure</groupId>
4741
<artifactId>test.check</artifactId>

project.clj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
:test-paths ["src/test/clojure" "src/test/clojurescript"]
44
:resource-paths ["src/main/resources" "src/test/resources" "target/gen-resources"]
55
:dependencies [[org.clojure/clojure "1.10.0-beta8"]
6-
[org.clojure/data.codec "0.1.1"]
76
[org.clojure/clojurescript "1.10.439"]
87
[com.cemerick/piggieback "0.2.2"]
98
[org.clojure/tools.nrepl "0.2.13"]

src/main/clojure/clojure/data/xml/impl.clj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
(ns clojure.data.xml.impl
1010
"Shared private code for data.xml namespaces"
1111
{:author "Herwig Hochleitner"}
12-
(:require [clojure.data.codec.base64 :as b64]))
12+
(:import
13+
[java.util Base64]
14+
[java.nio.charset StandardCharsets]))
1315

1416
(defn- var-form? [form]
1517
(and (seq? form) (= 'var (first form))))
@@ -62,5 +64,6 @@
6264
`(do ~then)
6365
`(do ~else)))
6466

65-
(defn b64-encode [ba]
66-
(String. ^bytes (b64/encode ba)))
67+
(defn b64-encode [^bytes ba]
68+
(let [encoder (Base64/getEncoder)]
69+
(String. (.encode encoder ba) StandardCharsets/ISO_8859_1)))

0 commit comments

Comments
 (0)