review

Author: paulb777

FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.m

@@ -15,7 +15,6 @@
 #import "FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h"
 #import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h"
 
-//#import "FirebaseStorage/Sources/FIRStorageComponent.h"
 #import "SharedTestUtilities/FIRComponentTestUtilities.h"
 
 NSString *const kGoogleHTTPErrorDomain = @"com.google.HTTPStatus";

FirebaseStorageSwift/Sources/Storage.swift

@@ -42,7 +42,7 @@ import FirebaseAuthInterop
  @objc(storageForApp:) open class func storage(app: FirebaseApp = FirebaseApp.app()!) -> Storage {
  let provider = ComponentType<StorageProvider>.instance(for: StorageProvider.self,
  in: app.container)
- return provider.Storage(for: FIRIMPLStorage.bucket(for: app))
+ return provider.storage(for: FIRIMPLStorage.bucket(for: app))
  }
 
  /**
@@ -57,7 +57,7 @@ import FirebaseAuthInterop
  url: String) -> Storage {
  let provider = ComponentType<StorageProvider>.instance(for: StorageProvider.self,
  in: app.container)
- return provider.Storage(for: FIRIMPLStorage.bucket(for: app, url: url))
+ return provider.storage(for: FIRIMPLStorage.bucket(for: app, url: url))
  }
 
  /**

FirebaseStorageSwift/Sources/StorageComponent.swift

@@ -20,7 +20,7 @@ import FirebaseCoreInternal
 
 @objc(FIRStorageProvider)
 protocol StorageProvider {
- @objc func Storage(for bucket: String) -> Storage
+ @objc func storage(for bucket: String) -> Storage
  // TODO: See if we can avoid the `type` parameter by either making it a `Storage` argument to
  // allow subclasses, or avoid it entirely and fix tests. This was done for StorageCombineUnit,
  // although we may be able to now port to using `@testable` instead of using the mock.
@@ -64,7 +64,7 @@ protocol StorageProvider {
 
  // MARK: - StorageProvider conformance
 
- func Storage(for bucket: String) -> Storage {
+ func storage(for bucket: String) -> Storage {
  os_unfair_lock_lock(&instancesLock)
 
  // Unlock before the function returns.

FirebaseStorageSwift/Sources/StorageReference.swift

@@ -99,7 +99,8 @@ import FirebaseStorageObjC
  * about the object being uploaded.
  * @return An instance of StorageUploadTask, which can be used to monitor or manage the upload.
  */
- @objc(putData:metadata:) @discardableResult
+ @objc(putData:metadata:)
+ @discardableResult
  open func putData(_ uploadData: Data, metadata: StorageMetadata? = nil) -> StorageUploadTask {
  return StorageUploadTask(impl.put(uploadData, metadata: metadata?.impl))
  }
@@ -356,6 +357,10 @@ import FirebaseStorageObjC
 
  // MARK: - Delete
 
+ /**
+ * Deletes the object at the current path.
+ * @param completion A completion block which returns nil on success, or an error on failure.
+ */
  @objc(deleteWithCompletion:)
  open func delete(completion: ((_: Error?) -> Void)?) {
  impl.delete(completion: completion)
@@ -382,11 +387,6 @@ import FirebaseStorageObjC
  return impl.description
  }
 
- /**
- * Deletes the object at the current path.
- * @param completion A completion block which returns nil on success, or an error on failure.
- */
-
  // MARK: - Internal APIs
 
  private let impl: FIRIMPLStorageReference