Skip to content

Commit e511228

Browse files
committed
Drop the dependency on org.clojure/data.codec
as Java 8 already contains Base64, see https://github.com/clojure/data.codec/?tab=readme-ov-file#base64
1 parent 824f507 commit e511228

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

project.clj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
[babashka/fs "0.2.12"]
6060
[pandect "1.0.2"]
6161
[org.clojure/data.zip "1.0.0"]
62-
[org.clojure/data.codec "0.2.1"] ;; for base64 encoding in mdr2.pipeline2.core
6362
[com.novemberain/pantomime "2.11.0" :exclusions [com.google.guava/guava]]
6463
[clj-http "3.12.3"]
6564
[org.clojure/data.csv "1.0.1"]

src/clj/mdr2/pipeline2/core.clj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
API](https://daisy.github.io/pipeline/WebServiceAPI)"
44
(:require [clj-http.client :as client]
55
[clj-http.util :refer [url-encode]]
6-
[clojure.data.codec.base64 :as b64]
76
[clojure.data.xml :as xml]
87
[clojure.data.zip :as zf]
98
[clojure.data.zip.xml :refer [attr xml-> xml1->]]
@@ -14,17 +13,17 @@
1413
[mdr2.config :refer [env]]
1514
[pandect.algo.sha1 :as pandect]
1615
[clojure.tools.logging :as log])
17-
(:import [java.util.zip ZipEntry ZipOutputStream]))
16+
(:import [java.util.zip ZipEntry ZipOutputStream]
17+
[java.util Base64]))
1818

1919
(def ws-url "http://localhost:8181/ws")
2020

2121
(def ^:private timeout 1000)
2222
(def ^:private poll-interval 3000)
2323

2424
(defn- create-hash [message signing-key]
25-
(-> (pandect/sha1-hmac-bytes message signing-key)
26-
b64/encode
27-
String.))
25+
(->> (pandect/sha1-hmac-bytes message signing-key)
26+
(.encodeToString (Base64/getUrlEncoder))))
2827

2928
(defn auth-query-params [uri]
3029
(let [timestamp (time/format :iso-local-date-time (time/local-date-time))

0 commit comments

Comments
 (0)