Consistent naming

Author: wibosco

CoreDataMigration-Example/CoreData/CoreDataManager.swift

@@ -72,9 +72,9 @@ class CoreDataManager {
             fatalError("persistentContainer was not set up properly")
         }
 
-        if migrator.requiresMigration(storeURL: storeURL) {
+        if migrator.requiresMigration(at: storeURL) {
             DispatchQueue.global(qos: .userInitiated).async {
-                self.migrator.migrateStore(storeURL: storeURL)
+                self.migrator.migrateStore(at: storeURL)
 
                 DispatchQueue.main.async {
                     completion()

CoreDataMigration-Example/CoreData/Migration/CoreDataMigrator.swift

@@ -28,7 +28,7 @@ class CoreDataMigrator {
 
     // MARK: - Check
 
-    func requiresMigration(storeURL: URL, currentMigrationModel: CoreDataMigrationModel = CoreDataMigrationModel.current) -> Bool {
+    func requiresMigration(at storeURL: URL, currentMigrationModel: CoreDataMigrationModel = CoreDataMigrationModel.current) -> Bool {
         guard let metadata = NSPersistentStoreCoordinator.metadata(at: storeURL) else {
             return false
         }
@@ -38,7 +38,7 @@ class CoreDataMigrator {
 
     // MARK: - Migration
 
-    func migrateStore(storeURL: URL) {
+    func migrateStore(at storeURL: URL) {
         migrateStore(from: storeURL, to: storeURL, targetVersion: CoreDataMigrationModel.current)
     }
 
@@ -47,7 +47,7 @@ class CoreDataMigrator {
             fatalError("unknown store version at URL \(sourceURL)")
         }
 
-        forceWALCheckpointing(storeURL: sourceURL)
+        forceWALCheckpointingForStore(at: sourceURL)
 
         var currentURL = sourceURL
         let migrationSteps = sourceMigrationModel.migrationSteps(to: targetVersion)
@@ -79,7 +79,7 @@ class CoreDataMigrator {
 
     // MARK: - WAL
 
-    func forceWALCheckpointing(storeURL: URL) {
+    func forceWALCheckpointingForStore(at storeURL: URL) {
         guard let metadata = NSPersistentStoreCoordinator.metadata(at: storeURL) else {
             return
         }

CoreDataMigration-ExampleTests/CoreData/CoreDataManagerTests.swift

@@ -20,13 +20,13 @@ class CoreDataManagerTests: XCTestCase {
 
         var requiresMigrationToBeReturned = false
 
-        override func requiresMigration(storeURL: URL, currentMigrationModel: CoreDataMigrationModel = CoreDataMigrationModel.current) -> Bool {
+        override func requiresMigration(at: URL, currentMigrationModel: CoreDataMigrationModel = CoreDataMigrationModel.current) -> Bool {
             requiresMigrationWasCalled = true
 
             return requiresMigrationToBeReturned
         }
 
-        override func migrateStore(storeURL: URL) {
+        override func migrateStore(at: URL) {
             migrateStoreWasCalled = true
         }
     }

CoreDataMigration-ExampleTests/CoreData/Migration/CoreDataMigratorTests.swift

@@ -115,7 +115,7 @@ class CoreDataMigratorTests: XCTestCase {
     func test_requiresMigration_true() {
         let storeURL = CoreDataMigratorTests.moveFileFromBundleToTmpDirectory(fileName: "CoreDataMigration_Example_1.sqlite")
 
-        let requiresMigration = migrator.requiresMigration(storeURL: storeURL)
+        let requiresMigration = migrator.requiresMigration(at: storeURL)
 
         XCTAssertTrue(requiresMigration)
     }
@@ -124,7 +124,7 @@ class CoreDataMigratorTests: XCTestCase {
         let storeURL = CoreDataMigratorTests.moveFileFromBundleToTmpDirectory(fileName: "CoreDataMigration_Example_3.sqlite")
         let migrationModel = CoreDataMigrationModel(version: .version3)
 
-        let requiresMigration = migrator.requiresMigration(storeURL: storeURL, currentMigrationModel: migrationModel)
+        let requiresMigration = migrator.requiresMigration(at: storeURL, currentMigrationModel: migrationModel)
 
         XCTAssertFalse(requiresMigration)
     }
@@ -137,7 +137,7 @@ class CoreDataMigratorTests: XCTestCase {
 
         let sizeBeforeCheckPointing = try! FileManager.default.attributesOfItem(atPath: storeURL.path)[FileAttributeKey.size] as! NSNumber
 
-        migrator.forceWALCheckpointing(storeURL: storeURL)
+        migrator.forceWALCheckpointingForStore(at: storeURL)
 
         let sizeAfterCheckPointing = try! FileManager.default.attributesOfItem(atPath: storeURL.path)[FileAttributeKey.size] as! NSNumber