From ee1738c9d4643ef6320decbe64efee621c93f5cb Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 31 May 2021 09:28:20 +0200 Subject: [PATCH] :recycle: Replace backend transit ns with common transit. --- backend/src/app/db.clj | 4 ++-- backend/src/app/http/middleware.clj | 2 +- backend/src/app/loggers/audit.clj | 2 +- backend/src/app/notifications.clj | 2 +- backend/src/app/tokens.clj | 2 +- backend/src/app/util/blob.clj | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/app/db.clj b/backend/src/app/db.clj index b9886ec7e..6527fa2a8 100644 --- a/backend/src/app/db.clj +++ b/backend/src/app/db.clj @@ -10,13 +10,13 @@ [app.common.exceptions :as ex] [app.common.geom.point :as gpt] [app.common.spec :as us] + [app.common.transit :as t] [app.db.sql :as sql] [app.metrics :as mtx] [app.util.json :as json] [app.util.logging :as l] [app.util.migrations :as mg] [app.util.time :as dt] - [app.util.transit :as t] [clojure.java.io :as io] [clojure.spec.alpha :as s] [integrant.core :as ig] @@ -344,7 +344,7 @@ [data] (doto (org.postgresql.util.PGobject.) (.setType "jsonb") - (.setValue (t/encode-verbose-str data)))) + (.setValue (t/encode-str data {:type :json-verbose})))) (defn json "Encode as plain json." diff --git a/backend/src/app/http/middleware.clj b/backend/src/app/http/middleware.clj index 16d7429ed..91c275cf0 100644 --- a/backend/src/app/http/middleware.clj +++ b/backend/src/app/http/middleware.clj @@ -6,10 +6,10 @@ (ns app.http.middleware (:require + [app.common.transit :as t] [app.metrics :as mtx] [app.util.json :as json] [app.util.logging :as l] - [app.util.transit :as t] [buddy.core.codecs :as bc] [buddy.core.hash :as bh] [clojure.java.io :as io] diff --git a/backend/src/app/loggers/audit.clj b/backend/src/app/loggers/audit.clj index bbffcf781..31e920b1b 100644 --- a/backend/src/app/loggers/audit.clj +++ b/backend/src/app/loggers/audit.clj @@ -9,6 +9,7 @@ (:require [app.common.exceptions :as ex] [app.common.spec :as us] + [app.common.transit :as t] [app.common.uuid :as uuid] [app.config :as cf] [app.db :as db] @@ -16,7 +17,6 @@ [app.util.http :as http] [app.util.logging :as l] [app.util.time :as dt] - [app.util.transit :as t] [app.worker :as wrk] [clojure.core.async :as a] [clojure.spec.alpha :as s] diff --git a/backend/src/app/notifications.clj b/backend/src/app/notifications.clj index f938352e9..80afa560f 100644 --- a/backend/src/app/notifications.clj +++ b/backend/src/app/notifications.clj @@ -8,12 +8,12 @@ "A websocket based notifications mechanism." (:require [app.common.spec :as us] + [app.common.transit :as t] [app.db :as db] [app.metrics :as mtx] [app.util.async :as aa] [app.util.logging :as l] [app.util.time :as dt] - [app.util.transit :as t] [app.worker :as wrk] [clojure.core.async :as a] [clojure.spec.alpha :as s] diff --git a/backend/src/app/tokens.clj b/backend/src/app/tokens.clj index bfa682ea6..5c96c1980 100644 --- a/backend/src/app/tokens.clj +++ b/backend/src/app/tokens.clj @@ -9,8 +9,8 @@ (:require [app.common.exceptions :as ex] [app.common.spec :as us] + [app.common.transit :as t] [app.util.time :as dt] - [app.util.transit :as t] [buddy.core.kdf :as bk] [buddy.sign.jwe :as jwe] [clojure.spec.alpha :as s] diff --git a/backend/src/app/util/blob.clj b/backend/src/app/util/blob.clj index d70d12ab0..3c740516b 100644 --- a/backend/src/app/util/blob.clj +++ b/backend/src/app/util/blob.clj @@ -8,8 +8,8 @@ "A generic blob storage encoding. Mainly used for page data, page options and txlog payload storage." (:require + [app.common.transit :as t] [app.config :as cf] - [app.util.transit :as t] [taoensso.nippy :as n]) (:import java.io.ByteArrayInputStream