Merge pull request #35 from circleci/clj-kondo

Fix some minor style issues suggested by clj-kondo

Author: stig

.circleci/config.yml

@@ -6,6 +6,13 @@ defaults: &defaults
 version: 2
 
 jobs:
+  clj-kondo:
+    docker:
+      - image: cljkondo/clj-kondo:2024.03.13
+    steps:
+      - checkout
+      - run: clj-kondo --lint .
+
   build:
     <<: *defaults
     steps:
@@ -60,6 +67,7 @@ workflows:
   version: 2
   build_and_test:
     jobs:
+      - clj-kondo
       - build
       - docs
       - test:

src/circleci/analytics_clj/common.clj

@@ -1,5 +1,5 @@
 (ns circleci.analytics-clj.common
-  (:require [circleci.analytics-clj.external :refer :all]
+  (:require [circleci.analytics-clj.external :as external]
             [circleci.analytics-clj.utils :refer [string-keys]]))
 
 (def ^:private ctx {"library" {"name" "analytics-clj"
@@ -15,17 +15,17 @@
   [message-builder {:keys [anonymous-id context integration-options integrations timestamp message-id user-id]}]
   (letfn [(enable-integrations [message-builder integrations]
             (doseq [[integration enable?] integrations]
-              (enable-integration* message-builder integration enable?)))
+              (external/enable-integration* message-builder integration enable?)))
 
           (enable-integration-options [message-builder integration-options]
             (doseq [[integration options] integration-options]
-              (integration-options* message-builder integration (string-keys options))))]
+              (external/integration-options* message-builder integration (string-keys options))))]
 
     (doto message-builder
-      (context* (merge ctx (string-keys context)))
+      (external/context* (merge ctx (string-keys context)))
 
       (cond-> (not (nil? anonymous-id))
-        (anonymous-id* anonymous-id))
+        (external/anonymous-id* anonymous-id))
 
       (cond-> (not (nil? integration-options))
         (enable-integration-options integration-options))
@@ -34,10 +34,10 @@
         (enable-integrations integrations))
 
       (cond-> (not (nil? timestamp))
-        (timestamp* timestamp))
+        (external/timestamp* timestamp))
 
       (cond-> (not (nil? message-id))
-        (message-id* message-id))
+        (external/message-id* message-id))
 
       (cond-> (not (nil? user-id))
-        (user-id* user-id)))))
+        (external/user-id* user-id)))))

src/circleci/analytics_clj/core.clj

@@ -1,7 +1,7 @@
 (ns circleci.analytics-clj.core
   (:refer-clojure :exclude [alias flush])
   (:require [circleci.analytics-clj.common :as common]
-            [circleci.analytics-clj.external :refer :all]
+            [circleci.analytics-clj.external :as external]
             [circleci.analytics-clj.utils :refer [string-keys]])
   (:import (com.segment.analytics Analytics)
            (com.segment.analytics.messages AliasMessage
@@ -22,22 +22,22 @@
   ([write-key {:keys [client log endpoint user-agent network-executor callback]}]
    (.build (doto (Analytics/builder write-key)
              (cond-> (not (nil? client))
-               (client* client))
+               (external/client* client))
 
              (cond-> (not (nil? log))
-               (log* log))
+               (external/log* log))
 
              (cond-> (not (nil? endpoint))
-               (endpoint* endpoint))
+               (external/endpoint* endpoint))
 
              (cond-> (not (nil? user-agent))
-               (user-agent* user-agent))
+               (external/user-agent* user-agent))
 
              (cond-> (not (nil? network-executor))
-               (network-executor* network-executor))
+               (external/network-executor* network-executor))
 
              (cond-> (not (nil? callback))
-               (callback* callback))))))
+               (external/callback* callback))))))
 
 (defn enqueue
   "Top-level `enqueue` function to allow for extensibility in the future."
@@ -73,7 +73,7 @@
   ([^Analytics analytics user-id traits options]
    (enqueue analytics (doto (IdentifyMessage/builder)
                         (common/common-fields (merge {:user-id user-id} options))
-                        (cond-> (not (nil? traits)) (traits* (string-keys traits)))))))
+                        (cond-> (not (nil? traits)) (external/traits* (string-keys traits)))))))
 
 (defn track
   "`track` lets you record the actions your users perform.
@@ -91,7 +91,7 @@
   ([^Analytics analytics user-id event properties options]
    (enqueue analytics (doto (TrackMessage/builder event)
                         (common/common-fields (merge {:user-id user-id} options))
-                        (cond-> (not (nil? properties)) (properties* (string-keys properties)))))))
+                        (cond-> (not (nil? properties)) (external/properties* (string-keys properties)))))))
 
 (defn screen
   "The `screen` method lets you you record whenever a user
@@ -109,7 +109,7 @@
   ([^Analytics analytics user-id name properties options]
    (enqueue analytics (doto (ScreenMessage/builder name)
                         (common/common-fields (merge {:user-id user-id} options))
-                        (cond-> (not (nil? properties)) (properties* (string-keys properties)))))))
+                        (cond-> (not (nil? properties)) (external/properties* (string-keys properties)))))))
 
 (defn page
   "The `page` method lets you record whenever a user
@@ -127,7 +127,7 @@
   ([^Analytics analytics user-id name properties options]
    (enqueue analytics (doto (PageMessage/builder name)
                         (common/common-fields (merge {:user-id user-id} options))
-                        (cond-> (not (nil? properties)) (properties* (string-keys properties)))))))
+                        (cond-> (not (nil? properties)) (external/properties* (string-keys properties)))))))
 
 (defn group
   "`group` lets you associate an identified user with
@@ -146,7 +146,7 @@
   ([^Analytics analytics user-id group-id traits options]
    (enqueue analytics (doto (GroupMessage/builder group-id)
                         (common/common-fields (merge {:user-id user-id} options))
-                        (cond-> (not (nil? traits)) (traits* (string-keys traits)))))))
+                        (cond-> (not (nil? traits)) (external/traits* (string-keys traits)))))))
 
 (defn alias
   "`alias` is how you associate one identity with another.

test/circleci/analytics_clj/core_test.clj

@@ -2,7 +2,7 @@
   (:require [bond.james :as bond]
             [circleci.analytics-clj.core :as a]
             [circleci.analytics-clj.external :as e]
-            [clojure.test :refer :all])
+            [clojure.test :refer [deftest testing is]])
   (:import (com.segment.analytics Log)
            (java.util UUID)))
 
@@ -15,8 +15,8 @@
   (testing "initialize an analytics client with logging"
     (letfn [(logger []
               (reify Log
-                (print [this level format args])
-                (print [this level error format args])))]
+                (print [_this _level _format _args])
+                (print [_this _level _error _format _args])))]
       (bond/with-spy [e/log*]
         (is (not (nil? (a/initialize "foobarbaz" {:log (logger)}))))
         (is (= 1 (-> e/log* bond/calls count)))