Clearly separate FHIR and non-FHIR middleware (preparation for #2126)

samply · Dec 13, 2024 · 71f073e · 71f073e
1 parent 23f56ac
commit 71f073e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/modules/admin-api/src/blaze/admin_api.clj b/modules/admin-api/src/blaze/admin_api.clj
@@ -22,8 +22,8 @@
    [blaze.middleware.fhir.db :as db]
    [blaze.middleware.fhir.output :as fhir-output]
    [blaze.middleware.fhir.resource :as resource]
-   [blaze.middleware.link-headers :as link-headers]
-   [blaze.middleware.output :as output]
+   [blaze.middleware.non-fhir.link-headers :as link-headers]
+   [blaze.middleware.non-fhir.output :as output]
    [blaze.module :as m]
    [blaze.spec]
    [clojure.datafy :as datafy]

diff --git a/modules/rest-api/src/blaze/rest_api/routes.clj b/modules/rest-api/src/blaze/rest_api/routes.clj
@@ -6,8 +6,8 @@
    [blaze.middleware.fhir.error :as error]
    [blaze.middleware.fhir.output :as fhir-output]
    [blaze.middleware.fhir.resource :as resource]
-   [blaze.middleware.link-headers :as link-headers]
-   [blaze.middleware.output :as output]
+   [blaze.middleware.non-fhir.link-headers :as link-headers]
+   [blaze.middleware.non-fhir.output :as output]
    [blaze.rest-api.middleware.auth-guard :as auth-guard]
    [blaze.rest-api.middleware.ensure-form-body :as ensure-form-body]
    [blaze.rest-api.middleware.forwarded :as forwarded]

diff --git a/...til/src/blaze/middleware/link_headers.clj → ...laze/middleware/non_fhir/link_headers.clj b/...til/src/blaze/middleware/link_headers.clj → ...laze/middleware/non_fhir/link_headers.clj
@@ -1,5 +1,5 @@
-(ns blaze.middleware.link-headers
-  "Middleware that will transfer bundle links into link headers according to
+(ns blaze.middleware.non-fhir.link-headers
+  "Non-FHIR middleware that will transfer bundle links into link headers according to
   RFC 8288."
   (:require
    [blaze.async.comp :refer [do-sync]]

diff --git a/...rest-util/src/blaze/middleware/output.clj → .../src/blaze/middleware/non_fhir/output.clj b/...rest-util/src/blaze/middleware/output.clj → .../src/blaze/middleware/non_fhir/output.clj
@@ -1,4 +1,4 @@
-(ns blaze.middleware.output
+(ns blaze.middleware.non-fhir.output
   "Non-FHIR serialization middleware.
 
   Currently supported formats:

diff --git a/...st/blaze/middleware/link_headers_test.clj → ...middleware/non_fhir/link_headers_test.clj b/...st/blaze/middleware/link_headers_test.clj → ...middleware/non_fhir/link_headers_test.clj
@@ -1,7 +1,7 @@
-(ns blaze.middleware.link-headers-test
+(ns blaze.middleware.non-fhir.link-headers-test
   (:require
    [blaze.async.comp :as ac]
-   [blaze.middleware.link-headers :refer [wrap-link-headers]]
+   [blaze.middleware.non-fhir.link-headers :refer [wrap-link-headers]]
    [blaze.test-util :as tu]
    [clojure.spec.test.alpha :as st]
    [clojure.test :as test :refer [deftest testing]]

diff --git a/...til/test/blaze/middleware/output_test.clj → ...blaze/middleware/non_fhir/output_test.clj b/...til/test/blaze/middleware/output_test.clj → ...blaze/middleware/non_fhir/output_test.clj
@@ -1,8 +1,8 @@
-(ns blaze.middleware.output-test
+(ns blaze.middleware.non-fhir.output-test
   (:require
    [blaze.fhir.spec-spec]
    [blaze.fhir.test-util]
-   [blaze.middleware.output :refer [wrap-output]]
+   [blaze.middleware.non-fhir.output :refer [wrap-output]]
    [blaze.module.test-util.ring :refer [call]]
    [blaze.test-util :as tu]
    [clojure.spec.test.alpha :as st]