fix kibit/eastwood warnings

Author: winks

env/dev/clj/user.clj

@@ -4,6 +4,7 @@
     [buddy.hashers :as hashers]
     [clojure.pprint]
     [clojure.spec.alpha :as s]
+    [clojure.string]
     [conman.core :as conman]
     [expound.alpha :as expound]
     [mount.core :as mount]
@@ -115,7 +116,7 @@
                 (format "%10s" "theme")    " | "
                 (format "%10s" "active?")  " | "
                 (format "%10s" "private?")))
-  (println (apply str (repeat 80 "-")))
+  (println (clojure.string/join (repeat 80 "-")))
   (let [users (multiplex.db.core/get-all-users-internal)]
     (for [usr users]
       (println (str (format "%3d"  (:uid usr))       " | "

src/clj/multiplex/layout.clj

@@ -13,7 +13,7 @@
     [selmer.parser :as parser]
     [selmer.filters :as filters]))
 
-(def ^:dynamic pom-config
+(def ^:dynamic *pom-config*
   (with-open [pom-properties-reader (io/reader (io/resource "META-INF/maven/multiplex/multiplex/pom.properties"))]
     (doto (java.util.Properties.)
       (.load pom-properties-reader))))
@@ -65,7 +65,7 @@
      :modus (name (or (:modus params) ""))
      :assets-prefix assets-prefix
      :base-url (util/make-url (:site-url cfg) cfg)
-     :version-string (get-version pom-config)
+     :version-string (get-version *pom-config*)
      :flash (:flash request)}))
 
 (defn prepare-params [request & [params]]

src/clj/multiplex/util.clj

@@ -127,7 +127,7 @@
                 :site (:site meta)
                 :thumb-path (str prefix (:content-rel-path config))
                 :thumbnail (:thumbnail meta)
-                :tags (if (empty? (:tags coll)) nil (:tags coll))
+                :tags (when-not (empty? (:tags coll)) (:tags coll))
                 :meta meta)))
 
 (defn convert-time [d]

test/clj/multiplex/layout_test.clj

@@ -79,8 +79,8 @@
     (is (= "MyTitle" (:page-header (:glob p2))))))
 
 (deftest test-prepare-glob-0-1 ; empty title | username |theme | uid | modus | flash
-  (binding [layout/pom-config (doto (java.util.Properties.)
-                                    (.setProperty "version" "foo"))]
+  (binding [layout/*pom-config* (doto (java.util.Properties.)
+                                      (.setProperty "version" "foo"))]
     (let [session {}
           request {:scheme :https
                    :server-name "sub.example.org"
@@ -100,8 +100,8 @@
       (is (= "foo" (:version-string glob))))))
 
 (deftest test-prepare-glob-0-2 ; empty title
-  (binding [layout/pom-config (doto (java.util.Properties.)
-                                    (.setProperty "version" "foo"))]
+  (binding [layout/*pom-config* (doto (java.util.Properties.)
+                                      (.setProperty "version" "foo"))]
     (let [session {}
           request {:scheme :https
                    :server-name "sub.example.org"
@@ -118,8 +118,8 @@
 (comment
 
 (deftest test-prepare-glob-author-1
-  (binding [layout/pom-config (doto (java.util.Properties.)
-                                    (.setProperty "version" "foo"))]
+  (binding [layout/*pom-config* (doto (java.util.Properties.)
+                                      (.setProperty "version" "foo"))]
 ;            db/get-user-by-hostname2
 ;      (fn [crit] {:uid 123 :username "u123" :hostname "u123.example.org"
 ;                  :title "u123_title" :avatar "u123.png"