Switch to flat namespace declarations (metabase#14281)

* Proposal: no more prefix namespaces * Fix a few missing files
ncolyer · Jan 7, 2021 · 1f6d5fa · 1f6d5fa
1 parent 4d0c282
commit 1f6d5fa
Show file tree

Hide file tree

Showing 571 changed files with 3,615 additions and 4,885 deletions.
diff --git a/.dir-locals.el b/.dir-locals.el
@@ -29,7 +29,7 @@
                               (p.types/defrecord+ '(2 nil nil (:defn)))
                               (tools.macro/macrolet '(1 (:defn))))))
                   ;; if you're using clj-refactor (highly recommended!), prefer prefix notation when cleaning the ns form
-                  (cljr-favor-prefix-notation . t)
+                  (cljr-favor-prefix-notation . nil)
                   ;; prefer keeping source width about ~118, GitHub seems to cut off stuff at either 119 or 120 and
                   ;; it's nicer to look at code in GH when you don't have to scroll back and forth
                   (fill-column . 118)

diff --git a/backend/junit/test/metabase/junit.clj b/backend/junit/test/metabase/junit.clj
@@ -1,8 +1,7 @@
 (ns metabase.junit
   "Formatter for JUnit test output for CI."
-  (:require [clojure
-             [pprint :as pp]
-             [string :as str]]
+  (:require [clojure.pprint :as pp]
+            [clojure.string :as str]
             [medley.core :as m]
             [metabase.util :as u]
             [pjstadig.print :as p]

diff --git a/backend/mbql/src/metabase/mbql/normalize.clj b/backend/mbql/src/metabase/mbql/normalize.clj
@@ -28,14 +28,12 @@
   Removing empty clauses like `{:aggregation nil}` or `{:breakout []}`.
 
   Token normalization occurs first, followed by canonicalization, followed by removing empty clauses."
-  (:require [clojure
-             [set :as set]
-             [walk :as walk]]
+  (:require [clojure.set :as set]
             [clojure.tools.logging :as log]
+            [clojure.walk :as walk]
             [medley.core :as m]
-            [metabase.mbql
-             [predicates :as mbql.pred]
-             [util :as mbql.u]]
+            [metabase.mbql.predicates :as mbql.pred]
+            [metabase.mbql.util :as mbql.u]
             [metabase.util.i18n :refer [tru]]))
 
 (defn- mbql-clause?

diff --git a/backend/mbql/src/metabase/mbql/schema.clj b/backend/mbql/src/metabase/mbql/schema.clj
@@ -1,11 +1,8 @@
 (ns metabase.mbql.schema
   "Schema for validating a *normalized* MBQL query. This is also the definitive grammar for MBQL, wow!"
-  (:refer-clojure
-   :exclude
-   [count distinct min max + - / * and or not not-empty = < > <= >= time case concat replace])
-  (:require [clojure
-             [core :as core]
-             [set :as set]]
+  (:refer-clojure :exclude [count distinct min max + - / * and or not not-empty = < > <= >= time case concat replace])
+  (:require [clojure.core :as core]
+            [clojure.set :as set]
             [metabase.mbql.schema.helpers :refer [defclause is-clause? one-of]]
             [metabase.mbql.util.match :as match]
             [metabase.util.schema :as su]

diff --git a/backend/mbql/src/metabase/mbql/util.clj b/backend/mbql/src/metabase/mbql/util.clj
@@ -2,15 +2,13 @@
   "Utilitiy functions for working with MBQL queries."
   (:refer-clojure :exclude [replace])
   (:require [clojure.string :as str]
-            [java-time
-             [amount :as t.amount]
-             [core :as t.core]]
+            [java-time.amount :as t.amount]
+            [java-time.core :as t.core]
             [metabase.mbql.schema :as mbql.s]
             [metabase.mbql.schema.helpers :as mbql.s.helpers]
             [metabase.mbql.util.match :as mbql.match]
-            [metabase.util
-             [i18n :refer [tru]]
-             [schema :as su]]
+            [metabase.util.i18n :refer [tru]]
+            [metabase.util.schema :as su]
             [schema.core :as s]))
 
 (defn qualified-name

diff --git a/backend/mbql/test/metabase/mbql/normalize_test.clj b/backend/mbql/test/metabase/mbql/normalize_test.clj
@@ -1,7 +1,6 @@
 (ns metabase.mbql.normalize-test
-  (:require [clojure
-             [set :as set]
-             [test :refer :all]]
+  (:require [clojure.set :as set]
+            [clojure.test :refer :all]
             [metabase.mbql.normalize :as normalize]))
 
 (defn- tests {:style/indent 2} [f-symb f group->input->expected]
@@ -1030,4 +1029,3 @@
                                                        [:and
                                                         [:= [:field-id 5] "abc"]
                                                         [:between [:field-id 9] 0 25]]]}})))))
-
diff --git a/dev/src/dev.clj b/dev/src/dev.clj
@@ -2,19 +2,18 @@
   "Put everything needed for REPL development within easy reach"
   (:require [clojure.core.async :as a]
             [honeysql.core :as hsql]
-            [metabase
-             [core :as mbc]
-             [db :as mdb]
-             [driver :as driver]
-             [handler :as handler]
-             [plugins :as pluguns]
-             [server :as server]
-             [test :as mt]
-             [util :as u]]
             [metabase.api.common :as api-common]
+            [metabase.core :as mbc]
+            [metabase.db :as mdb]
+            [metabase.driver :as driver]
             [metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
+            [metabase.handler :as handler]
+            [metabase.plugins :as pluguns]
             [metabase.query-processor.timezone :as qp.timezone]
-            [metabase.test.data.impl :as data.impl]))
+            [metabase.server :as server]
+            [metabase.test :as mt]
+            [metabase.test.data.impl :as data.impl]
+            [metabase.util :as u]))
 
 (def initialized?
   (atom nil))

diff --git a/dev/src/dev/render_png.clj b/dev/src/dev/render_png.clj
@@ -1,12 +1,10 @@
 (ns dev.render-png
   "Improve feedback loop for dealing with png rendering code"
-  (:require [metabase
-             [pulse :as pulse]
-             [query-processor :as qp]]
-            [metabase.models
-             [card :as card]
-             [user :as user]]
+  (:require [metabase.models.card :as card]
+            [metabase.models.user :as user]
+            [metabase.pulse :as pulse]
             [metabase.pulse.render :as pulse-render]
+            [metabase.query-processor :as qp]
             [toucan.db :as tdb]))
 
 ;; taken from https://github.com/aysylu/loom/blob/master/src/loom/io.clj

diff --git a/enterprise/backend/src/metabase_enterprise/audit/pages/common.clj b/enterprise/backend/src/metabase_enterprise/audit/pages/common.clj
@@ -1,32 +1,25 @@
 (ns metabase-enterprise.audit.pages.common
   "Shared functions used by audit internal queries across different namespaces."
-  (:require [clojure
-             [string :as str]
-             [walk :as walk]]
-            [clojure.core
-             [async :as a]
-             [memoize :as memoize]]
+  (:require [clojure.core.async :as a]
+            [clojure.core.memoize :as memoize]
             [clojure.java.jdbc :as jdbc]
-            [honeysql
-             [core :as hsql]
-             [format :as hformat]
-             [helpers :as h]]
+            [clojure.string :as str]
+            [clojure.walk :as walk]
+            [honeysql.core :as hsql]
+            [honeysql.format :as hformat]
+            [honeysql.helpers :as h]
             [medley.core :as m]
-            [metabase
-             [db :as mdb]
-             [driver :as driver]
-             [util :as u]]
             [metabase-enterprise.audit.query-processor.middleware.handle-audit-queries :as qp.middleware.audit]
-            [metabase.driver.sql-jdbc
-             [connection :as sql-jdbc.conn]
-             [execute :as sql-jdbc.execute]]
+            [metabase.db :as mdb]
+            [metabase.driver :as driver]
+            [metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
+            [metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
             [metabase.driver.sql.query-processor :as sql.qp]
-            [metabase.query-processor
-             [context :as context]
-             [timezone :as qp.tz]]
-            [metabase.util
-             [honeysql-extensions :as hx]
-             [urls :as urls]]
+            [metabase.query-processor.context :as context]
+            [metabase.query-processor.timezone :as qp.tz]
+            [metabase.util :as u]
+            [metabase.util.honeysql-extensions :as hx]
+            [metabase.util.urls :as urls]
             [schema.core :as s]
             [toucan.db :as db]))
 

diff --git a/enterprise/backend/src/metabase_enterprise/audit/pages/common/card_and_dashboard_detail.clj b/enterprise/backend/src/metabase_enterprise/audit/pages/common/card_and_dashboard_detail.clj
@@ -1,13 +1,11 @@
 (ns metabase-enterprise.audit.pages.common.card-and-dashboard-detail
   "Common queries used by both Card (Question) and Dashboard detail pages."
   (:require [metabase-enterprise.audit.pages.common :as common]
-            [metabase.models
-             [card :refer [Card]]
-             [dashboard :refer [Dashboard]]
-             [revision :as revision]]
-            [metabase.util
-             [honeysql-extensions :as hx]
-             [schema :as su]]
+            [metabase.models.card :refer [Card]]
+            [metabase.models.dashboard :refer [Dashboard]]
+            [metabase.models.revision :as revision]
+            [metabase.util.honeysql-extensions :as hx]
+            [metabase.util.schema :as su]
             [schema.core :as s]))
 
 (def ^:private ModelName

diff --git a/enterprise/backend/src/metabase_enterprise/audit/pages/common/dashboards.clj b/enterprise/backend/src/metabase_enterprise/audit/pages/common/dashboards.clj
@@ -1,11 +1,9 @@
 (ns metabase-enterprise.audit.pages.common.dashboards
-  (:require [honeysql
-             [core :as hsql]
-             [helpers :as h]]
+  (:require [honeysql.core :as hsql]
+            [honeysql.helpers :as h]
             [metabase-enterprise.audit.pages.common :as common]
-            [metabase.util
-             [honeysql-extensions :as hx]
-             [urls :as urls]]))
+            [metabase.util.honeysql-extensions :as hx]
+            [metabase.util.urls :as urls]))
 
 (defn table
   "Dashboard table!"

diff --git a/enterprise/backend/src/metabase_enterprise/audit/pages/dashboard_detail.clj b/enterprise/backend/src/metabase_enterprise/audit/pages/dashboard_detail.clj
@@ -1,9 +1,8 @@
 (ns metabase-enterprise.audit.pages.dashboard-detail
   "Detail page for a single dashboard."
   (:require [metabase-enterprise.audit.pages.common :as common]
-            [metabase-enterprise.audit.pages.common
-             [card-and-dashboard-detail :as card-and-dash-detail]
-             [cards :as cards]]
+            [metabase-enterprise.audit.pages.common.card-and-dashboard-detail :as card-and-dash-detail]
+            [metabase-enterprise.audit.pages.common.cards :as cards]
             [metabase.models.dashboard :refer [Dashboard]]
             [metabase.util.schema :as su]
             [schema.core :as s]))

diff --git a/enterprise/backend/src/metabase_enterprise/audit/pages/user_detail.clj b/enterprise/backend/src/metabase_enterprise/audit/pages/user_detail.clj
@@ -1,13 +1,11 @@
 (ns metabase-enterprise.audit.pages.user-detail
   (:require [honeysql.core :as hsql]
             [metabase-enterprise.audit.pages.common :as common]
-            [metabase-enterprise.audit.pages.common
-             [cards :as cards]
-             [dashboards :as dashboards]]
-            [metabase.util
-             [honeysql-extensions :as hx]
-             [schema :as su]
-             [urls :as urls]]
+            [metabase-enterprise.audit.pages.common.cards :as cards]
+            [metabase-enterprise.audit.pages.common.dashboards :as dashboards]
+            [metabase.util.honeysql-extensions :as hx]
+            [metabase.util.schema :as su]
+            [metabase.util.urls :as urls]
             [ring.util.codec :as codec]
             [schema.core :as s]))
 

diff --git a/...backend/src/metabase_enterprise/audit/query_processor/middleware/handle_audit_queries.clj b/...backend/src/metabase_enterprise/audit/query_processor/middleware/handle_audit_queries.clj
@@ -36,17 +36,14 @@
     {:metadata ...
      :results  (fn [context] ...)
      :xform    ...}"
-  (:require [clojure
-             [data :as data]
-             [string :as str]]
+  (:require [clojure.data :as data]
+            [clojure.string :as str]
             [metabase.api.common :as api]
             [metabase.public-settings.metastore :as metastore]
-            [metabase.query-processor
-             [context :as context]
-             [error-type :as error-type]]
-            [metabase.util
-             [i18n :refer [tru]]
-             [schema :as su]]
+            [metabase.query-processor.context :as context]
+            [metabase.query-processor.error-type :as error-type]
+            [metabase.util.i18n :refer [tru]]
+            [metabase.util.schema :as su]
             [schema.core :as s]))
 
 (def ^:private ResultsMetadata

diff --git a/enterprise/backend/src/metabase_enterprise/enhancements/integrations/ldap.clj b/enterprise/backend/src/metabase_enterprise/enhancements/integrations/ldap.clj
@@ -2,16 +2,13 @@
   "The Enterprise version of the LDAP integration is basically the same but also supports syncing user attributes."
   (:require [metabase-enterprise.enhancements.ee-strategy-impl :as ee-strategy-impl]
             [metabase.integrations.common :as integrations.common]
-            [metabase.integrations.ldap
-             [default-implementation :as default-impl]
-             [interface :as i]]
-            [metabase.models
-             [setting :as setting :refer [defsetting]]
-             [user :as user :refer [User]]]
+            [metabase.integrations.ldap.default-implementation :as default-impl]
+            [metabase.integrations.ldap.interface :as i]
+            [metabase.models.setting :as setting :refer [defsetting]]
+            [metabase.models.user :as user :refer [User]]
             [metabase.util :as u]
-            [metabase.util
-             [i18n :refer [deferred-tru]]
-             [schema :as su]]
+            [metabase.util.i18n :refer [deferred-tru]]
+            [metabase.util.schema :as su]
             [pretty.core :refer [PrettyPrintable]]
             [schema.core :as s]
             [toucan.db :as db])

diff --git a/.../backend/src/metabase_enterprise/enhancements/models/native_query_snippet/permissions.clj b/.../backend/src/metabase_enterprise/enhancements/models/native_query_snippet/permissions.clj
@@ -1,10 +1,9 @@
 (ns metabase-enterprise.enhancements.models.native-query-snippet.permissions
   "EE implementation of NativeQuerySnippet permissions."
   (:require [metabase-enterprise.enhancements.ee-strategy-impl :as ee-strategy-impl]
-            [metabase.models
-             [interface :as i]
-             [permissions :as perms]]
+            [metabase.models.interface :as i]
             [metabase.models.native-query-snippet.permissions :as snippet.perms]
+            [metabase.models.permissions :as perms]
             [metabase.util.schema :as su]
             [pretty.core :refer [PrettyPrintable]]
             [schema.core :as s]

diff --git a/enterprise/backend/src/metabase_enterprise/sandbox/api/gtap.clj b/enterprise/backend/src/metabase_enterprise/sandbox/api/gtap.clj
@@ -5,9 +5,8 @@
             [metabase.api.common :as api]
             [metabase.public-settings.metastore :as metastore]
             [metabase.util :as u]
-            [metabase.util
-             [i18n :refer [tru]]
-             [schema :as su]]
+            [metabase.util.i18n :refer [tru]]
+            [metabase.util.schema :as su]
             [schema.core :as s]
             [toucan.db :as db]))
 

diff --git a/enterprise/backend/src/metabase_enterprise/sandbox/api/routes.clj b/enterprise/backend/src/metabase_enterprise/sandbox/api/routes.clj
@@ -1,10 +1,9 @@
 (ns metabase-enterprise.sandbox.api.routes
   "Multi-tenant API routes."
   (:require [compojure.core :as compojure]
-            [metabase-enterprise.sandbox.api
-             [gtap :as gtap]
-             [table :as table]
-             [user :as user]]
+            [metabase-enterprise.sandbox.api.gtap :as gtap]
+            [metabase-enterprise.sandbox.api.table :as table]
+            [metabase-enterprise.sandbox.api.user :as user]
             [metabase.middleware.auth :as middleware.auth]))
 
 ;; this is copied from `metabase.api.routes` because if we require that above we will destroy startup times for `lein

diff --git a/enterprise/backend/src/metabase_enterprise/sandbox/api/table.clj b/enterprise/backend/src/metabase_enterprise/sandbox/api/table.clj
@@ -1,21 +1,18 @@
 (ns metabase-enterprise.sandbox.api.table
   (:require [compojure.core :refer [GET]]
             [metabase-enterprise.sandbox.models.group-table-access-policy :refer [GroupTableAccessPolicy]]
-            [metabase.api
-             [common :as api]
-             [table :as table-api]]
+            [metabase.api.common :as api]
+            [metabase.api.table :as table-api]
             [metabase.mbql.util :as mbql.u]
-            [metabase.models
-             [card :refer [Card]]
-             [permissions :as perms]
-             [permissions-group-membership :refer [PermissionsGroupMembership]]
-             [table :as table :refer [Table]]]
+            [metabase.models.card :refer [Card]]
+            [metabase.models.permissions :as perms]
+            [metabase.models.permissions-group-membership :refer [PermissionsGroupMembership]]
+            [metabase.models.table :as table :refer [Table]]
             [metabase.util :as u]
             [metabase.util.schema :as su]
             [schema.core :as s]
-            [toucan
-             [db :as db]
-             [models :as models]]))
+            [toucan.db :as db]
+            [toucan.models :as models]))
 
 (s/defn ^:private find-gtap-question :- (s/maybe (type Card))
   "Find the associated GTAP question (if there is one) for the given `table-or-table-id` and

diff --git a/enterprise/backend/src/metabase_enterprise/sandbox/models/group_table_access_policy.clj b/enterprise/backend/src/metabase_enterprise/sandbox/models/group_table_access_policy.clj
@@ -7,20 +7,17 @@
             [medley.core :as m]
             [metabase.mbql.normalize :as normalize]
             [metabase.middleware.session :as session]
-            [metabase.models
-             [card :as card :refer [Card]]
-             [interface :as i]
-             [table :as table]]
+            [metabase.models.card :as card :refer [Card]]
+            [metabase.models.interface :as i]
+            [metabase.models.table :as table]
             [metabase.plugins.classloader :as classloader]
             [metabase.query-processor.error-type :as qp.error-type]
             [metabase.util :as u]
-            [metabase.util
-             [i18n :refer [tru]]
-             [schema :as su]]
+            [metabase.util.i18n :refer [tru]]
+            [metabase.util.schema :as su]
             [schema.core :as s]
-            [toucan
-             [db :as db]
-             [models :as models]]))
+            [toucan.db :as db]
+            [toucan.models :as models]))
 
 (models/defmodel GroupTableAccessPolicy :group_table_access_policy)