Rename DataStoreCategoryPlugin to DataStorePlugin (#222)

Author: lawmicha

AmplifyPlugins.podspec

@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
     ss.dependency 'Starscream', '~> 3.0.2'
   end
 
-  s.subspec 'AWSDataStoreCategoryPlugin' do |ss|
+  s.subspec 'AWSDataStorePlugin' do |ss|
     ss.source_files = 'AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/**/*.swift'
     ss.dependency 'AWSPluginsCore', AMPLIFY_VERSION
     ss.dependency 'SQLite.swift', '~> 0.12.0'

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStoreCategoryPlugin+DataStoreBaseBehavior.swift renamed to AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin+DataStoreBaseBehavior.swift

@@ -8,7 +8,7 @@
 import Amplify
 import AWSPluginsCore
 
-extension AWSDataStoreCategoryPlugin: DataStoreBaseBehavior {
+extension AWSDataStorePlugin: DataStoreBaseBehavior {
 
     public func save<M: Model>(_ model: M,
                                completion: @escaping DataStoreCallback<M>) {

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStoreCategoryPlugin+DataStoreSubscribeBehavior.swift renamed to AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin+DataStoreSubscribeBehavior.swift

@@ -8,7 +8,7 @@
 import Amplify
 import Combine
 
-extension AWSDataStoreCategoryPlugin: DataStoreSubscribeBehavior {
+extension AWSDataStorePlugin: DataStoreSubscribeBehavior {
     @available(iOS 13.0, *)
     public func publisher<M: Model>(for modelType: M.Type)
         -> AnyPublisher<MutationEvent, DataStoreError> {

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStoreCategoryPlugin+DefaultLogger.swift renamed to AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin+DefaultLogger.swift

@@ -7,4 +7,4 @@
 
 import Amplify
 
-extension AWSDataStoreCategoryPlugin: DefaultLogger { }
+extension AWSDataStorePlugin: DefaultLogger { }

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStoreCategoryPlugin.swift renamed to AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin.swift

@@ -7,9 +7,9 @@
 
 import Amplify
 
-final public class AWSDataStoreCategoryPlugin: DataStoreCategoryPlugin {
+final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
 
-    public var key: PluginKey = "awsDataStoreCategoryPlugin"
+    public var key: PluginKey = "awsDataStorePlugin"
 
     /// `true` if any models are syncable. Resolved during configuration phase
     var isSyncEnabled: Bool

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/RemoteSyncEngine.swift

@@ -49,7 +49,7 @@ class RemoteSyncEngine: RemoteSyncEngineBehavior {
         self.outgoingMutationQueue = outgoingMutationQueue
 
         self.syncQueue = OperationQueue()
-        syncQueue.name = "com.amazonaws.Amplify.\(AWSDataStoreCategoryPlugin.self).CloudSyncEngine"
+        syncQueue.name = "com.amazonaws.Amplify.\(AWSDataStorePlugin.self).CloudSyncEngine"
         syncQueue.maxConcurrentOperationCount = 1
     }
 

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginIntegrationTests/TestSupport/SyncEngineIntegrationTestBase.swift

@@ -26,7 +26,7 @@ class SyncEngineIntegrationTestBase: XCTestCase {
     // swiftlint:disable force_try
     // swiftlint:disable force_cast
     var storageAdapter: SQLiteStorageEngineAdapter {
-        let plugin = try! Amplify.DataStore.getPlugin(for: "awsDataStoreCategoryPlugin") as! AWSDataStoreCategoryPlugin
+        let plugin = try! Amplify.DataStore.getPlugin(for: "awsDataStorePlugin") as! AWSDataStorePlugin
         let storageEngine = plugin.storageEngine as! StorageEngine
         let storageAdapter = storageEngine.storageAdapter as! SQLiteStorageEngineAdapter
         return storageAdapter
@@ -56,14 +56,14 @@ class SyncEngineIntegrationTestBase: XCTestCase {
         ])
 
         let dataStoreConfig = DataStoreCategoryConfiguration(plugins: [
-            "awsDataStoreCategoryPlugin": true
+            "awsDataStorePlugin": true
         ])
 
         amplifyConfig = AmplifyConfiguration(api: apiConfig, dataStore: dataStoreConfig)
 
         do {
             try Amplify.add(plugin: AWSAPIPlugin())
-            try Amplify.add(plugin: AWSDataStoreCategoryPlugin(modelRegistration: TestModelRegistration()))
+            try Amplify.add(plugin: AWSDataStorePlugin(modelRegistration: TestModelRegistration()))
         } catch {
             XCTFail(String(describing: error))
             return

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Sync/APICategoryDependencyTests.swift

@@ -73,13 +73,13 @@ extension APICategoryDependencyTests {
                                           isSyncEnabled: true)
 
         let dataStorePublisher = DataStorePublisher()
-        let dataStorePlugin = AWSDataStoreCategoryPlugin(modelRegistration: TestModelRegistration(),
+        let dataStorePlugin = AWSDataStorePlugin(modelRegistration: TestModelRegistration(),
                                                          storageEngine: storageEngine,
                                                          dataStorePublisher: dataStorePublisher)
         try Amplify.add(plugin: dataStorePlugin)
 
         let dataStoreConfig = DataStoreCategoryConfiguration(plugins: [
-            "awsDataStoreCategoryPlugin": true
+            "awsDataStorePlugin": true
         ])
 
         let amplifyConfig = AmplifyConfiguration(dataStore: dataStoreConfig)

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Sync/AWSMutationEventIngesterTests.swift

@@ -25,7 +25,7 @@ class AWSMutationEventIngesterTests: XCTestCase {
         ])
 
         let dataStoreConfig = DataStoreCategoryConfiguration(plugins: [
-            "awsDataStoreCategoryPlugin": true
+            "awsDataStorePlugin": true
         ])
 
         let amplifyConfig = AmplifyConfiguration(api: apiConfig, dataStore: dataStoreConfig)
@@ -44,7 +44,7 @@ class AWSMutationEventIngesterTests: XCTestCase {
                                               isSyncEnabled: true)
 
             let publisher = DataStorePublisher()
-            let dataStorePlugin = AWSDataStoreCategoryPlugin(modelRegistration: TestModelRegistration(),
+            let dataStorePlugin = AWSDataStorePlugin(modelRegistration: TestModelRegistration(),
                                                              storageEngine: storageEngine,
                                                              dataStorePublisher: publisher)
 

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Sync/LocalSubscriptionTests.swift

@@ -47,12 +47,12 @@ class LocalSubscriptionTests: XCTestCase {
         }
 
         let dataStorePublisher = DataStorePublisher()
-        let dataStorePlugin = AWSDataStoreCategoryPlugin(modelRegistration: TestModelRegistration(),
+        let dataStorePlugin = AWSDataStorePlugin(modelRegistration: TestModelRegistration(),
                                                          storageEngine: storageEngine,
                                                          dataStorePublisher: dataStorePublisher)
 
         let dataStoreConfig = DataStoreCategoryConfiguration(plugins: [
-            "awsDataStoreCategoryPlugin": true
+            "awsDataStorePlugin": true
         ])
 
         // Since these tests use syncable models, we have to set up an API category also