rename function and remove typealias

adobe · Jan 22, 2021 · 246a4a5 · 246a4a5
1 parent 71d2eb1
commit 246a4a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/AEPServices/Sources/network/DefaultHeadersFormatter.swift b/AEPServices/Sources/network/DefaultHeadersFormatter.swift
@@ -17,14 +17,12 @@ import Foundation
 ///
 public struct DefaultHeadersFormatter {
 
-    typealias httpHeaderConstants = HttpConnectionConstants.Header
-
     ///
     /// Gets the formatted locale
     /// - Parameter unformattedLocale: The unformatted locale as a string
     /// - Returns: The formatted locale as a string or nil if not able to format it.
     ///
-    public static func getFormattedLocale(unformattedLocale: String) -> String {
+    public static func formatLocale(_ unformattedLocale: String) -> String {
 //        "^"                                // beginning of line
 //        "([a-zA-Z]{2,3})"                      // language (required) (match group 1)
 //        "(?:(?:-|_)[a-zA-Z]{3})?"           // extlang (optional)

diff --git a/AEPServices/Sources/network/NetworkRequest.swift b/AEPServices/Sources/network/NetworkRequest.swift
@@ -40,7 +40,7 @@ import Foundation
 
         let systemInfoService = ServiceProvider.shared.systemInfoService
         let defaultHeaders = [NetworkRequest.REQUEST_HEADER_KEY_USER_AGENT: systemInfoService.getDefaultUserAgent(),
-                              HttpConnectionConstants.Header.HTTP_HEADER_KEY_ACCEPT_LANGUAGE: DefaultHeadersFormatter.getFormattedLocale(unformattedLocale: systemInfoService.getActiveLocaleName())]
+                              HttpConnectionConstants.Header.HTTP_HEADER_KEY_ACCEPT_LANGUAGE: DefaultHeadersFormatter.formatLocale(systemInfoService.getActiveLocaleName())]
         self.httpHeaders = defaultHeaders.merging(httpHeaders) { _, new in new } // add in default headers and apply `httpHeaders` on top
 
         self.connectTimeout = connectTimeout

diff --git a/AEPServices/Tests/services/DefaultHeadersFormatterTests.swift b/AEPServices/Tests/services/DefaultHeadersFormatterTests.swift
@@ -49,14 +49,14 @@ class DefaultHeadersFormatterTest: XCTestCase {
                 return
             }
 
-            let formattedLocale = DefaultHeadersFormatter.getFormattedLocale(unformattedLocale: v)
+            let formattedLocale = DefaultHeadersFormatter.formatLocale(v)
 
             XCTAssertEqual(k, formattedLocale)
         }
     }
 
     func testEmptyLocale() {
-        let formattedLocale = DefaultHeadersFormatter.getFormattedLocale(unformattedLocale: "")
+        let formattedLocale = DefaultHeadersFormatter.formatLocale("")
         XCTAssertEqual("en-US", formattedLocale)
     }
 }