renamed PrimaryKeyHandlerRegistry property to PrimaryKeyHandlers, for…

… consistency with the other property names
OctopusDeploy · Jun 14, 2021 · e8f71a4 · e8f71a4
1 parent 457a2c4
commit e8f71a4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/source/Nevermore.IntegrationTests/SetUp/FixtureWithRelationalStore.cs b/source/Nevermore.IntegrationTests/SetUp/FixtureWithRelationalStore.cs
@@ -43,7 +43,7 @@ protected FixtureWithRelationalStore()
             config.TypeHandlers.Register(new ReferenceCollectionTypeHandler());
             config.TypeHandlers.Register(new StringTinyTypeIdTypeHandler<CustomerId>());
 
-            config.PrimaryKeyHandlerRegistry.Register(new StringTinyTypeIdKeyHandler<CustomerId>());
+            config.PrimaryKeyHandlers.Register(new StringTinyTypeIdKeyHandler<CustomerId>());
 
             config.InstanceTypeResolvers.Register(new ProductTypeResolver());
             config.InstanceTypeResolvers.Register(new BrandTypeResolver());

diff --git a/source/Nevermore/Advanced/WriteTransaction.cs b/source/Nevermore/Advanced/WriteTransaction.cs
@@ -222,7 +222,7 @@ public TKey AllocateId<TKey>(Type documentType)
 
         TKey AllocateIdForMapping<TKey>(DocumentMap mapping)
         {
-            var handler = configuration.PrimaryKeyHandlerRegistry.Resolve(mapping);
+            var handler = configuration.PrimaryKeyHandlers.Resolve(mapping);
             if (handler == null || !(handler is IPrimitivePrimaryKeyHandler primitivePrimaryKeyHandler))
                 throw new InvalidOperationException($"Primary key handler could not be resolved for type {mapping.Type}, or it is configured to use an identity key handler.");
 
@@ -234,7 +234,7 @@ TKey AllocateIdForMapping<TKey>(DocumentMap mapping)
 
         object AllocateId(DocumentMap mapping)
         {
-            var handler = configuration.PrimaryKeyHandlerRegistry.Resolve(mapping);
+            var handler = configuration.PrimaryKeyHandlers.Resolve(mapping);
             if (handler == null || !(handler is IPrimitivePrimaryKeyHandler primitivePrimaryKeyHandler))
                 throw new InvalidOperationException($"Primary key handler could not be resolved for type {mapping.Type}, or it is configured to use an identity key handler.");
 

diff --git a/source/Nevermore/IRelationalStoreConfiguration.cs b/source/Nevermore/IRelationalStoreConfiguration.cs
@@ -32,7 +32,7 @@ public interface IRelationalStoreConfiguration
         IReaderStrategyRegistry ReaderStrategies { get; }
         ITypeHandlerRegistry TypeHandlers { get; }
         IInstanceTypeRegistry InstanceTypeResolvers { get; }
-        IPrimaryKeyHandlerRegistry PrimaryKeyHandlerRegistry { get; }
+        IPrimaryKeyHandlerRegistry PrimaryKeyHandlers { get; }
         IRelatedDocumentStore RelatedDocumentStore { get; set; }
         IQueryLogger QueryLogger { get; set; }
 

diff --git a/source/Nevermore/RelationalStoreConfiguration.cs b/source/Nevermore/RelationalStoreConfiguration.cs
@@ -46,11 +46,11 @@ public RelationalStoreConfiguration(Func<string> connectionStringFunc)
 
             TypeHandlers = new TypeHandlerRegistry();
 
-            PrimaryKeyHandlerRegistry = new PrimaryKeyHandlerRegistry();
-            PrimaryKeyHandlerRegistry.Register(new StringPrimaryKeyHandler());
-            PrimaryKeyHandlerRegistry.Register(new IntPrimaryKeyHandler());
-            PrimaryKeyHandlerRegistry.Register(new LongPrimaryKeyHandler());
-            PrimaryKeyHandlerRegistry.Register(new GuidPrimaryKeyHandler());
+            PrimaryKeyHandlers = new PrimaryKeyHandlerRegistry();
+            PrimaryKeyHandlers.Register(new StringPrimaryKeyHandler());
+            PrimaryKeyHandlers.Register(new IntPrimaryKeyHandler());
+            PrimaryKeyHandlers.Register(new LongPrimaryKeyHandler());
+            PrimaryKeyHandlers.Register(new GuidPrimaryKeyHandler());
 
             AllowSynchronousOperations = true;
 
@@ -87,7 +87,7 @@ public RelationalStoreConfiguration(Func<string> connectionStringFunc)
         public ITypeHandlerRegistry TypeHandlers { get; }
         public IInstanceTypeRegistry InstanceTypeResolvers { get; }
 
-        public IPrimaryKeyHandlerRegistry PrimaryKeyHandlerRegistry { get; }
+        public IPrimaryKeyHandlerRegistry PrimaryKeyHandlers { get; }
 
         /// <summary>
         /// MARS: https://docs.microsoft.com/en-us/sql/relational-databases/native-client/features/using-multiple-active-result-sets-mars?view=sql-server-ver15

diff --git a/source/Nevermore/Util/DataModificationQueryBuilder.cs b/source/Nevermore/Util/DataModificationQueryBuilder.cs
@@ -310,7 +310,7 @@ CommandParameterValues GetDocumentParameters(Func<DocumentMap, object> allocateI
             var result = new CommandParameterValues();
 
             //we never want to allocate id's if the Id column is an Identity
-            var keyHandler = configuration.PrimaryKeyHandlerRegistry.Resolve(mapping);
+            var keyHandler = configuration.PrimaryKeyHandlers.Resolve(mapping);
             if (keyHandler is IPrimitivePrimaryKeyHandler primitiveKeyHandler)
             {
                 // check whether the object's Id has already been provided, if not then we'll either use the one from the InsertOptions or we'll generate one