Merge pull request #273 from slr71/main

CORE-2006: moved the `render` function to our `clojure-commons` library
cyverse-de · Aug 2, 2024 · 0c73d95 · 0c73d95
2 parents 0d0fa31 + 242971d
commit 0c73d95
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 33 deletions.
diff --git a/project.clj b/project.clj
@@ -23,7 +23,7 @@
                  [metosin/compojure-api "1.1.14"]
                  [org.cyverse/async-tasks-client "0.0.5"]
                  [org.cyverse/authy "3.0.1"]
-                 [org.cyverse/clojure-commons "3.0.8"]
+                 [org.cyverse/clojure-commons "3.0.9"]
                  [org.cyverse/debug-utils "2.9.0"]
                  [org.cyverse/kameleon "3.0.10"]
                  [org.cyverse/mescal "3.1.12"]

diff --git a/src/apps/clients/notifications/common_sharing.clj b/src/apps/clients/notifications/common_sharing.clj
@@ -1,6 +1,6 @@
 (ns apps.clients.notifications.common-sharing
   (:require [apps.clients.iplant-groups :as ipg]
-            [apps.util.string :refer [render]]))
+            [clojure-commons.template :refer [render]]))
 
 (def grouping-threshold 10)
 

diff --git a/src/apps/clients/permissions.clj b/src/apps/clients/permissions.clj
@@ -2,9 +2,9 @@
   (:require [apps.clients.iplant-groups :as ipg]
             [apps.util.config :as config]
             [apps.util.service :as service]
-            [apps.util.string :refer [render]]
             [clojure.tools.logging :as log]
             [clojure-commons.error-codes :refer [clj-http-error?]]
+            [clojure-commons.template :refer [render]]
             [kameleon.uuids :refer [uuidify]]
             [permissions-client.core :as pc]
             [slingshot.slingshot :refer [try+]]))

diff --git a/src/apps/service/apps/de/sharing.clj b/src/apps/service/apps/de/sharing.clj
@@ -6,8 +6,8 @@
             [apps.service.apps.de.permissions :as perms]
             [apps.tools.permissions :as tool-perms]
             [apps.tools.sharing :as tool-sharing]
-            [apps.util.string :refer [render]]
             [clojure.tools.logging :as log]
+            [clojure-commons.template :refer [render]]
             [slingshot.slingshot :refer [try+]]))
 
 (def app-sharing-formats

diff --git a/src/apps/service/apps/jobs/sharing.clj b/src/apps/service/apps/jobs/sharing.clj
@@ -8,11 +8,11 @@
             [apps.service.apps.jobs.permissions :as job-permissions]
             [apps.service.apps-client :refer [get-apps-client-for-username]]
             [apps.util.service :as service]
-            [apps.util.string :refer [render]]
             [clojure.string :as string]
             [clojure.tools.logging :as log]
             [clojure-commons.core :refer [remove-nil-values]]
             [clojure-commons.error-codes :as ce]
+            [clojure-commons.template :refer [render]]
             [kameleon.uuids :refer [uuidify]]
             [slingshot.slingshot :refer [try+ throw+]]))
 

diff --git a/src/apps/tools/sharing.clj b/src/apps/tools/sharing.clj
@@ -3,8 +3,8 @@
             [apps.clients.permissions :as perms-client]
             [apps.persistence.tools :as tools-db]
             [apps.tools.permissions :as perms]
-            [apps.util.string :refer [render]]
             [clojure-commons.error-codes :as error-codes]
+            [clojure-commons.template :refer [render]]
             [slingshot.slingshot :refer [try+]]))
 
 (defn- get-tool-name

diff --git a/src/apps/util/string.clj b/src/apps/util/string.clj
diff --git a/test/apps/string_test.clj b/test/apps/string_test.clj