clean up PR

Author: jmaeng72

indexer-app/int-test/cmr/indexer/test/utility.clj

@@ -375,9 +375,10 @@
   "Given an empty index set this is the expected created index-set. This is used for the update-index-sets-test."
   {:index-set {:name "test-index-set",
                :id 3,
-               ;; usually we would have a revision-id in the expected index-set return,
-               ; but because this value keeps changing we are going to leave it out here for test comparisons where this var is used
-               ;:revision-id 1
+               ;; Usually we would have a revision-id in the expected index-set return,
+               ;; but because this value keeps changing we are going to omit it here for test comparisons where this var is used.
+               ;; Commented out so future devs know this is a field that is being intentionally ignored
+               ;; :revision-id 1
                :deleted false
                :concepts {
                           :generic-order-option {},

indexer-app/src/cmr/indexer/api/routes.clj

@@ -170,7 +170,6 @@
      ;; reset operation available just for development purposes
      ;; delete configured elastic indexes and create them back
      (POST "/reset" {:keys [request-context]}
-       (println "INSIDE indexer's reset")
        (acl/verify-ingest-management-permission request-context :update)
        (cache/reset-caches request-context)
        (index-svc/reset request-context)

indexer-app/src/cmr/indexer/data/elasticsearch.clj

@@ -237,9 +237,9 @@
 (defn update-indexes
   "Updates the indexes to make sure they have the latest mappings"
   [context params]
-  (let [;; setup for non-gran cluster
+  (let [;; setup non-gran cluster index set
         [existing-non-gran-index-set expected-non-gran-index-set] (compute-expected-index-set context es-config/elastic-name)
-        ;; setup for gran cluster
+        ;; setup gran cluster index set
         [existing-gran-index-set expected-gran-index-set] (compute-expected-index-set context es-config/gran-elastic-name)
 
         non-gran-update? (or (= "true" (:force params))

indexer-app/src/cmr/indexer/services/index_set_service.clj

@@ -355,8 +355,7 @@
 (defn put-index-set
   "Upsert the given index-set to the index-sets index in ES."
   [context combined-index-set]
-  (let [;; Strip out revision-id and deleted if they were provided in the request body
-        ;; to avoid 422 errors from metadata-db.
+  (let [;; Strip out revision-id and deleted if they were provided in the request body to avoid 422 errors from metadata-db.
         clean-combined-index-set (update combined-index-set :index-set dissoc :revision-id :deleted)
         split-index-set-map (split-index-set-by-cluster clean-combined-index-set)
         ;; Save a single unified version to Oracle first to get the revision-id
@@ -660,7 +659,6 @@
         (update-index-set context es-config/gran-elastic-name (util/remove-nils-empty-maps-seqs new-gran-index-set) revision-id))
 
       ;; Delete the separate index for this collection when moving back into small collections index
-
       (when (= "small-collections" target)
         (let [collection-key (keyword concept-id)
               old-separate-index (get-in old-gran-index-set [:index-set :concepts :granule collection-key])]

system-int-test/src/cmr/system_int_test/utils/index_util.clj

@@ -256,10 +256,3 @@
                {:headers {transmit-config/token-header (transmit-config/echo-system-token)}
                 :connection-manager (s/conn-mgr)
                 :throw-exceptions false}))
-
-(defn index-set-reset
-  []
-  (client/post (url/index-set-reset-url)
-               {:headers {transmit-config/token-header (transmit-config/echo-system-token)}
-                :connection-manager (s/conn-mgr)
-                :throw-exceptions false}))