cosmetic changes to metadata_db2 file

Author: jmaeng72

transmit-lib/src/cmr/transmit/metadata_db2.clj

@@ -8,7 +8,7 @@
     [cmr.common.services.errors :as errors]
     [cmr.transmit.config :as config]
     [cmr.transmit.connection :as conn]
-    [cmr.transmit.http-helper :as h]
+    [cmr.transmit.http-helper :as http-helper]
     [ring.util.codec :as codec]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -56,14 +56,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Request functions
 (declare reset)
-(h/defresetter reset :metadata-db)
+(http-helper/defresetter reset :metadata-db)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Provider functions
 (declare create-provider update-provider delete-provider)
-(h/defcreator create-provider :metadata-db providers-url {:use-system-token? true})
-(h/defupdater update-provider :metadata-db provider-url {:use-system-token? true})
-(h/defdestroyer delete-provider :metadata-db provider-url {:use-system-token? true})
+(http-helper/defcreator create-provider :metadata-db providers-url {:use-system-token? true})
+(http-helper/defupdater update-provider :metadata-db provider-url {:use-system-token? true})
+(http-helper/defdestroyer delete-provider :metadata-db provider-url {:use-system-token? true})
 
 (defn get-providers
   "Returns the list of providers configured in the metadata db. Valid options are
@@ -77,30 +77,30 @@
   ([context {:keys [raw? http-options token]}]
    (let [token (or token (:token context))
          headers (when token {config/token-header token})]
-     (h/request context :metadata-db
-                {:url-fn providers-url
+     (http-helper/request context :metadata-db
+                          {:url-fn providers-url
                  :method :get
                  :raw? raw?
-                 :http-options (h/include-request-id context (merge {:accept :json
-                                                                   :headers headers}
-                                                                  http-options))}))))
+                 :http-options (http-helper/include-request-id context (merge {:accept :json
+                                                                               :headers headers}
+                                                                              http-options))}))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Concept functions
 (declare save-concept)
-(h/defcreator save-concept :metadata-db concepts-url {:use-system-token? true})
+(http-helper/defcreator save-concept :metadata-db concepts-url {:use-system-token? true})
 
 (defn get-concept-id
   "Returns a concept id for the given concept type, provider, and native id"
   ([context concept-type provider-id native-id]
    (get-concept-id context concept-type provider-id native-id nil))
   ([context concept-type provider-id native-id {:keys [raw? http-options]}]
-   (let [response (h/request context :metadata-db
-                             {:url-fn #(concept-id-url % concept-type provider-id native-id)
-                              :method :get
-                              :raw? raw?
-                              :use-system-token? true
-                              :http-options (h/include-request-id context (merge {:accept :json} http-options))})]
+   (let [response (http-helper/request context :metadata-db
+                                       {:url-fn #(concept-id-url % concept-type provider-id native-id)
+                                        :method :get
+                                        :raw? raw?
+                                        :use-system-token? true
+                                        :http-options (http-helper/include-request-id context (merge {:accept :json} http-options))})]
      (if raw?
        response
        (:concept-id response)))))
@@ -115,12 +115,12 @@
   (find-concepts context params concept-type nil))
  ([context params concept-type {:keys [raw? http-options]}]
   (-> context
-      (h/request :metadata-db
-                 {:url-fn #(concept-search-url % concept-type)
-                  :method :get
-                  :raw? raw?
-                  :use-system-token? true
-                  :http-options (h/include-request-id context (merge {:accept :json} http-options params))})
+      (http-helper/request :metadata-db
+                           {:url-fn #(concept-search-url % concept-type)
+                            :method :get
+                            :raw? raw?
+                            :use-system-token? true
+                            :http-options (http-helper/include-request-id context (merge {:accept :json} http-options params))})
       finish-parse-concept)))
 
 (defn get-concept
@@ -132,12 +132,12 @@
    (get-concept context concept-id revision-id nil))
   ([context concept-id revision-id {:keys [raw? http-options]}]
    (-> context
-       (h/request :metadata-db
-                  {:url-fn #(concept-revision-url % concept-id revision-id)
+       (http-helper/request :metadata-db
+                            {:url-fn #(concept-revision-url % concept-id revision-id)
                    :method :get
                    :raw? raw?
                    :use-system-token? true
-                   :http-options (h/include-request-id context (merge {:accept :json} http-options))})
+                   :http-options (http-helper/include-request-id context (merge {:accept :json} http-options))})
        finish-parse-concept)))
 
 (defn get-latest-concept
@@ -149,26 +149,25 @@
    (get-latest-concept context concept-id nil))
   ([context concept-id {:keys [raw? http-options]}]
    (-> context
-       (h/request :metadata-db
-                  {:url-fn #(latest-concept-url % concept-id)
+       (http-helper/request :metadata-db
+                            {:url-fn #(latest-concept-url % concept-id)
                    :method :get
                    :raw? raw?
                    :use-system-token? true
-                   :http-options (h/include-request-id context (merge {:accept :json} http-options))})
+                   :http-options (http-helper/include-request-id context (merge {:accept :json} http-options))})
        finish-parse-concept)))
 
 ;; Defines health check function
 (declare get-metadata-db-health)
-(h/defhealther get-metadata-db-health :metadata-db {:timeout-secs 2})
+(http-helper/defhealther get-metadata-db-health :metadata-db {:timeout-secs 2})
 
 
 (defn get-subscription-cache-content
   "Retrieves the cache contents of the ingest subscription cache."
   ([context coll-concept-id]
    (get-subscription-cache-content context coll-concept-id nil))
   ([context coll-concept-id {:keys [raw? http-options]}]
-   (let [
-        conn (config/context->app-connection context :metadata-db)
+   (let [conn (config/context->app-connection context :metadata-db)
         request-url (str (conn/root-url conn) "/subscription/cache-content")
         params (merge
                  (config/conn-params conn)
@@ -178,7 +177,7 @@
                              (ch/context->http-headers context)
                              {:client-id config/cmr-client-id})
                   :throw-exceptions false
-                  :http-options (h/include-request-id context {})})
+                  :http-options (http-helper/include-request-id context {})})
         response (client/get request-url params)
          {:keys [status body]} response
          status (int status)]