From e71dc5302a463eb4b44e8190197fb30095fde877 Mon Sep 17 00:00:00 2001 From: Ricardo Peres Date: Mon, 13 Oct 2014 20:00:45 +0100 Subject: [PATCH 1/2] NH-3719 Added support for: - camelcase - camelcase-underscore - camelcase-m-underscore - lowercase - lowercase-underscore - pascalcase-underscore - pascalcase-m - pascalcase-m-underscore --- .../MappersTests/PropertyMapperTest.cs | 6 ++++ .../Mapping/ByCode/IAccessorPropertyMapper.cs | 14 ++++++++- .../ByCode/Impl/AccessorPropertyMapper.cs | 31 +++++++++++++++++++ .../Mapping/ByCode/Impl/AnyMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/BagMapper.cs | 6 ++++ ...ponentAsIdLikeComponentAttributesMapper.cs | 6 ++++ .../ByCode/Impl/ComponentAsIdMapper.cs | 6 ++++ .../ByCode/Impl/ComponentElementMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/ComponentMapper.cs | 6 ++++ .../Impl/ComponentNestedElementMapper.cs | 6 ++++ .../ByCode/Impl/ComponentParentMapper.cs | 6 ++++ .../CollectionPropertiesCustomizer.cs | 6 ++++ .../ComponentAsIdCustomizer.cs | 6 ++++ .../CustomizersImpl/ComponentCustomizer.cs | 6 ++++ .../ComponentElementCustomizer.cs | 6 ++++ .../DynamicComponentCustomizer.cs | 6 ++++ .../ByCode/Impl/DynamicComponentMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/IdBagMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/IdMapper.cs | 8 +++++ .../Mapping/ByCode/Impl/KeyManyToOneMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/KeyPropertyMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/ListMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/ManyToOneMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/MapMapper.cs | 6 ++++ .../ByCode/Impl/NoMemberPropertyMapper.cs | 5 +++ .../Mapping/ByCode/Impl/OneToOneMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/PropertyMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/SetMapper.cs | 6 ++++ .../Mapping/ByCode/Impl/VersionMapper.cs | 6 ++++ 29 files changed, 207 insertions(+), 1 deletion(-) diff --git a/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs b/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs index 21a740e60d2..bb918d581ea 100644 --- a/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs +++ b/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs @@ -3,6 +3,7 @@ using System.Data; using NHibernate.Cfg.MappingSchema; using NHibernate.Engine; +using NHibernate.Id; using NHibernate.Mapping.ByCode; using NHibernate.Mapping.ByCode.Impl; using NHibernate.Properties; @@ -35,6 +36,11 @@ public void Access(Accessor accessor) AccessorCalled = true; } + public void Access() where T : IIdentifierGenerator, new() + { + + } + public void Access(System.Type accessorType) { diff --git a/src/NHibernate/Mapping/ByCode/IAccessorPropertyMapper.cs b/src/NHibernate/Mapping/ByCode/IAccessorPropertyMapper.cs index 278043f853a..9c10e004abf 100644 --- a/src/NHibernate/Mapping/ByCode/IAccessorPropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/IAccessorPropertyMapper.cs @@ -1,3 +1,5 @@ +using NHibernate.Id; + namespace NHibernate.Mapping.ByCode { public enum Accessor @@ -6,12 +8,22 @@ public enum Accessor Field, NoSetter, ReadOnly, - None + None, + //NH-3720 + FieldCamelCase, + FieldCamelCaseUnderscore, + FieldCamelCaseMUnderscore, + FieldLowerCase, + FieldLowerCaseUnderscore, + FieldPascalCaseUnderscore, + FieldPascalCaseM, + FieldPascalCaseMUnderscore } public interface IAccessorPropertyMapper { void Access(Accessor accessor); void Access(System.Type accessorType); + void Access() where T : IIdentifierGenerator, new(); } } \ No newline at end of file diff --git a/src/NHibernate/Mapping/ByCode/Impl/AccessorPropertyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/AccessorPropertyMapper.cs index f264dcbf55e..92c02b95712 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/AccessorPropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/AccessorPropertyMapper.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using NHibernate.Id; using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl @@ -92,11 +93,41 @@ public void Access(Accessor accessor) case Accessor.None: setAccessor("none"); break; + //NH-3720 + case Accessor.FieldCamelCase: + setAccessor("field.camelcase"); + break; + case Accessor.FieldCamelCaseMUnderscore: + setAccessor("field.camelcase-m-underscore"); + break; + case Accessor.FieldCamelCaseUnderscore: + setAccessor("field.camelcase-underscore"); + break; + case Accessor.FieldLowerCase: + setAccessor("field.lowercase"); + break; + case Accessor.FieldLowerCaseUnderscore: + setAccessor("field.lowercase-underscore"); + break; + case Accessor.FieldPascalCaseM: + setAccessor("field.pascalcase-m"); + break; + case Accessor.FieldPascalCaseUnderscore: + setAccessor("field.pascalcase-underscore"); + break; + case Accessor.FieldPascalCaseMUnderscore: + setAccessor("field.pascalcase-m-underscore"); + break; default: throw new ArgumentOutOfRangeException("accessor"); } } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { if (!canChangeAccessor) diff --git a/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs index e09865baa61..7259923e5e7 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Type; namespace NHibernate.Mapping.ByCode.Impl @@ -59,6 +60,11 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { entityPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/BagMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/BagMapper.cs index c961e1a8000..ebc7fccebf1 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/BagMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/BagMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Persister.Collection; using NHibernate.UserTypes; @@ -211,6 +212,11 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { entityPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdLikeComponentAttributesMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdLikeComponentAttributesMapper.cs index 0f524abaaef..322f9bb3032 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdLikeComponentAttributesMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdLikeComponentAttributesMapper.cs @@ -1,5 +1,6 @@ using System; using System.Reflection; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl { @@ -23,6 +24,11 @@ public void Access(Accessor accessor) _realMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { _realMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs index 940112cf879..e0b13085b90 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl { @@ -40,6 +41,11 @@ public void Access(System.Type accessorType) accessorPropertyMapper.Access(accessorType); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Class(System.Type componentType) { id.@class = componentType.GetShortClassName(mapDoc); diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs index 51a492eab40..ca3cad49db1 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl { @@ -92,6 +93,11 @@ public void Access(Accessor accessor) // not supported by HbmCompositeElement } + public void Access() where T : IIdentifierGenerator, new() + { + // not supported by HbmCompositeElement + } + public void Access(System.Type accessorType) { // not supported by HbmCompositeElement diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs index c414b03e9f3..d8c157b0b08 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl { @@ -89,6 +90,11 @@ public void Access(Accessor accessor) _accessorPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { _accessorPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs index 34a5ad33e10..6331a1af0d8 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl { @@ -94,6 +95,11 @@ public void Access(Accessor accessor) _accessorPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { _accessorPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentParentMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentParentMapper.cs index dab930fe432..d0d0441754c 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentParentMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentParentMapper.cs @@ -1,6 +1,7 @@ using System; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl { @@ -25,6 +26,11 @@ public void Access(Accessor accessor) accessorPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { accessorPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionPropertiesCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionPropertiesCustomizer.cs index e79236f0f76..1d90c060422 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionPropertiesCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionPropertiesCustomizer.cs @@ -1,6 +1,7 @@ using System; using System.Linq.Expressions; using System.Reflection; +using NHibernate.Id; using NHibernate.Persister.Collection; using NHibernate.UserTypes; @@ -138,6 +139,11 @@ public void Access(System.Type accessorType) CustomizersHolder.AddCustomizer(PropertyPath, (ICollectionPropertiesMapper x) => x.Access(accessorType)); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void OptimisticLock(bool takeInConsiderationForOptimisticLock) { CustomizersHolder.AddCustomizer(PropertyPath, (ICollectionPropertiesMapper x) => x.OptimisticLock(takeInConsiderationForOptimisticLock)); diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs index 7334a20f281..283ce8a5aad 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs @@ -1,4 +1,5 @@ using System; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl { @@ -34,6 +35,11 @@ public void Access(Accessor accessor) CustomizersHolder.AddCustomizer(PropertyPath, (IComponentAsIdAttributesMapper m) => m.Access(accessor)); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { CustomizersHolder.AddCustomizer(PropertyPath, (IComponentAsIdAttributesMapper m) => m.Access(accessorType)); diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs index 80346ea5135..f4e81a86ada 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs @@ -1,6 +1,7 @@ using System; using System.Linq.Expressions; using System.Reflection; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl { @@ -78,6 +79,11 @@ public void Access(Accessor accessor) AddCustomizer(m => m.Access(accessor)); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { AddCustomizer(m => m.Access(accessorType)); diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs index d0ec9d0480a..a6468ab9461 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs @@ -1,6 +1,7 @@ using System; using System.Linq.Expressions; using System.Reflection; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl { @@ -112,6 +113,11 @@ public void Access(Accessor accessor) _customizersHolder.AddCustomizer(typeof (TComponent), (IComponentAttributesMapper x) => x.Access(accessor)); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { _customizersHolder.AddCustomizer(typeof (TComponent), (IComponentAttributesMapper x) => x.Access(accessorType)); diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs index c08d14ecfd2..c3a91755652 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs @@ -1,4 +1,5 @@ using System; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl { @@ -25,6 +26,11 @@ public void Access(Accessor accessor) CustomizersHolder.AddCustomizer(PropertyPath, (IDynamicComponentAttributesMapper m) => m.Access(accessor)); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { CustomizersHolder.AddCustomizer(PropertyPath, (IDynamicComponentAttributesMapper m) => m.Access(accessorType)); diff --git a/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs index 06f5481d820..c28e17a6e35 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl { @@ -143,6 +144,11 @@ public void Access(Accessor accessor) accessorPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { accessorPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/IdBagMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/IdBagMapper.cs index 251ca3f0b7a..f47ef2aa9cb 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/IdBagMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/IdBagMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Persister.Collection; using NHibernate.UserTypes; @@ -222,6 +223,11 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { entityPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs index a082f0258a1..3f36cb04d1a 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Type; namespace NHibernate.Mapping.ByCode.Impl @@ -49,6 +50,11 @@ public void Access(Accessor accessor) accessorMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { accessorMapper.Access(accessorType); @@ -120,6 +126,8 @@ public void Access(Accessor accessor) {} public void Access(System.Type accessorType) {} + public void Access() where T : IIdentifierGenerator, new() {} + #endregion } diff --git a/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs index bea5bdac7da..9ff7e859b2e 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; namespace NHibernate.Mapping.ByCode.Impl { @@ -136,6 +137,11 @@ public void Access(Accessor accessor) _entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { _entityPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs index 5d643a2e50a..7ace9c982c6 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Type; using NHibernate.UserTypes; @@ -52,6 +53,11 @@ public void Access(System.Type accessorType) entityPropertyMapper.Access(accessorType); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void OptimisticLock(bool takeInConsiderationForOptimisticLock) { // not supported by HbmKeyProperty diff --git a/src/NHibernate/Mapping/ByCode/Impl/ListMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ListMapper.cs index e33fd70b1d9..9b9975ab22e 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ListMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ListMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Persister.Collection; using NHibernate.UserTypes; @@ -220,6 +221,11 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { entityPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs index 6194d5e524d..864b2d0dd23 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Util; namespace NHibernate.Mapping.ByCode.Impl @@ -134,6 +135,11 @@ public void Access(Accessor accessor) _entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { _entityPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs index e5bd28f1f6d..ab3cdb8ec7d 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Persister.Collection; using NHibernate.UserTypes; @@ -232,6 +233,11 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { entityPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/NoMemberPropertyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/NoMemberPropertyMapper.cs index 0fb45752e5e..32548ffc303 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/NoMemberPropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/NoMemberPropertyMapper.cs @@ -1,3 +1,5 @@ +using NHibernate.Id; + namespace NHibernate.Mapping.ByCode.Impl { public class NoMemberPropertyMapper : IAccessorPropertyMapper @@ -8,6 +10,9 @@ public void Access(Accessor accessor) {} public void Access(System.Type accessorType) {} + public void Access() where T : IIdentifierGenerator, new() + {} + #endregion } } \ No newline at end of file diff --git a/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs index fca7c2964c9..f32780536b6 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs @@ -2,6 +2,7 @@ using System.Linq.Expressions; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Util; namespace NHibernate.Mapping.ByCode.Impl @@ -47,6 +48,11 @@ public void Access(Accessor accessor) _entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { _entityPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/PropertyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/PropertyMapper.cs index d7b2fcd43cf..92ad8fce9f5 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/PropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/PropertyMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Type; using NHibernate.UserTypes; using NHibernate.Util; @@ -54,6 +55,11 @@ public PropertyMapper(MemberInfo member, HbmProperty propertyMapping) #region Implementation of IEntityPropertyMapper + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(Accessor accessor) { entityPropertyMapper.Access(accessor); diff --git a/src/NHibernate/Mapping/ByCode/Impl/SetMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/SetMapper.cs index c7dc772c275..4d36dc7d43c 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/SetMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/SetMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Persister.Collection; using NHibernate.UserTypes; @@ -217,6 +218,11 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { entityPropertyMapper.Access(accessorType); diff --git a/src/NHibernate/Mapping/ByCode/Impl/VersionMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/VersionMapper.cs index f9f5d09c28f..2f20014002a 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/VersionMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/VersionMapper.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; +using NHibernate.Id; using NHibernate.Type; using NHibernate.UserTypes; @@ -148,6 +149,11 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } + public void Access() where T : IIdentifierGenerator, new() + { + this.Access(typeof(T)); + } + public void Access(System.Type accessorType) { entityPropertyMapper.Access(accessorType); From 1e0595fe5fe24d8c3c80f235d80b06c26466e1ac Mon Sep 17 00:00:00 2001 From: Ricardo Peres Date: Mon, 13 Oct 2014 20:09:58 +0100 Subject: [PATCH 2/2] Fixed constraint --- .../MappingByCode/MappersTests/PropertyMapperTest.cs | 3 +-- src/NHibernate/Mapping/ByCode/IAccessorPropertyMapper.cs | 4 ++-- .../Mapping/ByCode/Impl/AccessorPropertyMapper.cs | 3 +-- src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/BagMapper.cs | 4 ++-- .../Impl/ComponentAsIdLikeComponentAttributesMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs | 4 ++-- .../Mapping/ByCode/Impl/ComponentElementMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs | 4 ++-- .../Mapping/ByCode/Impl/ComponentNestedElementMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/ComponentParentMapper.cs | 4 ++-- .../Impl/CustomizersImpl/CollectionPropertiesCustomizer.cs | 4 ++-- .../ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs | 4 ++-- .../ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs | 4 ++-- .../Impl/CustomizersImpl/ComponentElementCustomizer.cs | 4 ++-- .../Impl/CustomizersImpl/DynamicComponentCustomizer.cs | 4 ++-- .../Mapping/ByCode/Impl/DynamicComponentMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/IdBagMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs | 6 +++--- src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/ListMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs | 4 ++-- .../Mapping/ByCode/Impl/NoMemberPropertyMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/PropertyMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/SetMapper.cs | 4 ++-- src/NHibernate/Mapping/ByCode/Impl/VersionMapper.cs | 4 ++-- 29 files changed, 57 insertions(+), 59 deletions(-) diff --git a/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs b/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs index bb918d581ea..298e08ab592 100644 --- a/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs +++ b/src/NHibernate.Test/MappingByCode/MappersTests/PropertyMapperTest.cs @@ -3,7 +3,6 @@ using System.Data; using NHibernate.Cfg.MappingSchema; using NHibernate.Engine; -using NHibernate.Id; using NHibernate.Mapping.ByCode; using NHibernate.Mapping.ByCode.Impl; using NHibernate.Properties; @@ -36,7 +35,7 @@ public void Access(Accessor accessor) AccessorCalled = true; } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { } diff --git a/src/NHibernate/Mapping/ByCode/IAccessorPropertyMapper.cs b/src/NHibernate/Mapping/ByCode/IAccessorPropertyMapper.cs index 9c10e004abf..da153af112f 100644 --- a/src/NHibernate/Mapping/ByCode/IAccessorPropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/IAccessorPropertyMapper.cs @@ -1,4 +1,4 @@ -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode { @@ -24,6 +24,6 @@ public interface IAccessorPropertyMapper { void Access(Accessor accessor); void Access(System.Type accessorType); - void Access() where T : IIdentifierGenerator, new(); + void Access() where T : IPropertyAccessor, new(); } } \ No newline at end of file diff --git a/src/NHibernate/Mapping/ByCode/Impl/AccessorPropertyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/AccessorPropertyMapper.cs index 92c02b95712..2f293260713 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/AccessorPropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/AccessorPropertyMapper.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using NHibernate.Id; using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl @@ -123,7 +122,7 @@ public void Access(Accessor accessor) } } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs index 7259923e5e7..6b64291ce58 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/AnyMapper.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; using NHibernate.Type; namespace NHibernate.Mapping.ByCode.Impl @@ -60,7 +60,7 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/BagMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/BagMapper.cs index ebc7fccebf1..19231bcf109 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/BagMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/BagMapper.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; using NHibernate.Persister.Collection; +using NHibernate.Properties; using NHibernate.UserTypes; namespace NHibernate.Mapping.ByCode.Impl @@ -212,7 +212,7 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdLikeComponentAttributesMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdLikeComponentAttributesMapper.cs index 322f9bb3032..beeee7e2e9c 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdLikeComponentAttributesMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdLikeComponentAttributesMapper.cs @@ -1,6 +1,6 @@ using System; using System.Reflection; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl { @@ -24,7 +24,7 @@ public void Access(Accessor accessor) _realMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs index e0b13085b90..f0321732f4a 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentAsIdMapper.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl { @@ -41,7 +41,7 @@ public void Access(System.Type accessorType) accessorPropertyMapper.Access(accessorType); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs index ca3cad49db1..b93c75ab7c5 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentElementMapper.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl { @@ -93,7 +93,7 @@ public void Access(Accessor accessor) // not supported by HbmCompositeElement } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { // not supported by HbmCompositeElement } diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs index d8c157b0b08..79b69635a2c 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentMapper.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl { @@ -90,7 +90,7 @@ public void Access(Accessor accessor) _accessorPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs index 6331a1af0d8..c25b283effc 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentNestedElementMapper.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl { @@ -95,7 +95,7 @@ public void Access(Accessor accessor) _accessorPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/ComponentParentMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ComponentParentMapper.cs index d0d0441754c..b577084053d 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ComponentParentMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ComponentParentMapper.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl { @@ -26,7 +26,7 @@ public void Access(Accessor accessor) accessorPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionPropertiesCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionPropertiesCustomizer.cs index 1d90c060422..2fea4e82f71 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionPropertiesCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionPropertiesCustomizer.cs @@ -1,8 +1,8 @@ using System; using System.Linq.Expressions; using System.Reflection; -using NHibernate.Id; using NHibernate.Persister.Collection; +using NHibernate.Properties; using NHibernate.UserTypes; namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl @@ -139,7 +139,7 @@ public void Access(System.Type accessorType) CustomizersHolder.AddCustomizer(PropertyPath, (ICollectionPropertiesMapper x) => x.Access(accessorType)); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs index 283ce8a5aad..9e958041a8f 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentAsIdCustomizer.cs @@ -1,5 +1,5 @@ using System; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl { @@ -35,7 +35,7 @@ public void Access(Accessor accessor) CustomizersHolder.AddCustomizer(PropertyPath, (IComponentAsIdAttributesMapper m) => m.Access(accessor)); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs index f4e81a86ada..24c01c43da9 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentCustomizer.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; using System.Reflection; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl { @@ -79,7 +79,7 @@ public void Access(Accessor accessor) AddCustomizer(m => m.Access(accessor)); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs index a6468ab9461..1e25467b0ae 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ComponentElementCustomizer.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; using System.Reflection; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl { @@ -113,7 +113,7 @@ public void Access(Accessor accessor) _customizersHolder.AddCustomizer(typeof (TComponent), (IComponentAttributesMapper x) => x.Access(accessor)); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs index c3a91755652..05f3b811eee 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs @@ -1,5 +1,5 @@ using System; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl { @@ -26,7 +26,7 @@ public void Access(Accessor accessor) CustomizersHolder.AddCustomizer(PropertyPath, (IDynamicComponentAttributesMapper m) => m.Access(accessor)); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs index c28e17a6e35..692450ffbb6 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/DynamicComponentMapper.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl { @@ -144,7 +144,7 @@ public void Access(Accessor accessor) accessorPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/IdBagMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/IdBagMapper.cs index f47ef2aa9cb..466e530d521 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/IdBagMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/IdBagMapper.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; using NHibernate.Persister.Collection; +using NHibernate.Properties; using NHibernate.UserTypes; namespace NHibernate.Mapping.ByCode.Impl @@ -223,7 +223,7 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs index 3f36cb04d1a..428958aabb6 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/IdMapper.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; using NHibernate.Type; namespace NHibernate.Mapping.ByCode.Impl @@ -50,7 +50,7 @@ public void Access(Accessor accessor) accessorMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } @@ -126,7 +126,7 @@ public void Access(Accessor accessor) {} public void Access(System.Type accessorType) {} - public void Access() where T : IIdentifierGenerator, new() {} + public void Access() where T : IPropertyAccessor, new() {} #endregion } diff --git a/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs index 9ff7e859b2e..c90a6a62f85 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl { @@ -137,7 +137,7 @@ public void Access(Accessor accessor) _entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs index 7ace9c982c6..6f8230818e3 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; using NHibernate.Type; using NHibernate.UserTypes; @@ -53,7 +53,7 @@ public void Access(System.Type accessorType) entityPropertyMapper.Access(accessorType); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/ListMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ListMapper.cs index 9b9975ab22e..9357df9d7db 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ListMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ListMapper.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; using NHibernate.Persister.Collection; +using NHibernate.Properties; using NHibernate.UserTypes; namespace NHibernate.Mapping.ByCode.Impl @@ -221,7 +221,7 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs index 864b2d0dd23..0e502e3b29e 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; using NHibernate.Util; namespace NHibernate.Mapping.ByCode.Impl @@ -135,7 +135,7 @@ public void Access(Accessor accessor) _entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs index ab3cdb8ec7d..2b7e8bf27fb 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/MapMapper.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; using NHibernate.Persister.Collection; +using NHibernate.Properties; using NHibernate.UserTypes; namespace NHibernate.Mapping.ByCode.Impl @@ -233,7 +233,7 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/NoMemberPropertyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/NoMemberPropertyMapper.cs index 32548ffc303..7b239e7e392 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/NoMemberPropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/NoMemberPropertyMapper.cs @@ -1,4 +1,4 @@ -using NHibernate.Id; +using NHibernate.Properties; namespace NHibernate.Mapping.ByCode.Impl { @@ -10,7 +10,7 @@ public void Access(Accessor accessor) {} public void Access(System.Type accessorType) {} - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() {} #endregion diff --git a/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs index f32780536b6..1ef2b57ec7a 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/OneToOneMapper.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; using NHibernate.Util; namespace NHibernate.Mapping.ByCode.Impl @@ -48,7 +48,7 @@ public void Access(Accessor accessor) _entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/PropertyMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/PropertyMapper.cs index 92ad8fce9f5..b088855ad8b 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/PropertyMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/PropertyMapper.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; using NHibernate.Type; using NHibernate.UserTypes; using NHibernate.Util; @@ -55,7 +55,7 @@ public PropertyMapper(MemberInfo member, HbmProperty propertyMapping) #region Implementation of IEntityPropertyMapper - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/SetMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/SetMapper.cs index 4d36dc7d43c..e71e08fdcd6 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/SetMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/SetMapper.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; using NHibernate.Persister.Collection; +using NHibernate.Properties; using NHibernate.UserTypes; namespace NHibernate.Mapping.ByCode.Impl @@ -218,7 +218,7 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); } diff --git a/src/NHibernate/Mapping/ByCode/Impl/VersionMapper.cs b/src/NHibernate/Mapping/ByCode/Impl/VersionMapper.cs index 2f20014002a..706f99e3b51 100644 --- a/src/NHibernate/Mapping/ByCode/Impl/VersionMapper.cs +++ b/src/NHibernate/Mapping/ByCode/Impl/VersionMapper.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; using NHibernate.Cfg.MappingSchema; -using NHibernate.Id; +using NHibernate.Properties; using NHibernate.Type; using NHibernate.UserTypes; @@ -149,7 +149,7 @@ public void Access(Accessor accessor) entityPropertyMapper.Access(accessor); } - public void Access() where T : IIdentifierGenerator, new() + public void Access() where T : IPropertyAccessor, new() { this.Access(typeof(T)); }