[Config] Revert adding encoder/decoder params to Codable APIs (#14565)

Author: ncooke3

FirebaseRemoteConfig/CHANGELOG.md

@@ -1,7 +1,4 @@
 # 11.10.0
-- [fixed] Codable APIs now accept optional `FirebaseDataEncoder` and
-  `FirebaseDataDecoder` parameters, allowing for customization of
-  encoding/decoding behavior. (#14368)
 - [fixed] Fix intermittent `RCNConfigRealtime` crash due to incorrect parsing of fragmented JSON. (#14518)
 
 # 11.9.0

FirebaseRemoteConfig/Swift/Codable.swift

@@ -44,46 +44,22 @@ public enum RemoteConfigCodableError: Error {
 }
 
 public extension RemoteConfig {
-  /// Decodes the given type from the respective Remote Config values.
+  /// Decodes a struct from the respective Remote Config values.
   ///
   /// - Parameter asType: The type to decode to.
-  /// - Throws: An error if the decoding fails.
-  /// - Returns: The decoded value; otherwise, an error if one occurred.
   func decoded<Value: Decodable>(asType: Value.Type = Value.self) throws -> Value {
-    try decoded(asType: asType, decoder: FirebaseDataDecoder())
-  }
-
-  /// Decodes the given type from the respective Remote Config values.
-  /// - Parameters:
-  ///   - asType: The type to decode to.
-  ///   - decoder: The encoder to use to decode the given type.
-  /// - Throws: An error if the decoding fails.
-  /// - Returns: The decoded value; otherwise, an error if one occurred.
-  func decoded<Value: Decodable>(asType: Value.Type = Value.self,
-                                 decoder: FirebaseDataDecoder) throws -> Value {
     let keys = allKeys(from: RemoteConfigSource.default) + allKeys(from: RemoteConfigSource.remote)
     let config = keys.reduce(into: [String: FirebaseRemoteConfigValueDecoderHelper]()) {
       $0[$1] = FirebaseRemoteConfigValueDecoderHelper(value: configValue(forKey: $1))
     }
-    return try decoder.decode(Value.self, from: config)
+    return try FirebaseDataDecoder().decode(Value.self, from: config)
   }
 
   /// Sets config defaults from an encodable struct.
   ///
   /// - Parameter value: The object to use to set the defaults.
-  /// - Throws: An error if the encoding fails.
   func setDefaults<Value: Encodable>(from value: Value) throws {
-    try setDefaults(from: value, encoder: FirebaseDataEncoder())
-  }
-
-  /// Sets config defaults from an encodable struct.
-  /// - Parameters:
-  ///   - value: The object to use to set the defaults.
-  ///   - encoder: The encoder to use to encode the given object.
-  /// - Throws: An error if the encoding fails.
-  func setDefaults<Value: Encodable>(from value: Value,
-                                     encoder: FirebaseDataEncoder) throws {
-    guard let encoded = try encoder.encode(value) as? [String: NSObject] else {
+    guard let encoded = try FirebaseDataEncoder().encode(value) as? [String: NSObject] else {
       throw RemoteConfigCodableError.invalidSetDefaultsInput(
         "The setDefaults input: \(value), must be a Struct that encodes to a Dictionary"
       )

FirebaseRemoteConfig/Tests/Swift/SwiftAPI/Codable.swift

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import FirebaseRemoteConfig
-import FirebaseSharedSwift
 
 import XCTest
 
@@ -207,35 +206,4 @@ class CodableTests: APITestBase {
     XCTAssertEqual(readDefaults.arrayValue, ["foo", "bar", "baz"])
     XCTAssertEqual(readDefaults.arrayIntValue, [1, 2, 0, 3])
   }
-
-  // MARK: - Test using injected encoder/decoder.
-
-  func testDateEncodingAndDecodingWithNonDefaultCoders() throws {
-    // Given
-    struct DateDefaults: Codable {
-      let date: Date
-    }
-
-    let defaults = DateDefaults(date: Date())
-
-    // When
-    let encoder = FirebaseDataEncoder()
-    encoder.dateEncodingStrategy = .iso8601
-    try config.setDefaults(from: defaults, encoder: encoder)
-
-    // - Uses default decoder that won't decode ISO8601 format.
-    let improperlyDecodedDefaults: DateDefaults = try config.decoded()
-    XCTAssertNotEqual(improperlyDecodedDefaults.date, defaults.date)
-
-    // Then
-    let decoder = FirebaseDataDecoder()
-    decoder.dateDecodingStrategy = .iso8601
-
-    let decodedDefaults: DateDefaults = try config.decoded(decoder: decoder)
-    XCTAssert(Calendar.current.isDate(
-      decodedDefaults.date,
-      equalTo: defaults.date,
-      toGranularity: .second
-    ))
-  }
 }