From d270dfcbd016978ca0c338a9dde725b01e8d4a9c Mon Sep 17 00:00:00 2001 From: az Date: Fri, 5 Nov 2021 13:51:22 +0100 Subject: [PATCH] mob1 --- src/main/clj/dda/c4k_common/base64.clj | 14 +++++--------- src/main/clj/dda/c4k_common/yaml.clj | 6 +++--- src/main/cljs/dda/c4k_common/base64.cljs | 16 +++++++++------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/main/clj/dda/c4k_common/base64.clj b/src/main/clj/dda/c4k_common/base64.clj index 47edf6d..1e5acb2 100644 --- a/src/main/clj/dda/c4k_common/base64.clj +++ b/src/main/clj/dda/c4k_common/base64.clj @@ -1,21 +1,17 @@ (ns dda.c4k-common.base64 (:import (java.util Base64)) (:require - [orchestra.core :refer [defn-spec]] - [orchestra.spec.test :as st] - [clojure.spec.alpha :as s])) + [orchestra.core :refer [defn-spec]])) (defn-spec encode string? - [string string?] + [input string?] (.encodeToString (Base64/getEncoder) - (.getBytes string "UTF-8"))) + (.getBytes input "UTF-8"))) (defn-spec decode string? - [string string?] + [input string?] (String. - (.decode (Base64/getDecoder) string) + (.decode (Base64/getDecoder) input) "UTF-8")) - -(st/instrument) \ No newline at end of file diff --git a/src/main/clj/dda/c4k_common/yaml.clj b/src/main/clj/dda/c4k_common/yaml.clj index 7c00bd3..d47d631 100644 --- a/src/main/clj/dda/c4k_common/yaml.clj +++ b/src/main/clj/dda/c4k_common/yaml.clj @@ -4,11 +4,11 @@ [clj-yaml.core :as yaml] [clojure.walk] [orchestra.core :refer [defn-spec]] - [orchestra.spec.test :as st] - [clojure.spec.alpha :as s])) + [orchestra.spec.test :as st])) -(defn-spec cast-lazy-seq-to-vec map? + +(defn-spec cast-lazy-seq-to-vec vector? [lazy-seq map?] (clojure.walk/postwalk #(if (instance? clojure.lang.LazySeq %) (into [] %) diff --git a/src/main/cljs/dda/c4k_common/base64.cljs b/src/main/cljs/dda/c4k_common/base64.cljs index 90bd2a7..85558d5 100644 --- a/src/main/cljs/dda/c4k_common/base64.cljs +++ b/src/main/cljs/dda/c4k_common/base64.cljs @@ -1,11 +1,13 @@ (ns dda.c4k-common.base64 (:require - ["js-base64" :as b64])) + ["js-base64" :as b64] + [orchestra.core :refer-macros [defn-spec]])) -(defn encode - [string] - (.encode b64/Base64 string)) -(defn decode - [string] - (.decode b64/Base64 string)) +(defn-spec encode string? + [input string?] + (.encode b64/Base64 input)) + +(defn-spec decode string? + [input string?] + (.decode b64/Base64 input))