remove loading race conditions

metosin · Jun 6, 2024 · 7e4f63b · 7e4f63b
1 parent 8d3c17d
commit 7e4f63b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 24 deletions.
diff --git a/src/compojure/api/coercion.clj b/src/compojure/api/coercion.clj
@@ -4,8 +4,8 @@
             [compojure.api.request :as request]
             [compojure.api.coercion.core :as cc]
             ;; side effects
-            compojure.api.coercion.register-schema
-            compojure.api.coercion.register-spec)
+            compojure.api.coercion.schema
+            compojure.api.coercion.spec)
   (:import (compojure.api.coercion.core CoercionError)))
 
 (def default-coercion :schema)

diff --git a/src/compojure/api/coercion/register_schema.clj b/src/compojure/api/coercion/register_schema.clj
diff --git a/src/compojure/api/coercion/register_spec.clj b/src/compojure/api/coercion/register_spec.clj
diff --git a/src/compojure/api/coercion/schema.clj b/src/compojure/api/coercion/schema.clj
@@ -5,9 +5,7 @@
             [compojure.api.coercion.core :as cc]
             [clojure.walk :as walk]
             [schema.core :as s]
-            [compojure.api.common :as common]
-            ;; side effects
-            compojure.api.coercion.register-schema)
+            [compojure.api.common :as common])
   (:import (java.io File)
            (schema.core OptionalKey RequiredKey)
            (schema.utils ValidationError NamedError)))
@@ -86,3 +84,5 @@
   (->SchemaCoercion :schema options))
 
 (def default-coercion (create-coercion default-options))
+
+(defmethod cc/named-coercion :schema [_] default-coercion)
diff --git a/src/compojure/api/coercion/spec.clj b/src/compojure/api/coercion/spec.clj
@@ -6,9 +6,7 @@
             [clojure.walk :as walk]
             [compojure.api.coercion.core :as cc]
             [spec-tools.swagger.core :as swagger]
-            [compojure.api.common :as common]
-            ;; side effects
-            compojure.api.coercion.register-spec)
+            [compojure.api.common :as common])
   (:import (clojure.lang IPersistentMap)
            (schema.core RequiredKey OptionalKey)
            (spec_tools.core Spec)
@@ -151,3 +149,5 @@
   (->SpecCoercion :spec options))
 
 (def default-coercion (create-coercion default-options))
+
+(defmethod cc/named-coercion :spec [_] default-coercion)