update camelcase version back to master version and revert utf forcing

Author: jmaeng72

ingest-app/project.clj

@@ -1,7 +1,7 @@
 (defproject nasa-cmr/cmr-ingest-app "0.1.0-SNAPSHOT"
   :description "Ingest is an external facing CMR service facilitating providers to create and  update their concepts in CMR. Internally it delegates concept persistence operations to metadata db and indexer micro services."
   :url "https://github.com/nasa/Common-Metadata-Repository/tree/master/ingest-app"
-  :dependencies [[camel-snake-kebab "0.4.2"]
+  :dependencies [[camel-snake-kebab "0.4.0"]
                  [clj-http "2.3.0"]
                  [com.draines/postal "2.0.3"]
                  [jakarta.servlet/jakarta.servlet-api "4.0.4"] ;;5.x and 6.x did not work

ingest-app/src/cmr/ingest/api/core.clj

@@ -223,7 +223,7 @@
     This function has the side effect of emptying the request body.
     Don't try to read the body again after calling this function."
   [body]
-  (string/trim (slurp (java.io.InputStreamReader. body "UTF-8"))))
+  (string/trim (slurp body)))
 
 (defn read-multiple-body!
   "Returns the body content string by slurping the request body. This function

ingest-app/src/cmr/ingest/api/generic_documents.clj

@@ -126,7 +126,7 @@
              request-context :update :provider-object provider-id)
             (acl/verify-provider-context-permission
              request-context :read :provider-object provider-id))
-        raw-document (slurp (java.io.InputStreamReader. (:body request) "UTF-8"))
+        raw-document (slurp (:body request))
         content-type (get headers "content-type")
         ;; get the version in content-type and verify it.
         version-ct (when (and content-type
@@ -375,7 +375,7 @@
      :bad-request
      (format "To publish a draft [%s] with a body, a json Content-Type header needs to be provided." concept-id))
     (try
-      (json/parse-string (string/trim (slurp (java.io.InputStreamReader. body "UTF-8"))))
+      (json/parse-string (string/trim (slurp body)))
       (catch Exception e
         (errors/throw-service-error
          :bad-request

ingest-app/src/cmr/ingest/api/provider.clj

@@ -81,7 +81,7 @@
 (defn read-body
   [headers body-input]
   (if (= mt/json (mt/content-type-mime-type headers))
-    (json/decode (slurp (java.io.InputStreamReader. body-input "UTF-8")) true)
+    (json/decode (slurp body-input) true)
     (srvc-errors/throw-service-error
       :invalid-content-type "Creating or updating a provider requires a JSON content type.")))
 

ingest-app/src/cmr/ingest/api/translation.clj

@@ -159,10 +159,10 @@
 (def translation-routes
   (context "/translate" []
     (POST "/collection" {:keys [body headers request-context params]}
-      (translate request-context :collection headers (slurp (java.io.InputStreamReader. body "UTF-8"))
+      (translate request-context :collection headers (slurp body)
                  (= "true" (:skip_umm_validation params))))
     (POST "/granule" {:keys [body headers request-context params]}
-      (translate request-context :granule headers (slurp (java.io.InputStreamReader. body "UTF-8"))
+      (translate request-context :granule headers (slurp body)
                  (= "true" (:skip_umm_validation params))))))
 
 (def random-metadata-routes

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

@@ -388,9 +388,7 @@
          params {:method method
                  :url (url/ingest-url provider-id concept-type native-id)
                  :body  metadata
-                 :content-type (if (string? format)
-                                 (str format "; charset=utf-8")
-                                 format)
+                 :content-type format
                  :headers headers
                  :throw-exceptions false
                  :connection-manager (sys/conn-mgr)}

system-int-test/test/cmr/system_int_test/ingest/subscription/subscription_ingest_temporary_test.clj

@@ -906,7 +906,7 @@
     (testing "without native-id provided with unicode in the name"
       (let [concept (dissoc (subscription-util/make-subscription-concept
                              {:SubscriberId "post-user"
-                              :Name "unicode-test Großartiger Scott!"
+                              :Name "unicode-test Gro\u00dfartiger Scott!"
                               :Query "instrument=POSEIDON-2B"
                               :CollectionConceptId (:concept-id coll)})
                             :native-id)
@@ -916,7 +916,7 @@
                                                  :method :post})]
         (is (= 201 status))
         (is (not (nil? concept-id)))
-        (is (string/starts-with? native-id "unicode_test_großartiger"))
+        (is (string/starts-with? native-id "unicode_test_gro\u00dfartiger"))
         (is (= 1 revision-id))
 
         (index/wait-until-indexed)