From 48317f151de02a9b24d9415af20da3e2f3329052 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Mon, 11 Mar 2024 20:46:13 +1000 Subject: [PATCH 1/2] Use expression bodied properties --- .../Entity.cs | 5 +- .../Fixtures/ReadOnlyEnumerableEntity.cs | 5 +- .../Automapping/Fixtures/UserTypes.cs | 12 +- .../ClassMapSpecs/ClassMapSpecs.Id.cs | 2 +- .../AutoMapping/TestFixtures.cs | 36 +-- .../Cfg/Db/CacheSettingsBuilderTester.cs | 5 +- .../Cfg/Db/ConnectionStringBuilderTester.cs | 5 +- .../RunnableConventionsTests.cs | 17 +- .../Mapping/ComponentPropertyMapTester.cs | 15 +- .../DomainModel/Mapping/OneToManyTester.cs | 3 +- .../DomainModel/Mapping/OneToOneTester.cs | 5 +- .../DomainModel/Mapping/PropertyPartTester.cs | 31 +-- .../DomainModel/MemberAccessResolverTests.cs | 13 +- .../DomainModel/MemberBackingFieldTests.cs | 20 +- .../FluentInterfaceTests/CustomPersister.cs | 209 +++++---------- .../SubclassMapWithUserTypeTests.cs | 13 +- .../MappingModel/AttributeStoreTester.cs | 12 +- ...PersistenceSpecificationExtensionsSpecs.cs | 5 +- .../Testing/PersistenceSpecificationTester.cs | 3 +- .../Testing/Values/Entities.cs | 10 +- .../Automapping/AutoPersistenceModel.cs | 10 +- .../Cfg/Db/DB2400Configuration.cs | 5 +- .../Cfg/Db/DB2Configuration.cs | 12 +- .../Cfg/Db/IfxDRDAConfiguration.cs | 15 +- .../Cfg/Db/IfxOdbcConfiguration.cs | 15 +- .../Cfg/Db/IfxSQLIConfiguration.cs | 15 +- .../Cfg/Db/IngresConfiguration.cs | 5 +- .../Cfg/Db/JetDriverConfiguration.cs | 5 +- .../Cfg/Db/MsSqlCeConfiguration.cs | 10 +- .../Cfg/Db/MsSqlConfiguration.cs | 25 +- .../Cfg/Db/MySQLConfiguration.cs | 5 +- .../Cfg/Db/OracleClientConfiguration.cs | 10 +- .../Cfg/Db/OracleConfiguration.cs | 15 +- .../Cfg/Db/OracleDataClientConfiguration.cs | 10 +- .../OracleManagedDataClientConfiguration.cs | 10 +- .../Cfg/Db/PostgreSQLConfiguration.cs | 20 +- .../Cfg/Db/SQLAnywhereConfiguration.cs | 31 +-- .../Cfg/Db/SQLiteConfiguration.cs | 5 +- .../Cfg/FluentMappingsContainer.cs | 10 +- .../Cfg/MappingConfiguration.cs | 13 +- .../Cfg/SetupConventionFinder.cs | 5 +- .../ConcreteAcceptanceCriteria.cs | 5 +- .../AcceptanceCriteria/InverseIs.cs | 5 +- .../Conventions/AcceptanceCriteria/Is.cs | 13 +- .../Conventions/Helpers/ConventionBuilder.cs | 30 +-- .../Conventions/Helpers/PrimaryKey.cs | 5 +- .../Conventions/Inspections/AnyInspector.cs | 55 +--- .../Conventions/Inspections/CacheInspector.cs | 25 +- .../Conventions/Inspections/ClassInspector.cs | 110 ++------ .../Inspections/CollectionInspector.cs | 115 ++------- .../Inspections/ColumnInspector.cs | 60 +---- .../Inspections/ComponentBaseInspector.cs | 55 +--- .../Inspections/ComponentInspector.cs | 5 +- .../Inspections/CompositeElementInspector.cs | 15 +- .../Inspections/CompositeIdentityInspector.cs | 35 +-- .../Inspections/DiscriminatorInspector.cs | 30 +-- .../Inspections/ElementInspector.cs | 20 +- .../Inspections/HibernateMappingInspector.cs | 40 +-- .../Inspections/IGeneratorInspector.cs | 20 +- .../Inspections/IdentityInspector.cs | 35 +-- .../Conventions/Inspections/IndexInspector.cs | 15 +- .../Inspections/IndexManyToManyInspector.cs | 22 +- .../Conventions/Inspections/JoinInspector.cs | 47 +--- .../Conventions/Inspections/JoinInstance.cs | 5 +- .../Inspections/JoinedSubclassInspector.cs | 75 ++---- .../Conventions/Inspections/KeyInspector.cs | 25 +- .../Inspections/KeyManyToOneInspector.cs | 40 +-- .../Inspections/KeyPropertyInspector.cs | 30 +-- .../Inspections/ManyToManyInspector.cs | 55 +--- .../Inspections/ManyToOneInspector.cs | 82 ++---- .../Inspections/MetaValueInspector.cs | 20 +- .../Inspections/OneToManyInspector.cs | 26 +- .../Inspections/OneToOneInspector.cs | 58 +---- .../Inspections/ParentInspector.cs | 15 +- .../Inspections/PropertyInspector.cs | 60 +---- .../Inspections/SubclassInspector.cs | 65 +---- .../Inspections/VersionInspector.cs | 35 +-- .../Instances/CollectionInstance.cs | 5 +- .../Instances/ManyToManyCollectionInstance.cs | 20 +- .../Instances/OneToManyCollectionInstance.cs | 15 +- src/FluentNHibernate/DummyMethodInfo.cs | 25 +- src/FluentNHibernate/DummyPropertyInfo.cs | 35 +-- src/FluentNHibernate/Mapping/CachePart.cs | 5 +- .../Mapping/ClasslikeMapBase.cs | 15 +- .../Mapping/ColumnMappingCollection.cs | 5 +- src/FluentNHibernate/Mapping/ComponentMap.cs | 5 +- .../Mapping/FilterDefinition.cs | 5 +- src/FluentNHibernate/Mapping/IdentityPart.cs | 5 +- .../Mapping/ManyToManyPart.cs | 5 +- src/FluentNHibernate/Mapping/Member.cs | 239 +++++------------- src/FluentNHibernate/Mapping/OneToManyPart.cs | 5 +- .../Mapping/ReferenceComponentPart.cs | 5 +- src/FluentNHibernate/Mapping/SubclassMap.cs | 10 +- .../MappingModel/AnyMapping.cs | 60 +---- .../MappingModel/CacheMapping.cs | 15 +- .../MappingModel/ClassBased/ClassMapping.cs | 140 ++-------- .../ClassBased/ClassMappingBase.cs | 50 +--- .../ClassBased/ComponentMapping.cs | 25 +- .../ClassBased/ComponentMappingBase.cs | 30 +-- .../ClassBased/ReferenceComponentMapping.cs | 106 ++------ .../ClassBased/SubclassMapping.cs | 90 ++----- .../Collections/CollectionMapping.cs | 135 ++-------- .../Collections/CompositeElementMapping.cs | 25 +- .../Collections/ElementMapping.cs | 15 +- .../Collections/IndexManyToManyMapping.cs | 20 +- .../MappingModel/Collections/IndexMapping.cs | 15 +- .../Collections/ManyToManyMapping.cs | 60 +---- .../NestedCompositeElementMapping.cs | 10 +- .../Collections/OneToManyMapping.cs | 20 +- .../MappingModel/ColumnBasedMappingBase.cs | 5 +- .../MappingModel/ColumnMapping.cs | 60 +---- .../MappingModel/DiscriminatorMapping.cs | 20 +- .../MappingModel/FilterDefinitionMapping.cs | 10 +- .../MappingModel/FilterMapping.cs | 10 +- .../MappingModel/HibernateMapping.cs | 55 +--- .../Identity/CompositeIdMapping.cs | 30 +-- .../MappingModel/Identity/GeneratorMapping.cs | 5 +- .../MappingModel/Identity/IdMapping.cs | 25 +- .../Identity/KeyManyToOneMapping.cs | 43 +--- .../Identity/KeyPropertyMapping.cs | 25 +- .../MappingModel/ImportMapping.cs | 10 +- .../MappingModel/JoinMapping.cs | 65 +---- .../MappingModel/KeyMapping.cs | 35 +-- .../MappingModel/ManyToOneMapping.cs | 77 ++---- .../MappingModel/MetaValueMapping.cs | 10 +- .../MappingModel/NaturalIdMapping.cs | 15 +- .../MappingModel/OneToOneMapping.cs | 51 +--- .../MappingModel/ParentMapping.cs | 10 +- .../MappingModel/PropertyMapping.cs | 45 +--- .../MappingModel/StoredProcedureMapping.cs | 25 +- .../MappingModel/TuplizerMapping.cs | 15 +- .../MappingModel/TypeReference.cs | 15 +- .../MappingModel/VersionMapping.cs | 25 +- src/FluentNHibernate/PersistenceModel.cs | 4 +- src/FluentNHibernate/Testing/Values/List.cs | 2 +- .../Testing/Values/Property.cs | 2 +- .../Utils/Reflection/PropertyChain.cs | 15 +- .../Utils/Reflection/SingleMember.cs | 15 +- 138 files changed, 856 insertions(+), 3118 deletions(-) diff --git a/src/FluentNHibernate.Specs.ExternalFixtures/Entity.cs b/src/FluentNHibernate.Specs.ExternalFixtures/Entity.cs index c93248f11..20510c2ff 100644 --- a/src/FluentNHibernate.Specs.ExternalFixtures/Entity.cs +++ b/src/FluentNHibernate.Specs.ExternalFixtures/Entity.cs @@ -15,10 +15,7 @@ public class Entity public enum TestEnum {} - public EntityChild ReadOnlyChild - { - get { return readOnlyChild; } - } + public EntityChild ReadOnlyChild => readOnlyChild; } public class EntityChild diff --git a/src/FluentNHibernate.Specs/Automapping/Fixtures/ReadOnlyEnumerableEntity.cs b/src/FluentNHibernate.Specs/Automapping/Fixtures/ReadOnlyEnumerableEntity.cs index 07a761575..6017af111 100644 --- a/src/FluentNHibernate.Specs/Automapping/Fixtures/ReadOnlyEnumerableEntity.cs +++ b/src/FluentNHibernate.Specs/Automapping/Fixtures/ReadOnlyEnumerableEntity.cs @@ -9,8 +9,5 @@ class ReadOnlyEnumerableEntity public int Id { get; set; } public IEnumerable AutoPropertyCollection { get; private set; } - public IEnumerable BackingFieldCollection - { - get { return backingFieldCollection; } - } + public IEnumerable BackingFieldCollection => backingFieldCollection; } diff --git a/src/FluentNHibernate.Specs/Automapping/Fixtures/UserTypes.cs b/src/FluentNHibernate.Specs/Automapping/Fixtures/UserTypes.cs index 11cfcb252..7f3443de0 100644 --- a/src/FluentNHibernate.Specs/Automapping/Fixtures/UserTypes.cs +++ b/src/FluentNHibernate.Specs/Automapping/Fixtures/UserTypes.cs @@ -102,15 +102,9 @@ public SqlType[] SqlTypes get { return new[] { new SqlType(DbType.String) }; } } - public Type ReturnedType - { - get { return typeof(CustomUserType); } - } + public Type ReturnedType => typeof(CustomUserType); - public bool IsMutable - { - get { return true; } - } + public bool IsMutable => true; } public struct UserValueType : IUserType @@ -169,6 +163,6 @@ public void NullSafeSet(DbCommand cmd, object value, int index, ISessionImplemen } public SqlType[] SqlTypes { get; private set; } - public Type ReturnedType { get { return typeof(UserValueType); } } + public Type ReturnedType => typeof(UserValueType); public bool IsMutable { get; private set; } } diff --git a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Id.cs b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Id.cs index 73b5e1a7d..8cd35ae78 100644 --- a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Id.cs +++ b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Id.cs @@ -30,7 +30,7 @@ public class when_class_map_is_told_to_map_an_id_without_a_property_or_column : static ClassMapping mapping; - static IdMapping Id { get { return mapping.Id as IdMapping; }} + static IdMapping Id => mapping.Id as IdMapping; } public class when_class_map_has_a_composite_id_with_a_key_reference_with_multiple_columns : ProviderSpec diff --git a/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs b/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs index 84319fd6f..954d37412 100644 --- a/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs +++ b/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs @@ -43,13 +43,7 @@ public class ExampleCustomColumn { public int Id { get; set; } public int ExampleCustomColumnId { get; set; } - public int CustomColumn - { - get - { - return 12; - } - } + public int CustomColumn => 12; } public class ExampleInheritedClass : ExampleClass @@ -306,15 +300,9 @@ public SqlType[] SqlTypes get { return new[] {new SqlType(DbType.String)}; } } - public Type ReturnedType - { - get { return typeof(Custom); } - } + public Type ReturnedType => typeof(Custom); - public bool IsMutable - { - get { return true; } - } + public bool IsMutable => true; } } @@ -322,10 +310,7 @@ namespace FluentNHibernate.Automapping.TestFixtures.CustomCompositeTypes { public class DoubleStringType : ICompositeUserType { - public System.Type ReturnedClass - { - get { return typeof(string[]); } - } + public System.Type ReturnedClass => typeof(string[]); public new bool Equals(object x, object y) { @@ -357,10 +342,7 @@ public Object DeepCopy(Object x) return result; } - public bool IsMutable - { - get { return true; } - } + public bool IsMutable => true; public object NullSafeGet(DbDataReader dr, string[] names, ISessionImplementor session, object owner) { @@ -431,13 +413,7 @@ public class SuperType public class ExampleCustomColumn : SuperType { public int ExampleCustomColumnId { get; set; } - public int CustomColumn - { - get - { - return 12; - } - } + public int CustomColumn => 12; } public class ExampleInheritedClass : ExampleClass diff --git a/src/FluentNHibernate.Testing/Cfg/Db/CacheSettingsBuilderTester.cs b/src/FluentNHibernate.Testing/Cfg/Db/CacheSettingsBuilderTester.cs index 997bdd573..e2d614b21 100644 --- a/src/FluentNHibernate.Testing/Cfg/Db/CacheSettingsBuilderTester.cs +++ b/src/FluentNHibernate.Testing/Cfg/Db/CacheSettingsBuilderTester.cs @@ -111,9 +111,6 @@ private void HasProperty(string key, string value) private class CacheSettingsBuilderDouble : CacheSettingsBuilder { - public IDictionary Properties - { - get { return Create(); } - } + public IDictionary Properties => Create(); } } diff --git a/src/FluentNHibernate.Testing/Cfg/Db/ConnectionStringBuilderTester.cs b/src/FluentNHibernate.Testing/Cfg/Db/ConnectionStringBuilderTester.cs index 4a41df0ac..bb9e53779 100644 --- a/src/FluentNHibernate.Testing/Cfg/Db/ConnectionStringBuilderTester.cs +++ b/src/FluentNHibernate.Testing/Cfg/Db/ConnectionStringBuilderTester.cs @@ -41,9 +41,6 @@ public void ConnectionStringSetFromConnectionStrings() private class ConnectionStringBuilderDouble : ConnectionStringBuilder { - public string ConnectionString - { - get { return Create(); } - } + public string ConnectionString => Create(); } } diff --git a/src/FluentNHibernate.Testing/ConventionsTests/RunnableConventionsTests.cs b/src/FluentNHibernate.Testing/ConventionsTests/RunnableConventionsTests.cs index 5de934f31..1119adc9f 100644 --- a/src/FluentNHibernate.Testing/ConventionsTests/RunnableConventionsTests.cs +++ b/src/FluentNHibernate.Testing/ConventionsTests/RunnableConventionsTests.cs @@ -692,18 +692,11 @@ public void NullSafeSet(DbCommand cmd, object value, int index, ISessionImplemen throw new NotImplementedException(); } - public SqlType[] SqlTypes - { - get { return null; } - } - public Type ReturnedType - { - get { return typeof(OtherObject); } - } - public bool IsMutable - { - get { return false; } - } + public SqlType[] SqlTypes => null; + + public Type ReturnedType => typeof(OtherObject); + + public bool IsMutable => false; } #endregion diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/ComponentPropertyMapTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/ComponentPropertyMapTester.cs index 5dde2a92d..6311b6ead 100644 --- a/src/FluentNHibernate.Testing/DomainModel/Mapping/ComponentPropertyMapTester.cs +++ b/src/FluentNHibernate.Testing/DomainModel/Mapping/ComponentPropertyMapTester.cs @@ -257,20 +257,11 @@ public void NullSafeSet(DbCommand cmd, object value, int index, ISessionImplemen throw new NotImplementedException(); } - public SqlType[] SqlTypes - { - get { return null; } - } + public SqlType[] SqlTypes => null; - public Type ReturnedType - { - get { return null; } - } + public Type ReturnedType => null; - public bool IsMutable - { - get { return false; } - } + public bool IsMutable => false; } #endregion } diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToManyTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToManyTester.cs index 100ec7a51..3b8fc7a15 100644 --- a/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToManyTester.cs +++ b/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToManyTester.cs @@ -43,8 +43,7 @@ public class OneToManyTarget public virtual IList GetOtherChildren() { return otherChildren; } private IList listToArrayChild = new List(); - public virtual ChildObject[] ListToArrayChild { get { return listToArrayChild.ToArray(); } } - + public virtual ChildObject[] ListToArrayChild => listToArrayChild.ToArray(); } public class ValueObject diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToOneTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToOneTester.cs index 85ad9f516..1ee123ea4 100644 --- a/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToOneTester.cs +++ b/src/FluentNHibernate.Testing/DomainModel/Mapping/OneToOneTester.cs @@ -90,10 +90,7 @@ private class UserLoginInfo : IUserLoginInfo { } private class User { public int Id { get; set; } - public IUserLoginInfo LoginInfo - { - get { return null; } - } + public IUserLoginInfo LoginInfo => null; } diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/PropertyPartTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/PropertyPartTester.cs index c717fb0ff..ec001e362 100644 --- a/src/FluentNHibernate.Testing/DomainModel/Mapping/PropertyPartTester.cs +++ b/src/FluentNHibernate.Testing/DomainModel/Mapping/PropertyPartTester.cs @@ -506,20 +506,11 @@ public void NullSafeSet(DbCommand cmd, object value, int index, ISessionImplemen throw new NotImplementedException(); } - public SqlType[] SqlTypes - { - get { return null; } - } + public SqlType[] SqlTypes => null; - public Type ReturnedType - { - get { return null; } - } + public Type ReturnedType => null; - public bool IsMutable - { - get { return false; } - } + public bool IsMutable => false; } public class CustomGenericTypeForTesting : IUserType @@ -576,14 +567,9 @@ public SqlType[] SqlTypes { get { return new SqlType[] {}; } } - public Type ReturnedType - { - get { return null; } - } - public bool IsMutable - { - get { return false; } - } + public Type ReturnedType => null; + + public bool IsMutable => false; } #endregion } @@ -664,8 +650,5 @@ public ISetter GetSetter(Type theClass, string propertyName) return null; } - public bool CanAccessThroughReflectionOptimizer - { - get { return false; } - } + public bool CanAccessThroughReflectionOptimizer => false; } diff --git a/src/FluentNHibernate.Testing/DomainModel/MemberAccessResolverTests.cs b/src/FluentNHibernate.Testing/DomainModel/MemberAccessResolverTests.cs index db43f9f71..d3638ae59 100644 --- a/src/FluentNHibernate.Testing/DomainModel/MemberAccessResolverTests.cs +++ b/src/FluentNHibernate.Testing/DomainModel/MemberAccessResolverTests.cs @@ -72,20 +72,17 @@ class Example public string Property { - get { return property; } - set { property = value; } + get => property; + set => property = value; } public string PropertyPrivateSetter { - get { return propertyPrivateSetter; } - private set { propertyPrivateSetter = value; } + get => propertyPrivateSetter; + private set => propertyPrivateSetter = value; } - public string PropertyNoSetter - { - get { return propertyNoSetter; } - } + public string PropertyNoSetter => propertyNoSetter; public IEnumerable GetViaMethod() { diff --git a/src/FluentNHibernate.Testing/DomainModel/MemberBackingFieldTests.cs b/src/FluentNHibernate.Testing/DomainModel/MemberBackingFieldTests.cs index 53bb55a62..a95bfd550 100644 --- a/src/FluentNHibernate.Testing/DomainModel/MemberBackingFieldTests.cs +++ b/src/FluentNHibernate.Testing/DomainModel/MemberBackingFieldTests.cs @@ -138,25 +138,13 @@ class Example IEnumerable lowercasemethod; IEnumerable _UnderscorePascalCaseMethod; - public string PropertyWithCamelCaseField - { - get { return propertyWithCamelCaseField; } - } + public string PropertyWithCamelCaseField => propertyWithCamelCaseField; - public string PropertyWithLowerCaseField - { - get { return propertywithlowercasefield; } - } + public string PropertyWithLowerCaseField => propertywithlowercasefield; - public string PropertyWithUnderscoreCamelCaseField - { - get { return _propertyWithUnderscoreCamelCaseField; } - } + public string PropertyWithUnderscoreCamelCaseField => _propertyWithUnderscoreCamelCaseField; - public string PropertyWithUnderscorePascalCaseField - { - get { return _PropertyWithUnderscorePascalCaseField; } - } + public string PropertyWithUnderscorePascalCaseField => _PropertyWithUnderscorePascalCaseField; public IEnumerable CamelCaseMethod() { diff --git a/src/FluentNHibernate.Testing/FluentInterfaceTests/CustomPersister.cs b/src/FluentNHibernate.Testing/FluentInterfaceTests/CustomPersister.cs index b9196b7f7..727e26575 100644 --- a/src/FluentNHibernate.Testing/FluentInterfaceTests/CustomPersister.cs +++ b/src/FluentNHibernate.Testing/FluentInterfaceTests/CustomPersister.cs @@ -343,22 +343,14 @@ public IEntityPersister GetSubclassEntityPersister(object instance, ISessionFact throw new NotImplementedException(); } - public ISessionFactoryImplementor Factory - { - get { return null; } - } - public string RootEntityName - { - get { return null; } - } - public string EntityName - { - get { return null; } - } - public EntityMetamodel EntityMetamodel - { - get { return null; } - } + public ISessionFactoryImplementor Factory => null; + + public string RootEntityName => null; + + public string EntityName => null; + + public EntityMetamodel EntityMetamodel => null; + public string[] PropertySpaces { get { return new string[] {}; } @@ -367,38 +359,24 @@ public string[] QuerySpaces { get { return new string[] {}; } } - public bool IsMutable - { - get { return false; } - } - public bool IsInherited - { - get { return false; } - } - public bool IsIdentifierAssignedByInsert - { - get { return false; } - } - bool IEntityPersister.IsVersioned - { - get { return false; } - } - public IVersionType VersionType - { - get { return null; } - } - public int VersionProperty - { - get { return 0; } - } + public bool IsMutable => false; + + public bool IsInherited => false; + + public bool IsIdentifierAssignedByInsert => false; + + bool IEntityPersister.IsVersioned => false; + + public IVersionType VersionType => null; + + public int VersionProperty => 0; + public int[] NaturalIdentifierProperties { get { return new int[] {}; } } - public IIdentifierGenerator IdentifierGenerator - { - get { return null; } - } + public IIdentifierGenerator IdentifierGenerator => null; + public IType[] PropertyTypes { get { return new IType[] {}; } @@ -439,106 +417,57 @@ public CascadeStyle[] PropertyCascadeStyles { get { return new CascadeStyle[] {}; } } - public IType IdentifierType - { - get { return null; } - } - public string IdentifierPropertyName - { - get { return null; } - } - public bool IsCacheInvalidationRequired - { - get { return false; } - } - public bool IsLazyPropertiesCacheable - { - get { return false; } - } - public ICacheConcurrencyStrategy Cache - { - get { return null; } - } - public ICacheEntryStructure CacheEntryStructure - { - get { return null; } - } - public IClassMetadata ClassMetadata - { - get { return null; } - } - public bool IsBatchLoadable - { - get { return false; } - } - public bool IsSelectBeforeUpdateRequired - { - get { return false; } - } - public bool IsVersionPropertyGenerated - { - get { return false; } - } - public bool HasProxy - { - get { return false; } - } - public bool HasCollections - { - get { return false; } - } - public bool HasMutableProperties - { - get { return false; } - } - public bool HasSubselectLoadableCollections - { - get { return false; } - } - public bool HasCascades - { - get { return false; } - } - public bool HasIdentifierProperty - { - get { return false; } - } - public bool CanExtractIdOutOfEntity - { - get { return false; } - } - public bool HasNaturalIdentifier - { - get { return false; } - } - public bool HasLazyProperties - { - get { return false; } - } + public IType IdentifierType => null; + + public string IdentifierPropertyName => null; + + public bool IsCacheInvalidationRequired => false; + + public bool IsLazyPropertiesCacheable => false; + + public ICacheConcurrencyStrategy Cache => null; + + public ICacheEntryStructure CacheEntryStructure => null; + + public IClassMetadata ClassMetadata => null; + + public bool IsBatchLoadable => false; + + public bool IsSelectBeforeUpdateRequired => false; + + public bool IsVersionPropertyGenerated => false; + + public bool HasProxy => false; + + public bool HasCollections => false; + + public bool HasMutableProperties => false; + + public bool HasSubselectLoadableCollections => false; + + public bool HasCascades => false; + + public bool HasIdentifierProperty => false; + + public bool CanExtractIdOutOfEntity => false; + + public bool HasNaturalIdentifier => false; + + public bool HasLazyProperties => false; + public bool[] PropertyUpdateability { get { return new bool[] {}; } } - public bool HasCache - { - get { return false; } - } - public bool HasInsertGeneratedProperties - { - get { return false; } - } - public bool HasUpdateGeneratedProperties - { - get { return false; } - } - bool IOptimisticCacheSource.IsVersioned - { - get { return false; } - } - public IComparer VersionComparator - { - get { return null; } - } + public bool HasCache => false; + + public bool HasInsertGeneratedProperties => false; + + public bool HasUpdateGeneratedProperties => false; + + bool IOptimisticCacheSource.IsVersioned => false; + + public IComparer VersionComparator => null; bool IEntityPersister.IsInstrumented => throw new NotImplementedException(); diff --git a/src/FluentNHibernate.Testing/FluentInterfaceTests/SubclassMapWithUserTypeTests.cs b/src/FluentNHibernate.Testing/FluentInterfaceTests/SubclassMapWithUserTypeTests.cs index dd09e38a0..c1eb74fe7 100644 --- a/src/FluentNHibernate.Testing/FluentInterfaceTests/SubclassMapWithUserTypeTests.cs +++ b/src/FluentNHibernate.Testing/FluentInterfaceTests/SubclassMapWithUserTypeTests.cs @@ -64,7 +64,7 @@ public class Image : Media public virtual int Width { get; set; } public virtual int Height { get; set; } - public virtual IList Contexts { get { return contexts; } } + public virtual IList Contexts => contexts; } public class ImageMap : SubclassMap @@ -142,14 +142,9 @@ public object Disassemble(object value) throw new NotImplementedException(); } - public Type ReturnedType - { - get { return typeof(IList); } - } - public bool IsMutable - { - get { throw new NotImplementedException(); } - } + public Type ReturnedType => typeof(IList); + + public bool IsMutable => throw new NotImplementedException(); public SqlType[] SqlTypes { diff --git a/src/FluentNHibernate.Testing/MappingModel/AttributeStoreTester.cs b/src/FluentNHibernate.Testing/MappingModel/AttributeStoreTester.cs index fd415a179..064a61a72 100644 --- a/src/FluentNHibernate.Testing/MappingModel/AttributeStoreTester.cs +++ b/src/FluentNHibernate.Testing/MappingModel/AttributeStoreTester.cs @@ -8,15 +8,9 @@ public class AttributeStoreTester { private sealed class TestStore : AttributeStore { - public bool IsSomething - { - get { return this.GetOrDefault("IsSomething"); } - } - - public string Name - { - get { return this.GetOrDefault("Name"); } - } + public bool IsSomething => this.GetOrDefault("IsSomething"); + + public string Name => this.GetOrDefault("Name"); } [Test] diff --git a/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationExtensionsSpecs.cs b/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationExtensionsSpecs.cs index 2d85b4ea1..99e8ebc6b 100644 --- a/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationExtensionsSpecs.cs +++ b/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationExtensionsSpecs.cs @@ -24,10 +24,7 @@ public InspectablePersistenceSpecification(ISession session) : base(session) public InspectablePersistenceSpecification(ISession session, IEqualityComparer entityEqualityComparer) : base(session, entityEqualityComparer) {} - public List> AllProperties - { - get { return allProperties; } - } + public List> AllProperties => allProperties; } public abstract class With_persistence_specification : Specification diff --git a/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationTester.cs b/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationTester.cs index 444f1d5d3..4c388e085 100644 --- a/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationTester.cs +++ b/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationTester.cs @@ -24,7 +24,8 @@ public Cat() AllKittens = new List(); } - public IEnumerable EnumerableOfKittens { get { return AllKittens; } } + public IEnumerable EnumerableOfKittens => AllKittens; + public void AddKitten(Kitten kitten) { AllKittens.Add(kitten); diff --git a/src/FluentNHibernate.Testing/Testing/Values/Entities.cs b/src/FluentNHibernate.Testing/Testing/Values/Entities.cs index f79a96380..2cd25d536 100644 --- a/src/FluentNHibernate.Testing/Testing/Values/Entities.cs +++ b/src/FluentNHibernate.Testing/Testing/Values/Entities.cs @@ -22,10 +22,7 @@ public ListEntity() public IEnumerable GetterAndSetter { get; set; } public IEnumerable GetterAndPrivateSetter { get; private set; } - public IEnumerable BackingField - { - get { return backingField; } - } + public IEnumerable BackingField => backingField; public ISet TypedSet { get; set; } //public ISet Set { get; set; } @@ -62,10 +59,7 @@ public class PropertyEntity public string GetterAndSetter { get; set; } public string GetterAndPrivateSetter { get; private set; } - public string BackingField - { - get { return backingField; } - } + public string BackingField => backingField; public void SetBackingField(string value) { diff --git a/src/FluentNHibernate/Automapping/AutoPersistenceModel.cs b/src/FluentNHibernate/Automapping/AutoPersistenceModel.cs index b3790320c..9a39f571c 100644 --- a/src/FluentNHibernate/Automapping/AutoPersistenceModel.cs +++ b/src/FluentNHibernate/Automapping/AutoPersistenceModel.cs @@ -97,10 +97,7 @@ public AutoPersistenceModel UseOverridesFromAssembly(Assembly assembly) /// /// Alter convention discovery /// - public new SetupConventionFinder Conventions - { - get { return new SetupConventionFinder(this, base.Conventions); } - } + public new SetupConventionFinder Conventions => new(this, base.Conventions); /// /// Alter some of the configuration options that control how the automapper works. @@ -471,10 +468,7 @@ protected override string GetMappingFileName() return "AutoMappings.hbm.xml"; } - bool HasUserDefinedConfiguration - { - get { return !(cfg is ExpressionBasedAutomappingConfiguration); } - } + bool HasUserDefinedConfiguration => !(cfg is ExpressionBasedAutomappingConfiguration); } public class AutomappedComponentResolver : IComponentReferenceResolver diff --git a/src/FluentNHibernate/Cfg/Db/DB2400Configuration.cs b/src/FluentNHibernate/Cfg/Db/DB2400Configuration.cs index 0dbc34486..fd13c6a7c 100644 --- a/src/FluentNHibernate/Cfg/Db/DB2400Configuration.cs +++ b/src/FluentNHibernate/Cfg/Db/DB2400Configuration.cs @@ -10,8 +10,5 @@ protected DB2400Configuration() Driver(); } - public static DB2400Configuration Standard - { - get { return new DB2400Configuration().Dialect(); } - } + public static DB2400Configuration Standard => new DB2400Configuration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/DB2Configuration.cs b/src/FluentNHibernate/Cfg/Db/DB2Configuration.cs index e80a925bc..2238e6413 100644 --- a/src/FluentNHibernate/Cfg/Db/DB2Configuration.cs +++ b/src/FluentNHibernate/Cfg/Db/DB2Configuration.cs @@ -10,16 +10,10 @@ protected DB2Configuration() Driver(); } - public static DB2Configuration Standard - { - get { return new DB2Configuration().Dialect(); } - } - + public static DB2Configuration Standard => new DB2Configuration().Dialect(); + /// /// DB2 Data Server/Client supports Informix 11.50+ with Informix syntax /// - public static DB2Configuration Informix1150 - { - get { return new DB2Configuration().Dialect(); } - } + public static DB2Configuration Informix1150 => new DB2Configuration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/IfxDRDAConfiguration.cs b/src/FluentNHibernate/Cfg/Db/IfxDRDAConfiguration.cs index f8753d511..234416349 100644 --- a/src/FluentNHibernate/Cfg/Db/IfxDRDAConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/IfxDRDAConfiguration.cs @@ -10,18 +10,9 @@ protected IfxDRDAConfiguration() Driver(); } - public static IfxDRDAConfiguration Informix - { - get { return new IfxDRDAConfiguration().Dialect(); } - } + public static IfxDRDAConfiguration Informix => new IfxDRDAConfiguration().Dialect(); - public static IfxDRDAConfiguration Informix0940 - { - get { return new IfxDRDAConfiguration().Dialect(); } - } + public static IfxDRDAConfiguration Informix0940 => new IfxDRDAConfiguration().Dialect(); - public static IfxDRDAConfiguration Informix1000 - { - get { return new IfxDRDAConfiguration().Dialect(); } - } + public static IfxDRDAConfiguration Informix1000 => new IfxDRDAConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/IfxOdbcConfiguration.cs b/src/FluentNHibernate/Cfg/Db/IfxOdbcConfiguration.cs index 35740b1f2..98446c0b8 100644 --- a/src/FluentNHibernate/Cfg/Db/IfxOdbcConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/IfxOdbcConfiguration.cs @@ -10,18 +10,9 @@ protected IfxOdbcConfiguration() Driver(); } - public static IfxOdbcConfiguration Informix - { - get { return new IfxOdbcConfiguration().Dialect(); } - } + public static IfxOdbcConfiguration Informix => new IfxOdbcConfiguration().Dialect(); - public static IfxOdbcConfiguration Informix0940 - { - get { return new IfxOdbcConfiguration().Dialect(); } - } + public static IfxOdbcConfiguration Informix0940 => new IfxOdbcConfiguration().Dialect(); - public static IfxOdbcConfiguration Informix1000 - { - get { return new IfxOdbcConfiguration().Dialect(); } - } + public static IfxOdbcConfiguration Informix1000 => new IfxOdbcConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/IfxSQLIConfiguration.cs b/src/FluentNHibernate/Cfg/Db/IfxSQLIConfiguration.cs index d483b0a9b..86c73efc2 100644 --- a/src/FluentNHibernate/Cfg/Db/IfxSQLIConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/IfxSQLIConfiguration.cs @@ -10,18 +10,9 @@ protected IfxSQLIConfiguration() Driver(); } - public static IfxSQLIConfiguration Informix - { - get { return new IfxSQLIConfiguration().Dialect(); } - } + public static IfxSQLIConfiguration Informix => new IfxSQLIConfiguration().Dialect(); - public static IfxSQLIConfiguration Informix0940 - { - get { return new IfxSQLIConfiguration().Dialect(); } - } + public static IfxSQLIConfiguration Informix0940 => new IfxSQLIConfiguration().Dialect(); - public static IfxSQLIConfiguration Informix1000 - { - get { return new IfxSQLIConfiguration().Dialect(); } - } + public static IfxSQLIConfiguration Informix1000 => new IfxSQLIConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/IngresConfiguration.cs b/src/FluentNHibernate/Cfg/Db/IngresConfiguration.cs index aaffe0c5e..597556f7c 100644 --- a/src/FluentNHibernate/Cfg/Db/IngresConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/IngresConfiguration.cs @@ -10,8 +10,5 @@ protected IngresConfiguration() Driver(); } - public static IngresConfiguration Standard - { - get { return new IngresConfiguration().Dialect(); } - } + public static IngresConfiguration Standard => new IngresConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/JetDriverConfiguration.cs b/src/FluentNHibernate/Cfg/Db/JetDriverConfiguration.cs index cfea8a610..68689f085 100644 --- a/src/FluentNHibernate/Cfg/Db/JetDriverConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/JetDriverConfiguration.cs @@ -8,8 +8,5 @@ protected JetDriverConfiguration() Driver("NHibernate.JetDriver.JetDriver, NHibernate.JetDriver"); } - public static JetDriverConfiguration Standard - { - get { return new JetDriverConfiguration(); } - } + public static JetDriverConfiguration Standard => new(); } diff --git a/src/FluentNHibernate/Cfg/Db/MsSqlCeConfiguration.cs b/src/FluentNHibernate/Cfg/Db/MsSqlCeConfiguration.cs index d19971244..1e9e8e0b8 100644 --- a/src/FluentNHibernate/Cfg/Db/MsSqlCeConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/MsSqlCeConfiguration.cs @@ -10,13 +10,7 @@ protected MsSqlCeConfiguration() Driver(); } - public static MsSqlCeConfiguration Standard - { - get { return new MsSqlCeConfiguration().Dialect(); } - } + public static MsSqlCeConfiguration Standard => new MsSqlCeConfiguration().Dialect(); - public static MsSqlCeConfiguration MsSqlCe40 - { - get { return new MsSqlCeConfiguration().Dialect(); } - } + public static MsSqlCeConfiguration MsSqlCe40 => new MsSqlCeConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/MsSqlConfiguration.cs b/src/FluentNHibernate/Cfg/Db/MsSqlConfiguration.cs index c056a34e4..f30166826 100644 --- a/src/FluentNHibernate/Cfg/Db/MsSqlConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/MsSqlConfiguration.cs @@ -10,28 +10,13 @@ protected MsSqlConfiguration() Driver(); } - public static MsSqlConfiguration MsSql7 - { - get { return new MsSqlConfiguration().Dialect(); } - } + public static MsSqlConfiguration MsSql7 => new MsSqlConfiguration().Dialect(); - public static MsSqlConfiguration MsSql2000 - { - get { return new MsSqlConfiguration().Dialect(); } - } + public static MsSqlConfiguration MsSql2000 => new MsSqlConfiguration().Dialect(); - public static MsSqlConfiguration MsSql2005 - { - get { return new MsSqlConfiguration().Dialect(); } - } + public static MsSqlConfiguration MsSql2005 => new MsSqlConfiguration().Dialect(); - public static MsSqlConfiguration MsSql2008 - { - get { return new MsSqlConfiguration().Dialect(); } - } + public static MsSqlConfiguration MsSql2008 => new MsSqlConfiguration().Dialect(); - public static MsSqlConfiguration MsSql2012 - { - get { return new MsSqlConfiguration().Dialect(); } - } + public static MsSqlConfiguration MsSql2012 => new MsSqlConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/MySQLConfiguration.cs b/src/FluentNHibernate/Cfg/Db/MySQLConfiguration.cs index cb8bc8855..10c848bf3 100644 --- a/src/FluentNHibernate/Cfg/Db/MySQLConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/MySQLConfiguration.cs @@ -10,8 +10,5 @@ protected MySQLConfiguration() Driver(); } - public static MySQLConfiguration Standard - { - get { return new MySQLConfiguration().Dialect(); } - } + public static MySQLConfiguration Standard => new MySQLConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/OracleClientConfiguration.cs b/src/FluentNHibernate/Cfg/Db/OracleClientConfiguration.cs index 6e801c157..303402f7b 100644 --- a/src/FluentNHibernate/Cfg/Db/OracleClientConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/OracleClientConfiguration.cs @@ -17,18 +17,12 @@ protected OracleClientConfiguration() /// Initializes a new instance of the class using the /// MS Oracle Client (System.Data.OracleClient) library specifying the Oracle 9i dialect. /// - public static OracleClientConfiguration Oracle9 - { - get { return new OracleClientConfiguration().Dialect(); } - } + public static OracleClientConfiguration Oracle9 => new OracleClientConfiguration().Dialect(); /// /// Initializes a new instance of the class using the /// MS Oracle Client (System.Data.OracleClient) library specifying the Oracle 10g dialect. /// This allows for ANSI join syntax. /// - public static OracleClientConfiguration Oracle10 - { - get { return new OracleClientConfiguration().Dialect(); } - } + public static OracleClientConfiguration Oracle10 => new OracleClientConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/OracleConfiguration.cs b/src/FluentNHibernate/Cfg/Db/OracleConfiguration.cs index d5ca28401..0359e982c 100644 --- a/src/FluentNHibernate/Cfg/Db/OracleConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/OracleConfiguration.cs @@ -17,20 +17,14 @@ protected OracleConfiguration() /// Oracle Data Provider (Oracle.DataAccess) library specifying the Oracle 8i dialect. /// The Oracle.DataAccess library must be available to the calling application/library. /// - public static OracleConfiguration Oracle8 - { - get { return new OracleConfiguration().Dialect(); } - } + public static OracleConfiguration Oracle8 => new OracleConfiguration().Dialect(); /// /// Initializes a new instance of the class using the /// Oracle Data Provider (Oracle.DataAccess) library specifying the Oracle 9i dialect. /// The Oracle.DataAccess library must be available to the calling application/library. /// - public static OracleConfiguration Oracle9 - { - get { return new OracleConfiguration().Dialect(); } - } + public static OracleConfiguration Oracle9 => new OracleConfiguration().Dialect(); /// /// Initializes a new instance of the class using the @@ -38,8 +32,5 @@ public static OracleConfiguration Oracle9 /// The Oracle.DataAccess library must be available to the calling application/library. /// This allows for ANSI join syntax. /// - public static OracleConfiguration Oracle10 - { - get { return new OracleConfiguration().Dialect(); } - } + public static OracleConfiguration Oracle10 => new OracleConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/OracleDataClientConfiguration.cs b/src/FluentNHibernate/Cfg/Db/OracleDataClientConfiguration.cs index 6d11f2ae0..7019bb219 100644 --- a/src/FluentNHibernate/Cfg/Db/OracleDataClientConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/OracleDataClientConfiguration.cs @@ -14,18 +14,12 @@ protected OracleDataClientConfiguration() /// Oracle Data Provider (Oracle.DataAccess) library specifying the Oracle 9i dialect. /// The Oracle.DataAccess library must be available to the calling application/library. /// - public static OracleDataClientConfiguration Oracle9 - { - get { return new OracleDataClientConfiguration().Dialect(); } - } + public static OracleDataClientConfiguration Oracle9 => new OracleDataClientConfiguration().Dialect(); /// /// Initializes a new instance of the class using the /// Oracle Data Provider (Oracle.DataAccess) library specifying the Oracle 10g dialect. /// The Oracle.DataAccess library must be available to the calling application/library. /// - public static OracleDataClientConfiguration Oracle10 - { - get { return new OracleDataClientConfiguration().Dialect(); } - } + public static OracleDataClientConfiguration Oracle10 => new OracleDataClientConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/OracleManagedDataClientConfiguration.cs b/src/FluentNHibernate/Cfg/Db/OracleManagedDataClientConfiguration.cs index 207e7b93a..eaa6ad7a7 100644 --- a/src/FluentNHibernate/Cfg/Db/OracleManagedDataClientConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/OracleManagedDataClientConfiguration.cs @@ -14,18 +14,12 @@ protected OracleManagedDataClientConfiguration() /// Oracle Data Provider (Oracle.DataAccess) library specifying the Oracle 9i dialect. /// The Oracle.DataAccess library must be available to the calling application/library. /// - public static OracleManagedDataClientConfiguration Oracle9 - { - get { return new OracleManagedDataClientConfiguration().Dialect(); } - } + public static OracleManagedDataClientConfiguration Oracle9 => new OracleManagedDataClientConfiguration().Dialect(); /// /// Initializes a new instance of the class using the /// Oracle Data Provider (Oracle.DataAccess) library specifying the Oracle 10g dialect. /// The Oracle.DataAccess library must be available to the calling application/library. /// - public static OracleManagedDataClientConfiguration Oracle10 - { - get { return new OracleManagedDataClientConfiguration().Dialect(); } - } + public static OracleManagedDataClientConfiguration Oracle10 => new OracleManagedDataClientConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/PostgreSQLConfiguration.cs b/src/FluentNHibernate/Cfg/Db/PostgreSQLConfiguration.cs index 351589ac1..19b27fb06 100644 --- a/src/FluentNHibernate/Cfg/Db/PostgreSQLConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/PostgreSQLConfiguration.cs @@ -10,23 +10,11 @@ protected PostgreSQLConfiguration() Driver(); } - public static PostgreSQLConfiguration Standard - { - get { return new PostgreSQLConfiguration().Dialect(); } - } + public static PostgreSQLConfiguration Standard => new PostgreSQLConfiguration().Dialect(); - public static PostgreSQLConfiguration PostgreSQL81 - { - get { return new PostgreSQLConfiguration().Dialect(); } - } + public static PostgreSQLConfiguration PostgreSQL81 => new PostgreSQLConfiguration().Dialect(); - public static PostgreSQLConfiguration PostgreSQL82 - { - get { return new PostgreSQLConfiguration().Dialect(); } - } + public static PostgreSQLConfiguration PostgreSQL82 => new PostgreSQLConfiguration().Dialect(); - public static PostgreSQLConfiguration PostgreSQL83 - { - get { return new PostgreSQLConfiguration().Dialect(); } - } + public static PostgreSQLConfiguration PostgreSQL83 => new PostgreSQLConfiguration().Dialect(); } diff --git a/src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs b/src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs index cbe1aad38..531e38ee2 100644 --- a/src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs @@ -14,36 +14,15 @@ protected SQLAnywhereConfiguration() #endif } - public static SQLAnywhereConfiguration SQLAnywhere9 - { - get { return new SQLAnywhereConfiguration().Dialect(); } - } + public static SQLAnywhereConfiguration SQLAnywhere9 => new SQLAnywhereConfiguration().Dialect(); #if !NH21 - public static SQLAnywhereConfiguration SQLAnywhere10 - { - get { return new SQLAnywhereConfiguration().Dialect(); } - } + public static SQLAnywhereConfiguration SQLAnywhere10 => new SQLAnywhereConfiguration().Dialect(); - public static SQLAnywhereConfiguration SQLAnywhere11 - { - get { return new SQLAnywhereConfiguration().Dialect(); } - } + public static SQLAnywhereConfiguration SQLAnywhere11 => new SQLAnywhereConfiguration().Dialect(); #endif - public static SQLAnywhereConfiguration SQLAnywhere12 - { - get - { - return new SQLAnywhereConfiguration().Dialect().Driver(); - } - } + public static SQLAnywhereConfiguration SQLAnywhere12 => new SQLAnywhereConfiguration().Dialect().Driver(); - public static SQLAnywhereConfiguration SQLAnywhere17 - { - get - { - return new SQLAnywhereConfiguration().Dialect().Driver(); - } - } + public static SQLAnywhereConfiguration SQLAnywhere17 => new SQLAnywhereConfiguration().Dialect().Driver(); } diff --git a/src/FluentNHibernate/Cfg/Db/SQLiteConfiguration.cs b/src/FluentNHibernate/Cfg/Db/SQLiteConfiguration.cs index f6a55e49b..9c21b4f59 100644 --- a/src/FluentNHibernate/Cfg/Db/SQLiteConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/SQLiteConfiguration.cs @@ -5,10 +5,7 @@ namespace FluentNHibernate.Cfg.Db; public class SQLiteConfiguration : PersistenceConfiguration { - public static SQLiteConfiguration Standard - { - get { return new SQLiteConfiguration(); } - } + public static SQLiteConfiguration Standard => new(); public SQLiteConfiguration() { diff --git a/src/FluentNHibernate/Cfg/FluentMappingsContainer.cs b/src/FluentNHibernate/Cfg/FluentMappingsContainer.cs index 3e34c925b..2c4a75b67 100644 --- a/src/FluentNHibernate/Cfg/FluentMappingsContainer.cs +++ b/src/FluentNHibernate/Cfg/FluentMappingsContainer.cs @@ -20,10 +20,7 @@ public class FluentMappingsContainer PairBiDirectionalManyToManySidesDelegate biDirectionalManyToManyPairer; [Obsolete("PersistenceModel is no longer available through FluentMappingsContainer. Use MappingConfiguration.UsePersistenceModel to supply a custom PersistenceModel", true)] - public PersistenceModel PersistenceModel - { - get { return null; } - } + public PersistenceModel PersistenceModel => null; public FluentMappingsContainer OverrideBiDirectionalManyToManyPairing(PairBiDirectionalManyToManySidesDelegate userControlledPairing) { @@ -101,10 +98,7 @@ public FluentMappingsContainer ExportTo(TextWriter textWriter) /// /// Alter convention discovery /// - public SetupConventionFinder Conventions - { - get { return new SetupConventionFinder(this, conventionFinder); } - } + public SetupConventionFinder Conventions => new(this, conventionFinder); /// /// Gets whether any mappings were added diff --git a/src/FluentNHibernate/Cfg/MappingConfiguration.cs b/src/FluentNHibernate/Cfg/MappingConfiguration.cs index 64904a833..e7ec8305b 100644 --- a/src/FluentNHibernate/Cfg/MappingConfiguration.cs +++ b/src/FluentNHibernate/Cfg/MappingConfiguration.cs @@ -52,15 +52,10 @@ public MappingConfiguration UsePersistenceModel(PersistenceModel persistenceMode /// /// Get whether any mappings of any kind were added /// - public bool WasUsed - { - get - { - return FluentMappings.WasUsed || - AutoMappings.WasUsed || - HbmMappings.WasUsed; - } - } + public bool WasUsed => + FluentMappings.WasUsed || + AutoMappings.WasUsed || + HbmMappings.WasUsed; /// /// Applies any mappings to the NHibernate Configuration diff --git a/src/FluentNHibernate/Cfg/SetupConventionFinder.cs b/src/FluentNHibernate/Cfg/SetupConventionFinder.cs index 0b9e69614..629f9ad4d 100644 --- a/src/FluentNHibernate/Cfg/SetupConventionFinder.cs +++ b/src/FluentNHibernate/Cfg/SetupConventionFinder.cs @@ -17,10 +17,7 @@ public SetupConventionFinder(TReturn container, IConventionFinder conventionFind this.conventionFinder = conventionFinder; } - ConventionsCollection IConventionFinder.Conventions - { - get { return conventionFinder.Conventions; } - } + ConventionsCollection IConventionFinder.Conventions => conventionFinder.Conventions; public TReturn AddSource(ITypeSource source) { diff --git a/src/FluentNHibernate/Conventions/AcceptanceCriteria/ConcreteAcceptanceCriteria.cs b/src/FluentNHibernate/Conventions/AcceptanceCriteria/ConcreteAcceptanceCriteria.cs index 7a3db8e66..7737c279a 100644 --- a/src/FluentNHibernate/Conventions/AcceptanceCriteria/ConcreteAcceptanceCriteria.cs +++ b/src/FluentNHibernate/Conventions/AcceptanceCriteria/ConcreteAcceptanceCriteria.cs @@ -98,10 +98,7 @@ public IAcceptanceCriteria Either(IAcceptanceCriteria su return Any(subCriteriaA, subCriteriaB); } - public IEnumerable Expectations - { - get { return expectations; } - } + public IEnumerable Expectations => expectations; public bool Matches(IInspector inspector) { diff --git a/src/FluentNHibernate/Conventions/AcceptanceCriteria/InverseIs.cs b/src/FluentNHibernate/Conventions/AcceptanceCriteria/InverseIs.cs index acfee4684..2ffe840cb 100644 --- a/src/FluentNHibernate/Conventions/AcceptanceCriteria/InverseIs.cs +++ b/src/FluentNHibernate/Conventions/AcceptanceCriteria/InverseIs.cs @@ -2,8 +2,5 @@ namespace FluentNHibernate.Conventions.AcceptanceCriteria; public class InverseIs { - public IAcceptanceCriterion Set - { - get { return new SetCriterion(true); } - } + public IAcceptanceCriterion Set => new SetCriterion(true); } diff --git a/src/FluentNHibernate/Conventions/AcceptanceCriteria/Is.cs b/src/FluentNHibernate/Conventions/AcceptanceCriteria/Is.cs index 1358e4936..232db9750 100644 --- a/src/FluentNHibernate/Conventions/AcceptanceCriteria/Is.cs +++ b/src/FluentNHibernate/Conventions/AcceptanceCriteria/Is.cs @@ -4,17 +4,8 @@ namespace FluentNHibernate.Conventions.AcceptanceCriteria; public class Is { - public static IAcceptanceCriterion Set - { - get { return new SetCriterion(false); } - } + public static IAcceptanceCriterion Set => new SetCriterion(false); [DebuggerBrowsable(DebuggerBrowsableState.Never)] - public static InverseIs Not - { - get - { - return new InverseIs(); - } - } + public static InverseIs Not => new(); } diff --git a/src/FluentNHibernate/Conventions/Helpers/ConventionBuilder.cs b/src/FluentNHibernate/Conventions/Helpers/ConventionBuilder.cs index f00564bc4..f5a169209 100644 --- a/src/FluentNHibernate/Conventions/Helpers/ConventionBuilder.cs +++ b/src/FluentNHibernate/Conventions/Helpers/ConventionBuilder.cs @@ -6,20 +6,11 @@ namespace FluentNHibernate.Conventions.Helpers; public static class ConventionBuilder { - public static IConventionBuilder Class - { - get { return new ClassConventionBuilder(); } - } + public static IConventionBuilder Class => new ClassConventionBuilder(); - public static IConventionBuilder Id - { - get { return new IdConventionBuilder(); } - } + public static IConventionBuilder Id => new IdConventionBuilder(); - public static IConventionBuilder Property - { - get { return new PropertyConventionBuilder(); } - } + public static IConventionBuilder Property => new PropertyConventionBuilder(); //public static IConventionBuilder Version //{ @@ -36,15 +27,9 @@ public static IConventionBuilder HasMany - { - get { return new HasManyConventionBuilder(); } - } + public static IConventionBuilder HasMany => new HasManyConventionBuilder(); - public static IConventionBuilder HasManyToMany - { - get { return new HasManyToManyConventionBuilder(); } - } + public static IConventionBuilder HasManyToMany => new HasManyToManyConventionBuilder(); //public static IConventionBuilder AsArray //{ @@ -76,10 +61,7 @@ public static IConventionBuilder Reference - { - get { return new ReferenceConventionBuilder(); } - } + public static IConventionBuilder Reference => new ReferenceConventionBuilder(); //public static IConventionBuilder Relationship //{ diff --git a/src/FluentNHibernate/Conventions/Helpers/PrimaryKey.cs b/src/FluentNHibernate/Conventions/Helpers/PrimaryKey.cs index 756a4ad5c..6d2de6725 100644 --- a/src/FluentNHibernate/Conventions/Helpers/PrimaryKey.cs +++ b/src/FluentNHibernate/Conventions/Helpers/PrimaryKey.cs @@ -6,10 +6,7 @@ namespace FluentNHibernate.Conventions.Helpers; public static class PrimaryKey { - public static PrimaryKeyNameBuilder Name - { - get { return new PrimaryKeyNameBuilder(); } - } + public static PrimaryKeyNameBuilder Name => new(); } public class PrimaryKeyNameBuilder diff --git a/src/FluentNHibernate/Conventions/Inspections/AnyInspector.cs b/src/FluentNHibernate/Conventions/Inspections/AnyInspector.cs index 3b548b731..600d9ce6f 100644 --- a/src/FluentNHibernate/Conventions/Inspections/AnyInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/AnyInspector.cs @@ -17,30 +17,18 @@ public AnyInspector(AnyMapping mapping) propertyMappings.Map(x => x.LazyLoad, x => x.Lazy); } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(propertyMappings.Get(property)); } - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); - public Cascade Cascade - { - get { return Cascade.FromString(mapping.Cascade); } - } + public Cascade Cascade => Cascade.FromString(mapping.Cascade); public IEnumerable IdentifierColumns { @@ -52,20 +40,11 @@ public IEnumerable IdentifierColumns } } - public string IdType - { - get { return mapping.IdType; } - } + public string IdType => mapping.IdType; - public bool Insert - { - get { return mapping.Insert; } - } + public bool Insert => mapping.Insert; - public TypeReference MetaType - { - get { return mapping.MetaType; } - } + public TypeReference MetaType => mapping.MetaType; public IEnumerable MetaValues { @@ -77,10 +56,7 @@ public IEnumerable MetaValues } } - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; public IEnumerable TypeColumns { @@ -92,18 +68,9 @@ public IEnumerable TypeColumns } } - public bool Update - { - get { return mapping.Update; } - } + public bool Update => mapping.Update; - public bool LazyLoad - { - get { return mapping.Lazy; } - } + public bool LazyLoad => mapping.Lazy; - public bool OptimisticLock - { - get { return mapping.OptimisticLock; } - } + public bool OptimisticLock => mapping.OptimisticLock; } diff --git a/src/FluentNHibernate/Conventions/Inspections/CacheInspector.cs b/src/FluentNHibernate/Conventions/Inspections/CacheInspector.cs index ea1d8e65e..41740cea2 100644 --- a/src/FluentNHibernate/Conventions/Inspections/CacheInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/CacheInspector.cs @@ -13,30 +13,15 @@ public CacheInspector(CacheMapping mapping) this.mapping = mapping; } - public string Usage - { - get { return mapping.Usage; } - } + public string Usage => mapping.Usage; - public string Region - { - get { return mapping.Region; } - } + public string Region => mapping.Region; - public Include Include - { - get { return Include.FromString(mapping.Include); } - } + public Include Include => Include.FromString(mapping.Include); - public Type EntityType - { - get { return mapping.ContainedEntityType; } - } + public Type EntityType => mapping.ContainedEntityType; - public string StringIdentifierForModel - { - get { return mapping.Usage; } - } + public string StringIdentifierForModel => mapping.Usage; public bool IsSet(Member property) { diff --git a/src/FluentNHibernate/Conventions/Inspections/ClassInspector.cs b/src/FluentNHibernate/Conventions/Inspections/ClassInspector.cs index 3ef0d7b89..0647c51a1 100644 --- a/src/FluentNHibernate/Conventions/Inspections/ClassInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/ClassInspector.cs @@ -22,35 +22,17 @@ public ClassInspector(ClassMapping mapping) propertyMappings.Map(x => x.EntityType, x => x.Type); } - public Type EntityType - { - get { return mapping.Type; } - } + public Type EntityType => mapping.Type; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; - public bool LazyLoad - { - get { return mapping.Lazy; } - } + public bool LazyLoad => mapping.Lazy; - public bool ReadOnly - { - get { return !mapping.Mutable; } - } + public bool ReadOnly => !mapping.Mutable; - public string TableName - { - get { return mapping.TableName; } - } + public string TableName => mapping.TableName; - ICacheInspector IClassInspector.Cache - { - get { return Cache; } - } + ICacheInspector IClassInspector.Cache => Cache; public ICacheInstance Cache { @@ -64,40 +46,19 @@ public ICacheInstance Cache } } - public OptimisticLock OptimisticLock - { - get { return OptimisticLock.FromString(mapping.OptimisticLock); } - } + public OptimisticLock OptimisticLock => OptimisticLock.FromString(mapping.OptimisticLock); - public SchemaAction SchemaAction - { - get { return SchemaAction.FromString(mapping.SchemaAction); } - } + public SchemaAction SchemaAction => SchemaAction.FromString(mapping.SchemaAction); - public string Schema - { - get { return mapping.Schema; } - } + public string Schema => mapping.Schema; - public bool DynamicUpdate - { - get { return mapping.DynamicUpdate; } - } + public bool DynamicUpdate => mapping.DynamicUpdate; - public bool DynamicInsert - { - get { return mapping.DynamicInsert; } - } + public bool DynamicInsert => mapping.DynamicInsert; - public int BatchSize - { - get { return mapping.BatchSize; } - } + public int BatchSize => mapping.BatchSize; - public bool Abstract - { - get { return mapping.Abstract; } - } + public bool Abstract => mapping.Abstract; public IVersionInspector Version { @@ -120,10 +81,7 @@ public IEnumerable Anys } } - public string Check - { - get { return mapping.Check; } - } + public string Check => mapping.Check; public IEnumerable Collections { @@ -211,45 +169,21 @@ public IDiscriminatorInspector Discriminator } } - public object DiscriminatorValue - { - get { return mapping.DiscriminatorValue; } - } + public object DiscriminatorValue => mapping.DiscriminatorValue; - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public string Persister - { - get { return mapping.Persister; } - } + public string Persister => mapping.Persister; - public Polymorphism Polymorphism - { - get { return Polymorphism.FromString(mapping.Polymorphism); } - } + public Polymorphism Polymorphism => Polymorphism.FromString(mapping.Polymorphism); - public string Proxy - { - get { return mapping.Proxy; } - } + public string Proxy => mapping.Proxy; - public string Where - { - get { return mapping.Where; } - } + public string Where => mapping.Where; - public string Subselect - { - get { return mapping.Subselect; } - } + public string Subselect => mapping.Subselect; - public bool SelectBeforeUpdate - { - get { return mapping.SelectBeforeUpdate; } - } + public bool SelectBeforeUpdate => mapping.SelectBeforeUpdate; public IIdentityInspectorBase Id { diff --git a/src/FluentNHibernate/Conventions/Inspections/CollectionInspector.cs b/src/FluentNHibernate/Conventions/Inspections/CollectionInspector.cs index be962d097..6c0e949ae 100644 --- a/src/FluentNHibernate/Conventions/Inspections/CollectionInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/CollectionInspector.cs @@ -19,20 +19,11 @@ public CollectionInspector(CollectionMapping mapping) propertyMappings.Map(x => x.LazyLoad, x => x.Lazy); } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; - Collection ICollectionInspector.Collection - { - get { return mapping.Collection; } - } + Collection ICollectionInspector.Collection => mapping.Collection; /// /// Represents a string identifier for the model instance, used in conventions for a lazy @@ -57,20 +48,11 @@ public IKeyInspector Key } } - public string TableName - { - get { return mapping.TableName; } - } + public string TableName => mapping.TableName; - public bool IsMethodAccess - { - get { return mapping.Member.IsMethod; } - } + public bool IsMethodAccess => mapping.Member.IsMethod; - public MemberInfo Member - { - get { return mapping.Member.MemberInfo; } - } + public MemberInfo Member => mapping.Member.MemberInfo; public IRelationshipInspector Relationship { @@ -83,40 +65,19 @@ public IRelationshipInspector Relationship } } - public Cascade Cascade - { - get { return Cascade.FromString(mapping.Cascade); } - } + public Cascade Cascade => Cascade.FromString(mapping.Cascade); - public Fetch Fetch - { - get { return Fetch.FromString(mapping.Fetch); } - } + public Fetch Fetch => Fetch.FromString(mapping.Fetch); - public bool OptimisticLock - { - get { return mapping.OptimisticLock; } - } + public bool OptimisticLock => mapping.OptimisticLock; - public bool Generic - { - get { return mapping.Generic; } - } + public bool Generic => mapping.Generic; - public bool Inverse - { - get { return mapping.Inverse; } - } + public bool Inverse => mapping.Inverse; - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); - public int BatchSize - { - get { return mapping.BatchSize; } - } + public int BatchSize => mapping.BatchSize; public ICacheInspector Cache { @@ -129,20 +90,11 @@ public ICacheInspector Cache } } - public string Check - { - get { return mapping.Check; } - } + public string Check => mapping.Check; - public Type ChildType - { - get { return mapping.ChildType; } - } + public Type ChildType => mapping.ChildType; - public TypeReference CollectionType - { - get { return mapping.CollectionType; } - } + public TypeReference CollectionType => mapping.CollectionType; public ICompositeElementInspector CompositeElement { @@ -166,40 +118,19 @@ public IElementInspector Element } } - public Lazy LazyLoad - { - get { return mapping.Lazy; } - } + public Lazy LazyLoad => mapping.Lazy; - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public TypeReference Persister - { - get { return mapping.Persister; } - } + public TypeReference Persister => mapping.Persister; - public string Schema - { - get { return mapping.Schema; } - } + public string Schema => mapping.Schema; - public string Where - { - get { return mapping.Where; } - } + public string Where => mapping.Where; - public string OrderBy - { - get { return mapping.OrderBy; } - } + public string OrderBy => mapping.OrderBy; - public string Sort - { - get { return mapping.Sort; } - } + public string Sort => mapping.Sort; public IIndexInspectorBase Index { diff --git a/src/FluentNHibernate/Conventions/Inspections/ColumnInspector.cs b/src/FluentNHibernate/Conventions/Inspections/ColumnInspector.cs index 526aa6610..f8ef65ee2 100644 --- a/src/FluentNHibernate/Conventions/Inspections/ColumnInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/ColumnInspector.cs @@ -16,65 +16,29 @@ public ColumnInspector(Type containingEntityType, ColumnMapping mapping) public Type EntityType { get; private set; } - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public string Check - { - get { return mapping.Check; } - } + public string Check => mapping.Check; - public string Index - { - get { return mapping.Index; } - } + public string Index => mapping.Index; - public int Length - { - get { return mapping.Length; } - } + public int Length => mapping.Length; - public bool NotNull - { - get { return mapping.NotNull; } - } + public bool NotNull => mapping.NotNull; - public string SqlType - { - get { return mapping.SqlType; } - } + public string SqlType => mapping.SqlType; - public bool Unique - { - get { return mapping.Unique; } - } + public bool Unique => mapping.Unique; - public string UniqueKey - { - get { return mapping.UniqueKey; } - } + public string UniqueKey => mapping.UniqueKey; - public int Precision - { - get { return mapping.Precision; } - } + public int Precision => mapping.Precision; - public int Scale - { - get { return mapping.Scale; } - } + public int Scale => mapping.Scale; - public string Default - { - get { return mapping.Default; } - } + public string Default => mapping.Default; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { diff --git a/src/FluentNHibernate/Conventions/Inspections/ComponentBaseInspector.cs b/src/FluentNHibernate/Conventions/Inspections/ComponentBaseInspector.cs index 721dc2021..2213590b5 100644 --- a/src/FluentNHibernate/Conventions/Inspections/ComponentBaseInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/ComponentBaseInspector.cs @@ -16,27 +16,15 @@ public ComponentBaseInspector(IComponentMapping mapping) this.mapping = mapping; } - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public abstract bool IsSet(Member property); - public Member Property - { - get { return mapping.Member; } - } + public Member Property => mapping.Member; public IParentInspector Parent { @@ -49,15 +37,9 @@ public IParentInspector Parent } } - public bool Insert - { - get { return mapping.Insert; } - } + public bool Insert => mapping.Insert; - public bool Update - { - get { return mapping.Update; } - } + public bool Update => mapping.Update; public IEnumerable Anys { @@ -94,25 +76,13 @@ public IEnumerable Components } } - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public bool OptimisticLock - { - get { return mapping.OptimisticLock; } - } + public bool OptimisticLock => mapping.OptimisticLock; - public bool Unique - { - get { return mapping.Unique; } - } + public bool Unique => mapping.Unique; - public TypeReference Class - { - get { return mapping is ComponentMapping ? ((ComponentMapping)mapping).Class : null; } - } + public TypeReference Class => mapping is ComponentMapping ? ((ComponentMapping)mapping).Class : null; public IEnumerable OneToOnes { @@ -144,8 +114,5 @@ public IEnumerable References } } - public Type Type - { - get { return mapping.Type; } - } + public Type Type => mapping.Type; } diff --git a/src/FluentNHibernate/Conventions/Inspections/ComponentInspector.cs b/src/FluentNHibernate/Conventions/Inspections/ComponentInspector.cs index 4c0e358b1..8f6bbc288 100644 --- a/src/FluentNHibernate/Conventions/Inspections/ComponentInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/ComponentInspector.cs @@ -19,8 +19,5 @@ public override bool IsSet(Member property) return mapping.IsSpecified(mappedProperties.Get(property)); } - public bool LazyLoad - { - get { return mapping.Lazy; } - } + public bool LazyLoad => mapping.Lazy; } diff --git a/src/FluentNHibernate/Conventions/Inspections/CompositeElementInspector.cs b/src/FluentNHibernate/Conventions/Inspections/CompositeElementInspector.cs index a1e4146ca..58b39a23b 100644 --- a/src/FluentNHibernate/Conventions/Inspections/CompositeElementInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/CompositeElementInspector.cs @@ -16,25 +16,16 @@ public CompositeElementInspector(CompositeElementMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Class.Name; } - } + public string StringIdentifierForModel => mapping.Class.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public TypeReference Class - { - get { return mapping.Class; } - } + public TypeReference Class => mapping.Class; public IParentInspector Parent { diff --git a/src/FluentNHibernate/Conventions/Inspections/CompositeIdentityInspector.cs b/src/FluentNHibernate/Conventions/Inspections/CompositeIdentityInspector.cs index 31d8bf7bb..59963c020 100644 --- a/src/FluentNHibernate/Conventions/Inspections/CompositeIdentityInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/CompositeIdentityInspector.cs @@ -17,30 +17,18 @@ public CompositeIdentityInspector(CompositeIdMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); - public TypeReference Class - { - get { return mapping.Class; } - } + public TypeReference Class => mapping.Class; public IEnumerable KeyManyToOnes { @@ -64,18 +52,9 @@ public IEnumerable KeyProperties } } - public bool Mapped - { - get { return mapping.Mapped; } - } + public bool Mapped => mapping.Mapped; - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public string UnsavedValue - { - get { return mapping.UnsavedValue; } - } + public string UnsavedValue => mapping.UnsavedValue; } diff --git a/src/FluentNHibernate/Conventions/Inspections/DiscriminatorInspector.cs b/src/FluentNHibernate/Conventions/Inspections/DiscriminatorInspector.cs index 251dd3d2b..f0f59d33a 100644 --- a/src/FluentNHibernate/Conventions/Inspections/DiscriminatorInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/DiscriminatorInspector.cs @@ -17,35 +17,17 @@ public DiscriminatorInspector(DiscriminatorMapping mapping) propertyMappings.Map(x => x.Nullable, "NotNull"); } - public bool Insert - { - get { return mapping.Insert; } - } + public bool Insert => mapping.Insert; - public bool Force - { - get { return mapping.Force; } - } + public bool Force => mapping.Force; - public string Formula - { - get { return mapping.Formula; } - } + public string Formula => mapping.Formula; - public TypeReference Type - { - get { return mapping.Type; } - } + public TypeReference Type => mapping.Type; - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Type.Name; } - } + public string StringIdentifierForModel => mapping.Type.Name; public IEnumerable Columns { diff --git a/src/FluentNHibernate/Conventions/Inspections/ElementInspector.cs b/src/FluentNHibernate/Conventions/Inspections/ElementInspector.cs index cdbe12a57..3de811b9f 100644 --- a/src/FluentNHibernate/Conventions/Inspections/ElementInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/ElementInspector.cs @@ -16,25 +16,16 @@ public ElementInspector(ElementMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Type.Name; } - } + public string StringIdentifierForModel => mapping.Type.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public TypeReference Type - { - get { return mapping.Type; } - } + public TypeReference Type => mapping.Type; public IEnumerable Columns { @@ -46,10 +37,7 @@ public IEnumerable Columns } } - public string Formula - { - get { return mapping.Formula; } - } + public string Formula => mapping.Formula; public int Length { diff --git a/src/FluentNHibernate/Conventions/Inspections/HibernateMappingInspector.cs b/src/FluentNHibernate/Conventions/Inspections/HibernateMappingInspector.cs index 8faa10660..8fab2941e 100644 --- a/src/FluentNHibernate/Conventions/Inspections/HibernateMappingInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/HibernateMappingInspector.cs @@ -15,48 +15,24 @@ public HibernateMappingInspector(HibernateMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.Classes.First().Type; } - } + public Type EntityType => mapping.Classes.First().Type; - public string StringIdentifierForModel - { - get { return mapping.Classes.First().Name; } - } + public string StringIdentifierForModel => mapping.Classes.First().Name; public bool IsSet(Member property) { return mapping.IsSpecified(propertyMappings.Get(property)); } - public string Catalog - { - get { return mapping.Catalog; } - } + public string Catalog => mapping.Catalog; - public Access DefaultAccess - { - get { return Access.FromString(mapping.DefaultAccess); } - } + public Access DefaultAccess => Access.FromString(mapping.DefaultAccess); - public Cascade DefaultCascade - { - get { return Cascade.FromString(mapping.DefaultCascade); } - } + public Cascade DefaultCascade => Cascade.FromString(mapping.DefaultCascade); - public bool DefaultLazy - { - get { return mapping.DefaultLazy; } - } + public bool DefaultLazy => mapping.DefaultLazy; - public bool AutoImport - { - get { return mapping.AutoImport; } - } + public bool AutoImport => mapping.AutoImport; - public string Schema - { - get { return mapping.Schema; } - } + public string Schema => mapping.Schema; } diff --git a/src/FluentNHibernate/Conventions/Inspections/IGeneratorInspector.cs b/src/FluentNHibernate/Conventions/Inspections/IGeneratorInspector.cs index 4012d4374..799a2b708 100644 --- a/src/FluentNHibernate/Conventions/Inspections/IGeneratorInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/IGeneratorInspector.cs @@ -20,28 +20,16 @@ public GeneratorInspector(GeneratorMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Class; } - } + public string StringIdentifierForModel => mapping.Class; public bool IsSet(Member property) { return mapping.IsSpecified(propertyMappings.Get(property)); } - public string Class - { - get { return mapping.Class; } - } + public string Class => mapping.Class; - public IDictionary Params - { - get { return new Dictionary(mapping.Params); } - } + public IDictionary Params => new Dictionary(mapping.Params); } diff --git a/src/FluentNHibernate/Conventions/Inspections/IdentityInspector.cs b/src/FluentNHibernate/Conventions/Inspections/IdentityInspector.cs index ac8277f71..f2df29980 100644 --- a/src/FluentNHibernate/Conventions/Inspections/IdentityInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/IdentityInspector.cs @@ -19,25 +19,16 @@ public IdentityInspector(IdMapping mapping) propertyMappings.Map(x => x.Nullable, "NotNull"); } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(propertyMappings.Get(property)); } - public Member Property - { - get { return mapping.Member; } - } + public Member Property => mapping.Member; public IEnumerable Columns { @@ -60,23 +51,11 @@ public IGeneratorInspector Generator } } - public string UnsavedValue - { - get { return mapping.UnsavedValue; } - } + public string UnsavedValue => mapping.UnsavedValue; - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); - public TypeReference Type - { - get { return mapping.Type; } - } + public TypeReference Type => mapping.Type; } diff --git a/src/FluentNHibernate/Conventions/Inspections/IndexInspector.cs b/src/FluentNHibernate/Conventions/Inspections/IndexInspector.cs index 1bea1f0d5..51981e560 100644 --- a/src/FluentNHibernate/Conventions/Inspections/IndexInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/IndexInspector.cs @@ -16,25 +16,16 @@ public IndexInspector(IndexMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Type.Name; } - } + public string StringIdentifierForModel => mapping.Type.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public TypeReference Type - { - get { return mapping.Type; } - } + public TypeReference Type => mapping.Type; public IEnumerable Columns { diff --git a/src/FluentNHibernate/Conventions/Inspections/IndexManyToManyInspector.cs b/src/FluentNHibernate/Conventions/Inspections/IndexManyToManyInspector.cs index 315098d1b..54b7c992e 100644 --- a/src/FluentNHibernate/Conventions/Inspections/IndexManyToManyInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/IndexManyToManyInspector.cs @@ -16,30 +16,18 @@ public IndexManyToManyInspector(IndexManyToManyMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Class.Name; } - } + public string StringIdentifierForModel => mapping.Class.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public TypeReference Class - { - get { return mapping.Class; } - } - - public string ForeignKey - { - get { return mapping.ForeignKey; } - } + public TypeReference Class => mapping.Class; + + public string ForeignKey => mapping.ForeignKey; public IEnumerable Columns { diff --git a/src/FluentNHibernate/Conventions/Inspections/JoinInspector.cs b/src/FluentNHibernate/Conventions/Inspections/JoinInspector.cs index b86656afd..7400359cf 100644 --- a/src/FluentNHibernate/Conventions/Inspections/JoinInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/JoinInspector.cs @@ -15,15 +15,9 @@ public JoinInspector(JoinMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.TableName; } - } + public string StringIdentifierForModel => mapping.TableName; public bool IsSet(Member property) { @@ -40,15 +34,9 @@ public IEnumerable Anys } } - public Fetch Fetch - { - get { return Fetch.FromString(mapping.Fetch); } - } + public Fetch Fetch => Fetch.FromString(mapping.Fetch); - public bool Inverse - { - get { return mapping.Inverse; } - } + public bool Inverse => mapping.Inverse; public IKeyInspector Key { @@ -61,10 +49,7 @@ public IKeyInspector Key } } - public bool Optional - { - get { return mapping.Optional; } - } + public bool Optional => mapping.Optional; public IEnumerable Properties { @@ -97,23 +82,11 @@ public IEnumerable Collections } } - public string Schema - { - get { return mapping.Schema; } - } + public string Schema => mapping.Schema; - public string TableName - { - get { return mapping.TableName; } - } - - public string Catalog - { - get { return mapping.Catalog; } - } + public string TableName => mapping.TableName; - public string Subselect - { - get { return mapping.Subselect; } - } + public string Catalog => mapping.Catalog; + + public string Subselect => mapping.Subselect; } diff --git a/src/FluentNHibernate/Conventions/Inspections/JoinInstance.cs b/src/FluentNHibernate/Conventions/Inspections/JoinInstance.cs index d39cdd994..568fee7af 100644 --- a/src/FluentNHibernate/Conventions/Inspections/JoinInstance.cs +++ b/src/FluentNHibernate/Conventions/Inspections/JoinInstance.cs @@ -36,10 +36,7 @@ public IJoinInstance Not nextBool = true; } - public new IKeyInstance Key - { - get { return new KeyInstance(mapping.Key); } - } + public new IKeyInstance Key => new KeyInstance(mapping.Key); public new void Optional() { diff --git a/src/FluentNHibernate/Conventions/Inspections/JoinedSubclassInspector.cs b/src/FluentNHibernate/Conventions/Inspections/JoinedSubclassInspector.cs index 198d0cd8a..d3ddd1bd8 100644 --- a/src/FluentNHibernate/Conventions/Inspections/JoinedSubclassInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/JoinedSubclassInspector.cs @@ -17,25 +17,16 @@ public JoinedSubclassInspector(SubclassMapping mapping) mappedProperties.Map(x => x.LazyLoad, x => x.Lazy); } - public Type EntityType - { - get { return mapping.Type; } - } + public Type EntityType => mapping.Type; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public bool Abstract - { - get { return mapping.Abstract; } - } + public bool Abstract => mapping.Abstract; public IEnumerable Anys { @@ -58,10 +49,7 @@ public IKeyInspector Key } } - public string Check - { - get { return mapping.Check; } - } + public string Check => mapping.Check; public IEnumerable Collections { @@ -88,20 +76,11 @@ public IEnumerable Components } } - public bool DynamicInsert - { - get { return mapping.DynamicInsert; } - } + public bool DynamicInsert => mapping.DynamicInsert; - public bool DynamicUpdate - { - get { return mapping.DynamicUpdate; } - } + public bool DynamicUpdate => mapping.DynamicUpdate; - public Type Extends - { - get { return mapping.Extends; } - } + public Type Extends => mapping.Extends; public IEnumerable Joins { @@ -113,20 +92,11 @@ public IEnumerable Joins } } - public bool LazyLoad - { - get { return mapping.Lazy; } - } + public bool LazyLoad => mapping.Lazy; - public string Schema - { - get { return mapping.Schema; } - } + public string Schema => mapping.Schema; - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; public IEnumerable OneToOnes { @@ -148,10 +118,7 @@ public IEnumerable Properties } } - public string Proxy - { - get { return mapping.Proxy; } - } + public string Proxy => mapping.Proxy; public IEnumerable References { @@ -162,10 +129,7 @@ public IEnumerable References .Cast(); } } - public bool SelectBeforeUpdate - { - get { return mapping.SelectBeforeUpdate; } - } + public bool SelectBeforeUpdate => mapping.SelectBeforeUpdate; public IEnumerable Subclasses { @@ -177,18 +141,9 @@ public IEnumerable Subclasses } } - IEnumerable ISubclassInspectorBase.Subclasses - { - get { return Subclasses.Cast(); } - } + IEnumerable ISubclassInspectorBase.Subclasses => Subclasses.Cast(); - public string TableName - { - get { return mapping.TableName; } - } + public string TableName => mapping.TableName; - public Type Type - { - get { return mapping.Type; } - } + public Type Type => mapping.Type; } diff --git a/src/FluentNHibernate/Conventions/Inspections/KeyInspector.cs b/src/FluentNHibernate/Conventions/Inspections/KeyInspector.cs index 534424ed8..fb4cc82cb 100644 --- a/src/FluentNHibernate/Conventions/Inspections/KeyInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/KeyInspector.cs @@ -15,15 +15,9 @@ public KeyInspector(KeyMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return ""; } - } + public string StringIdentifierForModel => ""; public bool IsSet(Member property) { @@ -40,18 +34,9 @@ public IEnumerable Columns } } - public string ForeignKey - { - get { return mapping.ForeignKey; } - } + public string ForeignKey => mapping.ForeignKey; - public OnDelete OnDelete - { - get { return OnDelete.FromString(mapping.OnDelete); } - } + public OnDelete OnDelete => OnDelete.FromString(mapping.OnDelete); - public string PropertyRef - { - get { return mapping.PropertyRef; } - } + public string PropertyRef => mapping.PropertyRef; } diff --git a/src/FluentNHibernate/Conventions/Inspections/KeyManyToOneInspector.cs b/src/FluentNHibernate/Conventions/Inspections/KeyManyToOneInspector.cs index 753a95287..ce7d52cda 100644 --- a/src/FluentNHibernate/Conventions/Inspections/KeyManyToOneInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/KeyManyToOneInspector.cs @@ -18,50 +18,26 @@ public KeyManyToOneInspector(KeyManyToOneMapping mapping) mappedProperties.Map(x => x.LazyLoad, x => x.Lazy); } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); - public TypeReference Class - { - get { return mapping.Class; } - } + public TypeReference Class => mapping.Class; - public string ForeignKey - { - get { return mapping.ForeignKey; } - } + public string ForeignKey => mapping.ForeignKey; - public bool LazyLoad - { - get { return mapping.Lazy; } - } + public bool LazyLoad => mapping.Lazy; - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public NotFound NotFound - { - get { return NotFound.FromString(mapping.NotFound); } - } + public NotFound NotFound => NotFound.FromString(mapping.NotFound); public IEnumerable Columns { diff --git a/src/FluentNHibernate/Conventions/Inspections/KeyPropertyInspector.cs b/src/FluentNHibernate/Conventions/Inspections/KeyPropertyInspector.cs index 4dc6eb8f6..7c0508af5 100644 --- a/src/FluentNHibernate/Conventions/Inspections/KeyPropertyInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/KeyPropertyInspector.cs @@ -17,35 +17,20 @@ public KeyPropertyInspector(KeyPropertyMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public TypeReference Type - { - get { return mapping.Type; } - } + public TypeReference Type => mapping.Type; public IEnumerable Columns { @@ -56,8 +41,5 @@ public IEnumerable Columns .Cast(); } } - public int Length - { - get { return mapping.Length; } - } + public int Length => mapping.Length; } diff --git a/src/FluentNHibernate/Conventions/Inspections/ManyToManyInspector.cs b/src/FluentNHibernate/Conventions/Inspections/ManyToManyInspector.cs index 1ce89505b..b192955a0 100644 --- a/src/FluentNHibernate/Conventions/Inspections/ManyToManyInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/ManyToManyInspector.cs @@ -17,15 +17,9 @@ public ManyToManyInspector(ManyToManyMapping mapping) mappedProperties.Map(x => x.LazyLoad, x => x.Lazy); } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Class.Name; } - } + public string StringIdentifierForModel => mapping.Class.Name; public bool IsSet(Member property) { @@ -42,48 +36,21 @@ public IEnumerable Columns } } - public Type ChildType - { - get { return mapping.ChildType; } - } + public Type ChildType => mapping.ChildType; - public TypeReference Class - { - get { return mapping.Class; } - } + public TypeReference Class => mapping.Class; - public Fetch Fetch - { - get { return Fetch.FromString(mapping.Fetch); } - } + public Fetch Fetch => Fetch.FromString(mapping.Fetch); - public string ForeignKey - { - get { return mapping.ForeignKey; } - } + public string ForeignKey => mapping.ForeignKey; - public bool LazyLoad - { - get { return mapping.Lazy; } - } + public bool LazyLoad => mapping.Lazy; - public NotFound NotFound - { - get { return NotFound.FromString(mapping.NotFound); } - } + public NotFound NotFound => NotFound.FromString(mapping.NotFound); - public Type ParentType - { - get { return mapping.ParentType; } - } + public Type ParentType => mapping.ParentType; - public string Where - { - get { return mapping.Where; } - } + public string Where => mapping.Where; - public string OrderBy - { - get { return mapping.OrderBy; } - } + public string OrderBy => mapping.OrderBy; } diff --git a/src/FluentNHibernate/Conventions/Inspections/ManyToOneInspector.cs b/src/FluentNHibernate/Conventions/Inspections/ManyToOneInspector.cs index 305c83ac1..00bbb1e0e 100644 --- a/src/FluentNHibernate/Conventions/Inspections/ManyToOneInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/ManyToOneInspector.cs @@ -18,25 +18,13 @@ public ManyToOneInspector(ManyToOneMapping mapping) propertyMappings.Map(x => x.Nullable, "NotNull"); } - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); - public NotFound NotFound - { - get { return NotFound.FromString(mapping.NotFound); } - } + public NotFound NotFound => NotFound.FromString(mapping.NotFound); - public string PropertyRef - { - get { return mapping.PropertyRef; } - } + public string PropertyRef => mapping.PropertyRef; - public bool Update - { - get { return mapping.Update; } - } + public bool Update => mapping.Update; public bool Nullable { @@ -48,20 +36,11 @@ public bool Nullable return !mapping.Columns.First().NotNull; } } - public bool OptimisticLock - { - get { return mapping.OptimisticLock; } - } + public bool OptimisticLock => mapping.OptimisticLock; - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { @@ -71,15 +50,9 @@ public bool IsSet(Member property) mapping.IsSpecified(mappedProperty); } - public Member Property - { - get { return mapping.Member; } - } + public Member Property => mapping.Member; - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; public IEnumerable Columns { @@ -91,38 +64,17 @@ public IEnumerable Columns } } - public Cascade Cascade - { - get { return Cascade.FromString(mapping.Cascade); } - } - - public string Formula - { - get { return mapping.Formula; } - } + public Cascade Cascade => Cascade.FromString(mapping.Cascade); - public TypeReference Class - { - get { return mapping.Class; } - } + public string Formula => mapping.Formula; - public Fetch Fetch - { - get { return Fetch.FromString(mapping.Fetch); } - } + public TypeReference Class => mapping.Class; - public string ForeignKey - { - get { return mapping.ForeignKey; } - } + public Fetch Fetch => Fetch.FromString(mapping.Fetch); - public bool Insert - { - get { return mapping.Insert; } - } + public string ForeignKey => mapping.ForeignKey; - public Laziness LazyLoad - { - get { return new Laziness(mapping.Lazy); } - } + public bool Insert => mapping.Insert; + + public Laziness LazyLoad => new(mapping.Lazy); } diff --git a/src/FluentNHibernate/Conventions/Inspections/MetaValueInspector.cs b/src/FluentNHibernate/Conventions/Inspections/MetaValueInspector.cs index 09268df16..107168f8f 100644 --- a/src/FluentNHibernate/Conventions/Inspections/MetaValueInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/MetaValueInspector.cs @@ -13,28 +13,16 @@ public MetaValueInspector(MetaValueMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Class.Name; } - } + public string StringIdentifierForModel => mapping.Class.Name; public bool IsSet(Member property) { return mapping.IsSpecified(propertyMappings.Get(property)); } - public TypeReference Class - { - get { return mapping.Class; } - } + public TypeReference Class => mapping.Class; - public string Value - { - get { return mapping.Value; } - } + public string Value => mapping.Value; } diff --git a/src/FluentNHibernate/Conventions/Inspections/OneToManyInspector.cs b/src/FluentNHibernate/Conventions/Inspections/OneToManyInspector.cs index 6bc575b63..db7ce8f17 100644 --- a/src/FluentNHibernate/Conventions/Inspections/OneToManyInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/OneToManyInspector.cs @@ -14,34 +14,18 @@ public OneToManyInspector(OneToManyMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Class.Name; } - } + public string StringIdentifierForModel => mapping.Class.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public Type ChildType - { - get { return mapping.ChildType; } - } + public Type ChildType => mapping.ChildType; - public TypeReference Class - { - get { return mapping.Class; } - } - - public NotFound NotFound - { - get { return NotFound.FromString(mapping.NotFound); } - } + public TypeReference Class => mapping.Class; + public NotFound NotFound => NotFound.FromString(mapping.NotFound); } diff --git a/src/FluentNHibernate/Conventions/Inspections/OneToOneInspector.cs b/src/FluentNHibernate/Conventions/Inspections/OneToOneInspector.cs index 6b7a8da1b..35e7b6f5f 100644 --- a/src/FluentNHibernate/Conventions/Inspections/OneToOneInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/OneToOneInspector.cs @@ -16,66 +16,30 @@ public OneToOneInspector(OneToOneMapping mapping) propertyMappings.Map(x => x.LazyLoad, x => x.Lazy); } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(propertyMappings.Get(property)); } - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); - public Cascade Cascade - { - get { return Cascade.FromString(mapping.Cascade); } - } + public Cascade Cascade => Cascade.FromString(mapping.Cascade); - public TypeReference Class - { - get - { - return mapping.Class; - } - } + public TypeReference Class => mapping.Class; - public bool Constrained - { - get { return mapping.Constrained; } - } + public bool Constrained => mapping.Constrained; - public Fetch Fetch - { - get { return Fetch.FromString(mapping.Fetch); } - } + public Fetch Fetch => Fetch.FromString(mapping.Fetch); - public string ForeignKey - { - get { return mapping.ForeignKey; } - } + public string ForeignKey => mapping.ForeignKey; - public Laziness LazyLoad - { - get { return new Laziness(mapping.Lazy); } - } + public Laziness LazyLoad => new(mapping.Lazy); - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public string PropertyRef - { - get { return mapping.PropertyRef; } - } + public string PropertyRef => mapping.PropertyRef; } diff --git a/src/FluentNHibernate/Conventions/Inspections/ParentInspector.cs b/src/FluentNHibernate/Conventions/Inspections/ParentInspector.cs index 3f1d27cb8..0596bf576 100644 --- a/src/FluentNHibernate/Conventions/Inspections/ParentInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/ParentInspector.cs @@ -14,25 +14,16 @@ public ParentInspector(ParentMapping mapping) this.mapping = mapping; } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; public Access Access { diff --git a/src/FluentNHibernate/Conventions/Inspections/PropertyInspector.cs b/src/FluentNHibernate/Conventions/Inspections/PropertyInspector.cs index 863210330..f53a32824 100644 --- a/src/FluentNHibernate/Conventions/Inspections/PropertyInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/PropertyInspector.cs @@ -20,40 +20,19 @@ public PropertyInspector(PropertyMapping mapping) propertyMappings.Map(x => x.Nullable, "NotNull"); } - public bool Insert - { - get { return mapping.Insert; } - } + public bool Insert => mapping.Insert; - public bool Update - { - get { return mapping.Update; } - } + public bool Update => mapping.Update; - public string Formula - { - get { return mapping.Formula; } - } + public string Formula => mapping.Formula; - public TypeReference Type - { - get { return mapping.Type; } - } + public TypeReference Type => mapping.Type; - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public bool OptimisticLock - { - get { return mapping.OptimisticLock; } - } + public bool OptimisticLock => mapping.OptimisticLock; - public Generated Generated - { - get { return Generated.FromString(mapping.Generated); } - } + public Generated Generated => Generated.FromString(mapping.Generated); public IEnumerable Columns { @@ -66,10 +45,7 @@ public IEnumerable Columns } } - public bool LazyLoad - { - get { return mapping.Lazy; } - } + public bool LazyLoad => mapping.Lazy; public Access Access { @@ -82,25 +58,13 @@ public Access Access } } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; - public bool ReadOnly - { - get { return mapping.Insert && mapping.Update; } - } + public bool ReadOnly => mapping.Insert && mapping.Update; - public Member Property - { - get { return mapping.Member; } - } + public Member Property => mapping.Member; public bool IsSet(Member property) { diff --git a/src/FluentNHibernate/Conventions/Inspections/SubclassInspector.cs b/src/FluentNHibernate/Conventions/Inspections/SubclassInspector.cs index a5b43cb47..a755ea010 100644 --- a/src/FluentNHibernate/Conventions/Inspections/SubclassInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/SubclassInspector.cs @@ -16,25 +16,16 @@ public SubclassInspector(SubclassMapping mapping) mappedProperties.Map(x => x.LazyLoad, x => x.Lazy); } - public Type EntityType - { - get { return mapping.Type; } - } + public Type EntityType => mapping.Type; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(mappedProperties.Get(property)); } - public bool Abstract - { - get { return mapping.Abstract; } - } + public bool Abstract => mapping.Abstract; public IEnumerable Anys { @@ -71,25 +62,13 @@ public IEnumerable Components } } - public object DiscriminatorValue - { - get { return mapping.DiscriminatorValue; } - } + public object DiscriminatorValue => mapping.DiscriminatorValue; - public bool DynamicInsert - { - get { return mapping.DynamicInsert; } - } + public bool DynamicInsert => mapping.DynamicInsert; - public bool DynamicUpdate - { - get { return mapping.DynamicUpdate; } - } + public bool DynamicUpdate => mapping.DynamicUpdate; - public Type Extends - { - get { return mapping.Extends; } - } + public Type Extends => mapping.Extends; public IEnumerable Joins { @@ -101,15 +80,9 @@ public IEnumerable Joins } } - public bool LazyLoad - { - get { return mapping.Lazy; } - } + public bool LazyLoad => mapping.Lazy; - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; public IEnumerable OneToOnes { @@ -131,10 +104,7 @@ public IEnumerable Properties } } - public string Proxy - { - get { return mapping.Proxy; } - } + public string Proxy => mapping.Proxy; public IEnumerable References { @@ -145,10 +115,7 @@ public IEnumerable References .Cast(); } } - public bool SelectBeforeUpdate - { - get { return mapping.SelectBeforeUpdate; } - } + public bool SelectBeforeUpdate => mapping.SelectBeforeUpdate; public IEnumerable Subclasses { @@ -160,13 +127,7 @@ public IEnumerable Subclasses } } - IEnumerable ISubclassInspectorBase.Subclasses - { - get { return Subclasses.Cast(); } - } + IEnumerable ISubclassInspectorBase.Subclasses => Subclasses.Cast(); - public Type Type - { - get { return mapping.Type; } - } + public Type Type => mapping.Type; } diff --git a/src/FluentNHibernate/Conventions/Inspections/VersionInspector.cs b/src/FluentNHibernate/Conventions/Inspections/VersionInspector.cs index 329874f21..666d8d88f 100644 --- a/src/FluentNHibernate/Conventions/Inspections/VersionInspector.cs +++ b/src/FluentNHibernate/Conventions/Inspections/VersionInspector.cs @@ -18,30 +18,18 @@ public VersionInspector(VersionMapping mapping) propertyMappings.Map(x => x.Nullable, "NotNull"); } - public Type EntityType - { - get { return mapping.ContainingEntityType; } - } + public Type EntityType => mapping.ContainingEntityType; - public string StringIdentifierForModel - { - get { return mapping.Name; } - } + public string StringIdentifierForModel => mapping.Name; public bool IsSet(Member property) { return mapping.IsSpecified(propertyMappings.Get(property)); } - public string Name - { - get { return mapping.Name; } - } + public string Name => mapping.Name; - public Access Access - { - get { return Access.FromString(mapping.Access); } - } + public Access Access => Access.FromString(mapping.Access); public IEnumerable Columns { @@ -54,18 +42,9 @@ public IEnumerable Columns } } - public Generated Generated - { - get { return Generated.FromString(mapping.Generated); } - } + public Generated Generated => Generated.FromString(mapping.Generated); - public string UnsavedValue - { - get { return mapping.UnsavedValue; } - } + public string UnsavedValue => mapping.UnsavedValue; - public TypeReference Type - { - get { return mapping.Type; } - } + public TypeReference Type => mapping.Type; } diff --git a/src/FluentNHibernate/Conventions/Instances/CollectionInstance.cs b/src/FluentNHibernate/Conventions/Instances/CollectionInstance.cs index efdac8a5a..0bd88cd95 100644 --- a/src/FluentNHibernate/Conventions/Instances/CollectionInstance.cs +++ b/src/FluentNHibernate/Conventions/Instances/CollectionInstance.cs @@ -236,10 +236,7 @@ public void SetOrderBy(string orderBy) get { return new AccessInstance(value => mapping.Set(x => x.Access, Layer.Conventions, value)); } } - public new IKeyInstance Key - { - get { return new KeyInstance(mapping.Key); } - } + public new IKeyInstance Key => new KeyInstance(mapping.Key); public new IElementInstance Element { diff --git a/src/FluentNHibernate/Conventions/Instances/ManyToManyCollectionInstance.cs b/src/FluentNHibernate/Conventions/Instances/ManyToManyCollectionInstance.cs index 9d26b182f..4263136c9 100644 --- a/src/FluentNHibernate/Conventions/Instances/ManyToManyCollectionInstance.cs +++ b/src/FluentNHibernate/Conventions/Instances/ManyToManyCollectionInstance.cs @@ -16,10 +16,7 @@ public ManyToManyCollectionInstance(CollectionMapping mapping) this.mapping = mapping; } - IManyToManyInspector IManyToManyCollectionInspector.Relationship - { - get { return Relationship; } - } + IManyToManyInspector IManyToManyCollectionInspector.Relationship => Relationship; [DebuggerBrowsable(DebuggerBrowsableState.Never)] public new IManyToManyCollectionInstance Not @@ -43,18 +40,9 @@ public IManyToManyCollectionInstance OtherSide } } - public new IManyToManyInstance Relationship - { - get { return new ManyToManyInstance((ManyToManyMapping)mapping.Relationship); } - } + public new IManyToManyInstance Relationship => new ManyToManyInstance((ManyToManyMapping)mapping.Relationship); - public new Type ChildType - { - get { return mapping.ChildType; } - } + public new Type ChildType => mapping.ChildType; - IManyToManyCollectionInspector IManyToManyCollectionInspector.OtherSide - { - get { return OtherSide; } - } + IManyToManyCollectionInspector IManyToManyCollectionInspector.OtherSide => OtherSide; } diff --git a/src/FluentNHibernate/Conventions/Instances/OneToManyCollectionInstance.cs b/src/FluentNHibernate/Conventions/Instances/OneToManyCollectionInstance.cs index 8259a94bf..fafa8dbaf 100644 --- a/src/FluentNHibernate/Conventions/Instances/OneToManyCollectionInstance.cs +++ b/src/FluentNHibernate/Conventions/Instances/OneToManyCollectionInstance.cs @@ -16,15 +16,9 @@ public OneToManyCollectionInstance(CollectionMapping mapping) this.mapping = mapping; } - IOneToManyInspector IOneToManyCollectionInspector.Relationship - { - get { return Relationship; } - } + IOneToManyInspector IOneToManyCollectionInspector.Relationship => Relationship; - IManyToOneInspector IOneToManyCollectionInspector.OtherSide - { - get { return OtherSide; } - } + IManyToOneInspector IOneToManyCollectionInspector.OtherSide => OtherSide; public IManyToOneInstance OtherSide { @@ -48,8 +42,5 @@ public IManyToOneInstance OtherSide } } - public new IOneToManyInstance Relationship - { - get { return new OneToManyInstance((OneToManyMapping)mapping.Relationship); } - } + public new IOneToManyInstance Relationship => new OneToManyInstance((OneToManyMapping)mapping.Relationship); } diff --git a/src/FluentNHibernate/DummyMethodInfo.cs b/src/FluentNHibernate/DummyMethodInfo.cs index b4defaae0..0ca6102f6 100644 --- a/src/FluentNHibernate/DummyMethodInfo.cs +++ b/src/FluentNHibernate/DummyMethodInfo.cs @@ -44,32 +44,17 @@ public override MethodInfo GetBaseDefinition() return null; } - public override ICustomAttributeProvider ReturnTypeCustomAttributes - { - get { return null; } - } + public override ICustomAttributeProvider ReturnTypeCustomAttributes => null; public override string Name { get; } - public override Type DeclaringType - { - get { return null; } - } + public override Type DeclaringType => null; - public override Type ReflectedType - { - get { return null; } - } + public override Type ReflectedType => null; - public override RuntimeMethodHandle MethodHandle - { - get { return new RuntimeMethodHandle(); } - } + public override RuntimeMethodHandle MethodHandle => new(); - public override MethodAttributes Attributes - { - get { return MethodAttributes.Public; } - } + public override MethodAttributes Attributes => MethodAttributes.Public; public override object[] GetCustomAttributes(Type attributeType, bool inherit) { diff --git a/src/FluentNHibernate/DummyPropertyInfo.cs b/src/FluentNHibernate/DummyPropertyInfo.cs index 8f52d755c..676491521 100644 --- a/src/FluentNHibernate/DummyPropertyInfo.cs +++ b/src/FluentNHibernate/DummyPropertyInfo.cs @@ -16,15 +16,9 @@ public DummyPropertyInfo(string name, Type type) this.DeclaringType = type; } - public override Module Module - { - get { return null; } - } + public override Module Module => null; - public override int MetadataToken - { - get { return Name.GetHashCode(); } - } + public override int MetadataToken => Name.GetHashCode(); public override object[] GetCustomAttributes(bool inherit) { @@ -68,30 +62,15 @@ public override ParameterInfo[] GetIndexParameters() public override Type DeclaringType { get; } - public override Type ReflectedType - { - get { return null; } - } + public override Type ReflectedType => null; - public override Type PropertyType - { - get { return DeclaringType; } - } + public override Type PropertyType => DeclaringType; - public override PropertyAttributes Attributes - { - get { return PropertyAttributes.None; } - } + public override PropertyAttributes Attributes => PropertyAttributes.None; - public override bool CanRead - { - get { return false; } - } + public override bool CanRead => false; - public override bool CanWrite - { - get { return false; } - } + public override bool CanWrite => false; public override object[] GetCustomAttributes(Type attributeType, bool inherit) { diff --git a/src/FluentNHibernate/Mapping/CachePart.cs b/src/FluentNHibernate/Mapping/CachePart.cs index 70a8260e9..a01fd42c0 100644 --- a/src/FluentNHibernate/Mapping/CachePart.cs +++ b/src/FluentNHibernate/Mapping/CachePart.cs @@ -99,10 +99,7 @@ public CachePart CustomInclude(string custom) return this; } - internal bool IsDirty - { - get { return attributes.IsSpecified("Region") || attributes.IsSpecified("Usage") || attributes.IsSpecified("Include"); } - } + internal bool IsDirty => attributes.IsSpecified("Region") || attributes.IsSpecified("Usage") || attributes.IsSpecified("Include"); CacheMapping ICacheMappingProvider.GetCacheMapping() { diff --git a/src/FluentNHibernate/Mapping/ClasslikeMapBase.cs b/src/FluentNHibernate/Mapping/ClasslikeMapBase.cs index fdc50b88d..8de75a82e 100644 --- a/src/FluentNHibernate/Mapping/ClasslikeMapBase.cs +++ b/src/FluentNHibernate/Mapping/ClasslikeMapBase.cs @@ -446,18 +446,9 @@ protected StoredProcedurePart StoredProcedure(string element, string innerText) return part; } - internal IEnumerable Properties - { - get { return providers.Properties; } - } + internal IEnumerable Properties => providers.Properties; - internal IEnumerable Components - { - get { return providers.Components; } - } + internal IEnumerable Components => providers.Components; - internal Type EntityType - { - get { return typeof(T); } - } + internal Type EntityType => typeof(T); } diff --git a/src/FluentNHibernate/Mapping/ColumnMappingCollection.cs b/src/FluentNHibernate/Mapping/ColumnMappingCollection.cs index 29a6a7884..59d16a7e8 100644 --- a/src/FluentNHibernate/Mapping/ColumnMappingCollection.cs +++ b/src/FluentNHibernate/Mapping/ColumnMappingCollection.cs @@ -54,10 +54,7 @@ public TParent Clear() return parent; } - public int Count - { - get { return columns.Count; } - } + public int Count => columns.Count; public IEnumerator GetEnumerator() { diff --git a/src/FluentNHibernate/Mapping/ComponentMap.cs b/src/FluentNHibernate/Mapping/ComponentMap.cs index 2177c683a..2df94ec95 100644 --- a/src/FluentNHibernate/Mapping/ComponentMap.cs +++ b/src/FluentNHibernate/Mapping/ComponentMap.cs @@ -61,8 +61,5 @@ ExternalComponentMapping IExternalComponentMappingProvider.GetComponentMapping() return (ExternalComponentMapping) CreateComponentMapping(); } - Type IExternalComponentMappingProvider.Type - { - get { return typeof(T); } - } + Type IExternalComponentMappingProvider.Type => typeof(T); } diff --git a/src/FluentNHibernate/Mapping/FilterDefinition.cs b/src/FluentNHibernate/Mapping/FilterDefinition.cs index ae5863671..0f53f2452 100644 --- a/src/FluentNHibernate/Mapping/FilterDefinition.cs +++ b/src/FluentNHibernate/Mapping/FilterDefinition.cs @@ -17,10 +17,7 @@ protected FilterDefinition() public string Name { get; private set; } - public IEnumerable> Parameters - { - get { return parameters; } - } + public IEnumerable> Parameters => parameters; public FilterDefinition WithName(string name) { diff --git a/src/FluentNHibernate/Mapping/IdentityPart.cs b/src/FluentNHibernate/Mapping/IdentityPart.cs index eb8e8f03d..af6765b11 100644 --- a/src/FluentNHibernate/Mapping/IdentityPart.cs +++ b/src/FluentNHibernate/Mapping/IdentityPart.cs @@ -245,10 +245,7 @@ internal void SetName(string newName) name = newName; } - bool HasNameSpecified - { - get { return !string.IsNullOrEmpty(name); } - } + bool HasNameSpecified => !string.IsNullOrEmpty(name); void SetDefaultGenerator() { diff --git a/src/FluentNHibernate/Mapping/ManyToManyPart.cs b/src/FluentNHibernate/Mapping/ManyToManyPart.cs index ff789f84b..9782b8efd 100644 --- a/src/FluentNHibernate/Mapping/ManyToManyPart.cs +++ b/src/FluentNHibernate/Mapping/ManyToManyPart.cs @@ -191,10 +191,7 @@ public ManyToManyPart AsEntityMap(string indexColumn, string valueColumn return AsMap(null).AsTernaryAssociation(indexColumn, valueColumn); } - public Type ChildType - { - get { return typeof(TChild); } - } + public Type ChildType => typeof(TChild); public NotFoundExpression> NotFound { get; } diff --git a/src/FluentNHibernate/Mapping/Member.cs b/src/FluentNHibernate/Mapping/Member.cs index a961280c5..9b53e3472 100644 --- a/src/FluentNHibernate/Mapping/Member.cs +++ b/src/FluentNHibernate/Mapping/Member.cs @@ -106,72 +106,35 @@ public MethodMember(MethodInfo member) this.member = member; } - public override string Name - { - get { return member.Name; } - } - public override Type PropertyType - { - get { return member.ReturnType; } - } - public override bool CanWrite - { - get { return false; } - } - public override MemberInfo MemberInfo - { - get { return member; } - } - public override Type DeclaringType - { - get { return member.DeclaringType; } - } - public override bool HasIndexParameters - { - get { return false; } - } - public override bool IsMethod - { - get { return true; } - } - public override bool IsField - { - get { return false; } - } - public override bool IsProperty - { - get { return false; } - } + public override string Name => member.Name; - public override bool IsAutoProperty - { - get { return false; } - } + public override Type PropertyType => member.ReturnType; - public override bool IsPrivate - { - get { return member.IsPrivate; } - } + public override bool CanWrite => false; - public override bool IsProtected - { - get { return member.IsFamily || member.IsFamilyAndAssembly; } - } + public override MemberInfo MemberInfo => member; - public override bool IsPublic - { - get { return member.IsPublic; } - } + public override Type DeclaringType => member.DeclaringType; - public override bool IsInternal - { - get { return member.IsAssembly || member.IsFamilyAndAssembly; } - } + public override bool HasIndexParameters => false; - public bool IsCompilerGenerated - { - get { return member.GetCustomAttributes(typeof(CompilerGeneratedAttribute), true).Any(); } - } + public override bool IsMethod => true; + + public override bool IsField => false; + + public override bool IsProperty => false; + + public override bool IsAutoProperty => false; + + public override bool IsPrivate => member.IsPrivate; + + public override bool IsProtected => member.IsFamily || member.IsFamilyAndAssembly; + + public override bool IsPublic => member.IsPublic; + + public override bool IsInternal => member.IsAssembly || member.IsFamilyAndAssembly; + + public bool IsCompilerGenerated => member.GetCustomAttributes(typeof(CompilerGeneratedAttribute), true).Any(); public override string ToString() { @@ -205,67 +168,33 @@ public FieldMember(FieldInfo member) this.member = member; } - public override string Name - { - get { return member.Name; } - } - public override Type PropertyType - { - get { return member.FieldType; } - } - public override bool CanWrite - { - get { return true; } - } - public override MemberInfo MemberInfo - { - get { return member; } - } - public override Type DeclaringType - { - get { return member.DeclaringType; } - } - public override bool HasIndexParameters - { - get { return false; } - } - public override bool IsMethod - { - get { return false; } - } - public override bool IsField - { - get { return true; } - } - public override bool IsProperty - { - get { return false; } - } + public override string Name => member.Name; - public override bool IsAutoProperty - { - get { return false; } - } + public override Type PropertyType => member.FieldType; - public override bool IsPrivate - { - get { return member.IsPrivate; } - } + public override bool CanWrite => true; - public override bool IsProtected - { - get { return member.IsFamily || member.IsFamilyAndAssembly; } - } + public override MemberInfo MemberInfo => member; - public override bool IsPublic - { - get { return member.IsPublic; } - } + public override Type DeclaringType => member.DeclaringType; - public override bool IsInternal - { - get { return member.IsAssembly || member.IsFamilyAndAssembly; } - } + public override bool HasIndexParameters => false; + + public override bool IsMethod => false; + + public override bool IsField => true; + + public override bool IsProperty => false; + + public override bool IsAutoProperty => false; + + public override bool IsPrivate => member.IsPrivate; + + public override bool IsProtected => member.IsFamily || member.IsFamilyAndAssembly; + + public override bool IsPublic => member.IsPublic; + + public override bool IsInternal => member.IsAssembly || member.IsFamilyAndAssembly; public override string ToString() { @@ -323,14 +252,10 @@ public override bool TryGetBackingField(out Member field) return true; } - public override string Name - { - get { return member.Name; } - } - public override Type PropertyType - { - get { return member.PropertyType; } - } + public override string Name => member.Name; + + public override Type PropertyType => member.PropertyType; + public override bool CanWrite { get @@ -344,59 +269,29 @@ public override bool CanWrite return member.CanWrite; } } - public override MemberInfo MemberInfo - { - get { return member; } - } - public override Type DeclaringType - { - get { return member.DeclaringType; } - } - public override bool HasIndexParameters - { - get { return member.GetIndexParameters().Length > 0; } - } - public override bool IsMethod - { - get { return false; } - } - public override bool IsField - { - get { return false; } - } - public override bool IsProperty - { - get { return true; } - } + public override MemberInfo MemberInfo => member; - public override bool IsAutoProperty - { - get - { - return (Get is not null && Get.IsCompilerGenerated) - || (Set is not null && Set.IsCompilerGenerated); - } - } + public override Type DeclaringType => member.DeclaringType; - public override bool IsPrivate - { - get { return Get.IsPrivate; } - } + public override bool HasIndexParameters => member.GetIndexParameters().Length > 0; - public override bool IsProtected - { - get { return Get.IsProtected; } - } + public override bool IsMethod => false; - public override bool IsPublic - { - get { return Get.IsPublic; } - } + public override bool IsField => false; - public override bool IsInternal - { - get { return Get.IsInternal; } - } + public override bool IsProperty => true; + + public override bool IsAutoProperty => + (Get is not null && Get.IsCompilerGenerated) + || (Set is not null && Set.IsCompilerGenerated); + + public override bool IsPrivate => Get.IsPrivate; + + public override bool IsProtected => Get.IsProtected; + + public override bool IsPublic => Get.IsPublic; + + public override bool IsInternal => Get.IsInternal; public MethodMember Get { get; } diff --git a/src/FluentNHibernate/Mapping/OneToManyPart.cs b/src/FluentNHibernate/Mapping/OneToManyPart.cs index 927397e5e..d8abf2a73 100644 --- a/src/FluentNHibernate/Mapping/OneToManyPart.cs +++ b/src/FluentNHibernate/Mapping/OneToManyPart.cs @@ -41,10 +41,7 @@ protected OneToManyPart(Type entity, Member member, Type collectionType) /// /// Specify the cascade behaviour /// - public new CollectionCascadeExpression> Cascade - { - get { return base.Cascade; } - } + public new CollectionCascadeExpression> Cascade => base.Cascade; /// /// Specify that this is a ternary association diff --git a/src/FluentNHibernate/Mapping/ReferenceComponentPart.cs b/src/FluentNHibernate/Mapping/ReferenceComponentPart.cs index 515bc3596..25650f3b9 100644 --- a/src/FluentNHibernate/Mapping/ReferenceComponentPart.cs +++ b/src/FluentNHibernate/Mapping/ReferenceComponentPart.cs @@ -46,8 +46,5 @@ IComponentMapping IComponentMappingProvider.GetComponentMapping() return new ReferenceComponentMapping(ComponentType.Component, property, typeof(T), containingEntityType, columnPrefix); } - Type IReferenceComponentMappingProvider.Type - { - get { return typeof(T); } - } + Type IReferenceComponentMappingProvider.Type => typeof(T); } diff --git a/src/FluentNHibernate/Mapping/SubclassMap.cs b/src/FluentNHibernate/Mapping/SubclassMap.cs index 29fdf0af8..c1717ecec 100644 --- a/src/FluentNHibernate/Mapping/SubclassMap.cs +++ b/src/FluentNHibernate/Mapping/SubclassMap.cs @@ -347,15 +347,9 @@ SubclassMapping IIndeterminateSubclassMappingProvider.GetSubclassMapping(Subclas return mapping; } - Type IIndeterminateSubclassMappingProvider.EntityType - { - get { return EntityType; } - } + Type IIndeterminateSubclassMappingProvider.EntityType => EntityType; - Type IIndeterminateSubclassMappingProvider.Extends - { - get { return attributes.GetOrDefault("Extends"); } - } + Type IIndeterminateSubclassMappingProvider.Extends => attributes.GetOrDefault("Extends"); void GenerateNestedSubclasses(SubclassMapping mapping) { diff --git a/src/FluentNHibernate/MappingModel/AnyMapping.cs b/src/FluentNHibernate/MappingModel/AnyMapping.cs index 3870351cc..8ea98b129 100644 --- a/src/FluentNHibernate/MappingModel/AnyMapping.cs +++ b/src/FluentNHibernate/MappingModel/AnyMapping.cs @@ -38,65 +38,29 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(column); } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string IdType - { - get { return attributes.GetOrDefault("IdType"); } - } + public string IdType => attributes.GetOrDefault("IdType"); - public TypeReference MetaType - { - get { return attributes.GetOrDefault("MetaType"); } - } + public TypeReference MetaType => attributes.GetOrDefault("MetaType"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public bool Insert - { - get { return attributes.GetOrDefault("Insert"); } - } + public bool Insert => attributes.GetOrDefault("Insert"); - public bool Update - { - get { return attributes.GetOrDefault("Update"); } - } + public bool Update => attributes.GetOrDefault("Update"); - public string Cascade - { - get { return attributes.GetOrDefault("Cascade"); } - } + public string Cascade => attributes.GetOrDefault("Cascade"); - public bool Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public bool Lazy => attributes.GetOrDefault("Lazy"); - public bool OptimisticLock - { - get { return attributes.GetOrDefault("OptimisticLock"); } - } + public bool OptimisticLock => attributes.GetOrDefault("OptimisticLock"); - public IEnumerable TypeColumns - { - get { return typeColumns.Columns; } - } + public IEnumerable TypeColumns => typeColumns.Columns; - public IEnumerable IdentifierColumns - { - get { return identifierColumns.Columns; } - } + public IEnumerable IdentifierColumns => identifierColumns.Columns; - public IEnumerable MetaValues - { - get { return metaValues; } - } + public IEnumerable MetaValues => metaValues; public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/CacheMapping.cs b/src/FluentNHibernate/MappingModel/CacheMapping.cs index 0d955b537..f41ff37ed 100644 --- a/src/FluentNHibernate/MappingModel/CacheMapping.cs +++ b/src/FluentNHibernate/MappingModel/CacheMapping.cs @@ -24,20 +24,11 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.ProcessCache(this); } - public string Region - { - get { return attributes.GetOrDefault("Region"); } - } + public string Region => attributes.GetOrDefault("Region"); - public string Usage - { - get { return attributes.GetOrDefault("Usage"); } - } + public string Usage => attributes.GetOrDefault("Usage"); - public string Include - { - get { return attributes.GetOrDefault("Include"); } - } + public string Include => attributes.GetOrDefault("Include"); public Type ContainedEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/ClassBased/ClassMapping.cs b/src/FluentNHibernate/MappingModel/ClassBased/ClassMapping.cs index 9bc8c264f..204b57b18 100644 --- a/src/FluentNHibernate/MappingModel/ClassBased/ClassMapping.cs +++ b/src/FluentNHibernate/MappingModel/ClassBased/ClassMapping.cs @@ -21,50 +21,23 @@ public ClassMapping(AttributeStore attributes) this.attributes = attributes; } - public IIdentityMapping Id - { - get { return attributes.GetOrDefault("Id"); } - } + public IIdentityMapping Id => attributes.GetOrDefault("Id"); - public NaturalIdMapping NaturalId - { - get { return attributes.GetOrDefault("NaturalId"); } - } + public NaturalIdMapping NaturalId => attributes.GetOrDefault("NaturalId"); - public override string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public override string Name => attributes.GetOrDefault("Name"); - public override Type Type - { - get { return attributes.GetOrDefault("Type"); } - } + public override Type Type => attributes.GetOrDefault("Type"); - public CacheMapping Cache - { - get { return attributes.GetOrDefault("Cache"); } - } + public CacheMapping Cache => attributes.GetOrDefault("Cache"); - public VersionMapping Version - { - get { return attributes.GetOrDefault("Version"); } - } + public VersionMapping Version => attributes.GetOrDefault("Version"); - public DiscriminatorMapping Discriminator - { - get { return attributes.GetOrDefault("Discriminator"); } - } + public DiscriminatorMapping Discriminator => attributes.GetOrDefault("Discriminator"); - public bool IsUnionSubclass - { - get { return attributes.GetOrDefault("IsUnionSubclass"); } - } + public bool IsUnionSubclass => attributes.GetOrDefault("IsUnionSubclass"); - public TuplizerMapping Tuplizer - { - get { return attributes.GetOrDefault("Tuplizer"); } - } + public TuplizerMapping Tuplizer => attributes.GetOrDefault("Tuplizer"); public override void AcceptVisitor(IMappingModelVisitor visitor) { @@ -91,100 +64,43 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) base.AcceptVisitor(visitor); } - public string TableName - { - get { return attributes.GetOrDefault("TableName"); } - } + public string TableName => attributes.GetOrDefault("TableName"); - public int BatchSize - { - get { return attributes.GetOrDefault("BatchSize"); } - } + public int BatchSize => attributes.GetOrDefault("BatchSize"); - public object DiscriminatorValue - { - get { return attributes.GetOrDefault("DiscriminatorValue"); } - } + public object DiscriminatorValue => attributes.GetOrDefault("DiscriminatorValue"); - public string Schema - { - get { return attributes.GetOrDefault("Schema"); } - } + public string Schema => attributes.GetOrDefault("Schema"); - public bool Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public bool Lazy => attributes.GetOrDefault("Lazy"); - public bool Mutable - { - get { return attributes.GetOrDefault("Mutable"); } - } + public bool Mutable => attributes.GetOrDefault("Mutable"); - public bool DynamicUpdate - { - get { return attributes.GetOrDefault("DynamicUpdate"); } - } + public bool DynamicUpdate => attributes.GetOrDefault("DynamicUpdate"); - public bool DynamicInsert - { - get { return attributes.GetOrDefault("DynamicInsert"); } - } + public bool DynamicInsert => attributes.GetOrDefault("DynamicInsert"); - public string OptimisticLock - { - get { return attributes.GetOrDefault("OptimisticLock"); } - } + public string OptimisticLock => attributes.GetOrDefault("OptimisticLock"); - public string Polymorphism - { - get { return attributes.GetOrDefault("Polymorphism"); } - } + public string Polymorphism => attributes.GetOrDefault("Polymorphism"); - public string Persister - { - get { return attributes.GetOrDefault("Persister"); } - } + public string Persister => attributes.GetOrDefault("Persister"); - public string Where - { - get { return attributes.GetOrDefault("Where"); } - } + public string Where => attributes.GetOrDefault("Where"); - public string Check - { - get { return attributes.GetOrDefault("Check"); } - } + public string Check => attributes.GetOrDefault("Check"); - public string Proxy - { - get { return attributes.GetOrDefault("Proxy"); } - } + public string Proxy => attributes.GetOrDefault("Proxy"); - public bool SelectBeforeUpdate - { - get { return attributes.GetOrDefault("SelectBeforeUpdate"); } - } + public bool SelectBeforeUpdate => attributes.GetOrDefault("SelectBeforeUpdate"); - public bool Abstract - { - get { return attributes.GetOrDefault("Abstract"); } - } + public bool Abstract => attributes.GetOrDefault("Abstract"); - public string Subselect - { - get { return attributes.GetOrDefault("Subselect"); } - } + public string Subselect => attributes.GetOrDefault("Subselect"); - public string SchemaAction - { - get { return attributes.GetOrDefault("SchemaAction"); } - } + public string SchemaAction => attributes.GetOrDefault("SchemaAction"); - public string EntityName - { - get { return attributes.GetOrDefault("EntityName"); } - } + public string EntityName => attributes.GetOrDefault("EntityName"); public bool Equals(ClassMapping other) { diff --git a/src/FluentNHibernate/MappingModel/ClassBased/ClassMappingBase.cs b/src/FluentNHibernate/MappingModel/ClassBased/ClassMappingBase.cs index 2a901e3ba..9455c1a79 100644 --- a/src/FluentNHibernate/MappingModel/ClassBased/ClassMappingBase.cs +++ b/src/FluentNHibernate/MappingModel/ClassBased/ClassMappingBase.cs @@ -31,55 +31,25 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) #region IHasMappedMembers - public IEnumerable References - { - get { return mappedMembers.References; } - } + public IEnumerable References => mappedMembers.References; - public IEnumerable Collections - { - get { return mappedMembers.Collections; } - } + public IEnumerable Collections => mappedMembers.Collections; - public IEnumerable Properties - { - get { return mappedMembers.Properties; } - } + public IEnumerable Properties => mappedMembers.Properties; - public IEnumerable Components - { - get { return mappedMembers.Components; } - } + public IEnumerable Components => mappedMembers.Components; - public IEnumerable OneToOnes - { - get { return mappedMembers.OneToOnes; } - } + public IEnumerable OneToOnes => mappedMembers.OneToOnes; - public IEnumerable Anys - { - get { return mappedMembers.Anys; } - } + public IEnumerable Anys => mappedMembers.Anys; - public IEnumerable Joins - { - get { return mappedMembers.Joins; } - } + public IEnumerable Joins => mappedMembers.Joins; - public IEnumerable Filters - { - get { return mappedMembers.Filters; } - } + public IEnumerable Filters => mappedMembers.Filters; - public IEnumerable Subclasses - { - get { return subclasses; } - } + public IEnumerable Subclasses => subclasses; - public IEnumerable StoredProcedures - { - get { return mappedMembers.StoredProcedures; } - } + public IEnumerable StoredProcedures => mappedMembers.StoredProcedures; public void AddProperty(PropertyMapping property) { diff --git a/src/FluentNHibernate/MappingModel/ClassBased/ComponentMapping.cs b/src/FluentNHibernate/MappingModel/ClassBased/ComponentMapping.cs index 24d86d12b..b63de10cb 100644 --- a/src/FluentNHibernate/MappingModel/ClassBased/ComponentMapping.cs +++ b/src/FluentNHibernate/MappingModel/ClassBased/ComponentMapping.cs @@ -28,32 +28,17 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) base.AcceptVisitor(visitor); } - public bool HasColumnPrefix - { - get { return !string.IsNullOrEmpty(ColumnPrefix); } - } + public bool HasColumnPrefix => !string.IsNullOrEmpty(ColumnPrefix); public string ColumnPrefix { get; set; } - public override string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public override string Name => attributes.GetOrDefault("Name"); - public override Type Type - { - get { return attributes.GetOrDefault("Type"); } - } + public override Type Type => attributes.GetOrDefault("Type"); - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); - public bool Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public bool Lazy => attributes.GetOrDefault("Lazy"); public bool Equals(ComponentMapping other) { diff --git a/src/FluentNHibernate/MappingModel/ClassBased/ComponentMappingBase.cs b/src/FluentNHibernate/MappingModel/ClassBased/ComponentMappingBase.cs index a357a3811..4d05ee939 100644 --- a/src/FluentNHibernate/MappingModel/ClassBased/ComponentMappingBase.cs +++ b/src/FluentNHibernate/MappingModel/ClassBased/ComponentMappingBase.cs @@ -29,35 +29,17 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) public Type ContainingEntityType { get; set; } public Member Member { get; set; } - public ParentMapping Parent - { - get { return attributes.GetOrDefault("Parent"); } - } + public ParentMapping Parent => attributes.GetOrDefault("Parent"); - public bool Unique - { - get { return attributes.GetOrDefault("Unique"); } - } + public bool Unique => attributes.GetOrDefault("Unique"); - public bool Insert - { - get { return attributes.GetOrDefault("Insert"); } - } + public bool Insert => attributes.GetOrDefault("Insert"); - public bool Update - { - get { return attributes.GetOrDefault("Update"); } - } + public bool Update => attributes.GetOrDefault("Update"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public bool OptimisticLock - { - get { return attributes.GetOrDefault("OptimisticLock"); } - } + public bool OptimisticLock => attributes.GetOrDefault("OptimisticLock"); public bool Equals(ComponentMappingBase other) { diff --git a/src/FluentNHibernate/MappingModel/ClassBased/ReferenceComponentMapping.cs b/src/FluentNHibernate/MappingModel/ClassBased/ReferenceComponentMapping.cs index 636aa5ff3..ca58fec4d 100644 --- a/src/FluentNHibernate/MappingModel/ClassBased/ReferenceComponentMapping.cs +++ b/src/FluentNHibernate/MappingModel/ClassBased/ReferenceComponentMapping.cs @@ -56,35 +56,17 @@ public virtual void AssociateExternalMapping(ExternalComponentMapping mapping) mergedComponent.Set(x => x.Type, Layer.Defaults, componentType); } - public IEnumerable References - { - get { return mergedComponent.References; } - } + public IEnumerable References => mergedComponent.References; - public IEnumerable Collections - { - get { return mergedComponent.Collections; } - } - - public IEnumerable Properties - { - get { return mergedComponent.Properties; } - } + public IEnumerable Collections => mergedComponent.Collections; - public IEnumerable Components - { - get { return mergedComponent.Components; } - } + public IEnumerable Properties => mergedComponent.Properties; - public IEnumerable OneToOnes - { - get { return mergedComponent.OneToOnes; } - } + public IEnumerable Components => mergedComponent.Components; - public IEnumerable Anys - { - get { return mergedComponent.Anys; } - } + public IEnumerable OneToOnes => mergedComponent.OneToOnes; + + public IEnumerable Anys => mergedComponent.Anys; public void AddProperty(PropertyMapping property) { @@ -118,81 +100,39 @@ public void AddAny(AnyMapping mapping) public Type ContainingEntityType { - get { return containingEntityType; } - set { containingEntityType = value; } + get => containingEntityType; + set => containingEntityType = value; } - public Member Member - { - get { return (mergedComponent is null) ? property : mergedComponent.Member; } - } + public Member Member => (mergedComponent is null) ? property : mergedComponent.Member; - public ParentMapping Parent - { - get { return mergedComponent.Parent; } - } + public ParentMapping Parent => mergedComponent.Parent; - public bool Unique - { - get { return mergedComponent.Unique; } - } + public bool Unique => mergedComponent.Unique; - public bool HasColumnPrefix - { - get { return !string.IsNullOrEmpty(ColumnPrefix); } - } + public bool HasColumnPrefix => !string.IsNullOrEmpty(ColumnPrefix); public string ColumnPrefix { get; set; } - public bool Insert - { - get { return mergedComponent.Insert; } - } + public bool Insert => mergedComponent.Insert; - public bool Update - { - get { return mergedComponent.Update; } - } + public bool Update => mergedComponent.Update; - public string Access - { - get { return mergedComponent.Access; } - } + public string Access => mergedComponent.Access; - public bool OptimisticLock - { - get { return mergedComponent.OptimisticLock; } - } + public bool OptimisticLock => mergedComponent.OptimisticLock; - public string Name - { - get { return (mergedComponent is null) ? property.Name : mergedComponent.Name; } - } + public string Name => (mergedComponent is null) ? property.Name : mergedComponent.Name; - public Type Type - { - get { return (mergedComponent is null) ? componentType : mergedComponent.Type; } - } + public Type Type => (mergedComponent is null) ? componentType : mergedComponent.Type; - public TypeReference Class - { - get { return mergedComponent.Class; } - } + public TypeReference Class => mergedComponent.Class; - public bool Lazy - { - get { return mergedComponent.Lazy; } - } + public bool Lazy => mergedComponent.Lazy; - public bool IsAssociated - { - get { return mergedComponent is not null; } - } + public bool IsAssociated => mergedComponent is not null; - public ComponentMapping MergedModel - { - get { return mergedComponent; } - } + public ComponentMapping MergedModel => mergedComponent; public bool Equals(ReferenceComponentMapping other) { diff --git a/src/FluentNHibernate/MappingModel/ClassBased/SubclassMapping.cs b/src/FluentNHibernate/MappingModel/ClassBased/SubclassMapping.cs index 39024e644..aedbd8d80 100644 --- a/src/FluentNHibernate/MappingModel/ClassBased/SubclassMapping.cs +++ b/src/FluentNHibernate/MappingModel/ClassBased/SubclassMapping.cs @@ -28,10 +28,7 @@ public SubclassMapping(SubclassType subclassType, AttributeStore attributes) /// instead used as a marker for the /// to pair things up. /// - public Type Extends - { - get { return attributes.GetOrDefault("Extends"); } - } + public Type Extends => attributes.GetOrDefault("Extends"); public override void AcceptVisitor(IMappingModelVisitor visitor) { @@ -43,90 +40,39 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) base.AcceptVisitor(visitor); } - public override string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public override string Name => attributes.GetOrDefault("Name"); - public override Type Type - { - get { return attributes.GetOrDefault("Type"); } - } + public override Type Type => attributes.GetOrDefault("Type"); - public object DiscriminatorValue - { - get { return attributes.GetOrDefault("DiscriminatorValue"); } - } + public object DiscriminatorValue => attributes.GetOrDefault("DiscriminatorValue"); - public bool Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public bool Lazy => attributes.GetOrDefault("Lazy"); - public string Proxy - { - get { return attributes.GetOrDefault("Proxy"); } - } + public string Proxy => attributes.GetOrDefault("Proxy"); - public bool DynamicUpdate - { - get { return attributes.GetOrDefault("DynamicUpdate"); } - } + public bool DynamicUpdate => attributes.GetOrDefault("DynamicUpdate"); - public bool DynamicInsert - { - get { return attributes.GetOrDefault("DynamicInsert"); } - } + public bool DynamicInsert => attributes.GetOrDefault("DynamicInsert"); - public bool SelectBeforeUpdate - { - get { return attributes.GetOrDefault("SelectBeforeUpdate"); } - } + public bool SelectBeforeUpdate => attributes.GetOrDefault("SelectBeforeUpdate"); - public bool Abstract - { - get { return attributes.GetOrDefault("Abstract"); } - } + public bool Abstract => attributes.GetOrDefault("Abstract"); - public string EntityName - { - get { return attributes.GetOrDefault("EntityName"); } - } + public string EntityName => attributes.GetOrDefault("EntityName"); - public string TableName - { - get { return attributes.GetOrDefault("TableName"); } - } + public string TableName => attributes.GetOrDefault("TableName"); - public KeyMapping Key - { - get { return attributes.GetOrDefault("Key"); } - } + public KeyMapping Key => attributes.GetOrDefault("Key"); - public string Check - { - get { return attributes.GetOrDefault("Check"); } - } + public string Check => attributes.GetOrDefault("Check"); - public string Schema - { - get { return attributes.GetOrDefault("Schema"); } - } + public string Schema => attributes.GetOrDefault("Schema"); - public string Subselect - { - get { return attributes.GetOrDefault("Subselect"); } - } + public string Subselect => attributes.GetOrDefault("Subselect"); - public TypeReference Persister - { - get { return attributes.GetOrDefault("Persister"); } - } + public TypeReference Persister => attributes.GetOrDefault("Persister"); - public int BatchSize - { - get { return attributes.GetOrDefault("BatchSize"); } - } + public int BatchSize => attributes.GetOrDefault("BatchSize"); public void OverrideAttributes(AttributeStore store) { diff --git a/src/FluentNHibernate/MappingModel/Collections/CollectionMapping.cs b/src/FluentNHibernate/MappingModel/Collections/CollectionMapping.cs index adccd98df..db2760efa 100644 --- a/src/FluentNHibernate/MappingModel/Collections/CollectionMapping.cs +++ b/src/FluentNHibernate/MappingModel/Collections/CollectionMapping.cs @@ -21,10 +21,7 @@ public class CollectionMapping : MappingBase, IRelationship this.attributes = attributes; } - public IEnumerable Filters - { - get { return filters; } - } + public IEnumerable Filters => filters; public void AddFilter(FilterMapping mapping) { @@ -57,139 +54,61 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(Cache); } - public Type ChildType - { - get { return attributes.GetOrDefault("ChildType"); } - } + public Type ChildType => attributes.GetOrDefault("ChildType"); public IRelationship OtherSide { get; set; } - public KeyMapping Key - { - get { return attributes.GetOrDefault("Key"); } - } + public KeyMapping Key => attributes.GetOrDefault("Key"); - public ElementMapping Element - { - get { return attributes.GetOrDefault("Element"); } - } + public ElementMapping Element => attributes.GetOrDefault("Element"); - public CompositeElementMapping CompositeElement - { - get { return attributes.GetOrDefault("CompositeElement"); } - } + public CompositeElementMapping CompositeElement => attributes.GetOrDefault("CompositeElement"); - public CacheMapping Cache - { - get { return attributes.GetOrDefault("Cache"); } - } + public CacheMapping Cache => attributes.GetOrDefault("Cache"); - public ICollectionRelationshipMapping Relationship - { - get { return attributes.GetOrDefault("Relationship"); } - } + public ICollectionRelationshipMapping Relationship => attributes.GetOrDefault("Relationship"); - public bool Generic - { - get { return attributes.GetOrDefault("Generic"); } - } + public bool Generic => attributes.GetOrDefault("Generic"); - public Lazy Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public Lazy Lazy => attributes.GetOrDefault("Lazy"); - public bool Inverse - { - get { return attributes.GetOrDefault("Inverse"); } - } + public bool Inverse => attributes.GetOrDefault("Inverse"); - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public string TableName - { - get { return attributes.GetOrDefault("TableName"); } - } + public string TableName => attributes.GetOrDefault("TableName"); - public string Schema - { - get { return attributes.GetOrDefault("Schema"); } - } + public string Schema => attributes.GetOrDefault("Schema"); - public string Fetch - { - get { return attributes.GetOrDefault("Fetch"); } - } + public string Fetch => attributes.GetOrDefault("Fetch"); - public string Cascade - { - get { return attributes.GetOrDefault("Cascade"); } - } + public string Cascade => attributes.GetOrDefault("Cascade"); - public string Where - { - get { return attributes.GetOrDefault("Where"); } - } + public string Where => attributes.GetOrDefault("Where"); - public bool Mutable - { - get { return attributes.GetOrDefault("Mutable"); } - } + public bool Mutable => attributes.GetOrDefault("Mutable"); - public string Subselect - { - get { return attributes.GetOrDefault("Subselect"); } - } + public string Subselect => attributes.GetOrDefault("Subselect"); - public TypeReference Persister - { - get { return attributes.GetOrDefault("Persister"); } - } + public TypeReference Persister => attributes.GetOrDefault("Persister"); - public int BatchSize - { - get { return attributes.GetOrDefault("BatchSize"); } - } + public int BatchSize => attributes.GetOrDefault("BatchSize"); - public string Check - { - get { return attributes.GetOrDefault("Check"); } - } + public string Check => attributes.GetOrDefault("Check"); - public TypeReference CollectionType - { - get { return attributes.GetOrDefault("CollectionType"); } - } + public TypeReference CollectionType => attributes.GetOrDefault("CollectionType"); - public bool OptimisticLock - { - get { return attributes.GetOrDefault("OptimisticLock"); } - } + public bool OptimisticLock => attributes.GetOrDefault("OptimisticLock"); - public string OrderBy - { - get { return attributes.GetOrDefault("OrderBy"); } - } + public string OrderBy => attributes.GetOrDefault("OrderBy"); public Collection Collection { get; set; } - public string Sort - { - get { return attributes.GetOrDefault("Sort"); } - } + public string Sort => attributes.GetOrDefault("Sort"); - public IIndexMapping Index - { - get { return attributes.GetOrDefault("Index"); } - } + public IIndexMapping Index => attributes.GetOrDefault("Index"); public bool Equals(CollectionMapping other) { diff --git a/src/FluentNHibernate/MappingModel/Collections/CompositeElementMapping.cs b/src/FluentNHibernate/MappingModel/Collections/CompositeElementMapping.cs index cae9b9a6f..14892e42c 100644 --- a/src/FluentNHibernate/MappingModel/Collections/CompositeElementMapping.cs +++ b/src/FluentNHibernate/MappingModel/Collections/CompositeElementMapping.cs @@ -36,35 +36,20 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) mappedMembers.AcceptVisitor(visitor); } - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); - public ParentMapping Parent - { - get { return attributes.GetOrDefault("Parent"); } - } + public ParentMapping Parent => attributes.GetOrDefault("Parent"); - public IEnumerable Properties - { - get { return mappedMembers.Properties; } - } + public IEnumerable Properties => mappedMembers.Properties; public void AddProperty(PropertyMapping property) { mappedMembers.AddProperty(property); } - public IEnumerable References - { - get { return mappedMembers.References; } - } + public IEnumerable References => mappedMembers.References; - public IEnumerable CompositeElements - { - get { return compositeElements; } - } + public IEnumerable CompositeElements => compositeElements; public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/Collections/ElementMapping.cs b/src/FluentNHibernate/MappingModel/Collections/ElementMapping.cs index 5b68a1364..79c7a398a 100644 --- a/src/FluentNHibernate/MappingModel/Collections/ElementMapping.cs +++ b/src/FluentNHibernate/MappingModel/Collections/ElementMapping.cs @@ -29,20 +29,11 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(column); } - public TypeReference Type - { - get { return attributes.GetOrDefault("Type"); } - } + public TypeReference Type => attributes.GetOrDefault("Type"); - public string Formula - { - get { return attributes.GetOrDefault("Formula"); } - } + public string Formula => attributes.GetOrDefault("Formula"); - public IEnumerable Columns - { - get { return columns.Columns; } - } + public IEnumerable Columns => columns.Columns; public void AddColumn(int layer, ColumnMapping mapping) { diff --git a/src/FluentNHibernate/MappingModel/Collections/IndexManyToManyMapping.cs b/src/FluentNHibernate/MappingModel/Collections/IndexManyToManyMapping.cs index 089e91d9d..c2bc5d65f 100644 --- a/src/FluentNHibernate/MappingModel/Collections/IndexManyToManyMapping.cs +++ b/src/FluentNHibernate/MappingModel/Collections/IndexManyToManyMapping.cs @@ -31,15 +31,9 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) public Type ContainingEntityType { get; set; } - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); - public IEnumerable Columns - { - get { return columns.Columns; } - } + public IEnumerable Columns => columns.Columns; public void AddColumn(int layer, ColumnMapping mapping) { @@ -51,15 +45,9 @@ public void MakeColumnsEmpty(int layer) columns.MakeColumnsEmpty(layer); } - public string ForeignKey - { - get { return attributes.GetOrDefault("ForeignKey"); } - } + public string ForeignKey => attributes.GetOrDefault("ForeignKey"); - public string EntityName - { - get { return attributes.GetOrDefault("EntityName"); } - } + public string EntityName => attributes.GetOrDefault("EntityName"); public bool Equals(IndexManyToManyMapping other) { diff --git a/src/FluentNHibernate/MappingModel/Collections/IndexMapping.cs b/src/FluentNHibernate/MappingModel/Collections/IndexMapping.cs index e63af5866..175ecf4d9 100644 --- a/src/FluentNHibernate/MappingModel/Collections/IndexMapping.cs +++ b/src/FluentNHibernate/MappingModel/Collections/IndexMapping.cs @@ -29,22 +29,13 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(column); } - public TypeReference Type - { - get { return attributes.GetOrDefault("Type"); } - } + public TypeReference Type => attributes.GetOrDefault("Type"); - public int Offset - { - get { return attributes.GetOrDefault("Offset"); } - } + public int Offset => attributes.GetOrDefault("Offset"); public Type ContainingEntityType { get; set; } - public IEnumerable Columns - { - get { return columns.Columns; } - } + public IEnumerable Columns => columns.Columns; public void AddColumn(int layer, ColumnMapping mapping) { diff --git a/src/FluentNHibernate/MappingModel/Collections/ManyToManyMapping.cs b/src/FluentNHibernate/MappingModel/Collections/ManyToManyMapping.cs index e37bd8768..e70c78f19 100644 --- a/src/FluentNHibernate/MappingModel/Collections/ManyToManyMapping.cs +++ b/src/FluentNHibernate/MappingModel/Collections/ManyToManyMapping.cs @@ -34,67 +34,31 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(filter); } - public Type ChildType - { - get { return attributes.GetOrDefault("ChildType"); } - } + public Type ChildType => attributes.GetOrDefault("ChildType"); - public Type ParentType - { - get { return attributes.GetOrDefault("ParentType"); } - } + public Type ParentType => attributes.GetOrDefault("ParentType"); - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); - public string ForeignKey - { - get { return attributes.GetOrDefault("ForeignKey"); } - } + public string ForeignKey => attributes.GetOrDefault("ForeignKey"); - public string Fetch - { - get { return attributes.GetOrDefault("Fetch"); } - } + public string Fetch => attributes.GetOrDefault("Fetch"); - public string NotFound - { - get { return attributes.GetOrDefault("NotFound"); } - } + public string NotFound => attributes.GetOrDefault("NotFound"); - public string Where - { - get { return attributes.GetOrDefault("Where"); } - } + public string Where => attributes.GetOrDefault("Where"); - public bool Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public bool Lazy => attributes.GetOrDefault("Lazy"); - public string EntityName - { - get { return attributes.GetOrDefault("EntityName"); } - } + public string EntityName => attributes.GetOrDefault("EntityName"); - public string OrderBy - { - get { return attributes.GetOrDefault("OrderBy"); } - } + public string OrderBy => attributes.GetOrDefault("OrderBy"); - public string ChildPropertyRef - { - get { return attributes.GetOrDefault("ChildPropertyRef"); } - } + public string ChildPropertyRef => attributes.GetOrDefault("ChildPropertyRef"); public Type ContainingEntityType { get; set; } - public IEnumerable Columns - { - get { return columns.Columns; } - } + public IEnumerable Columns => columns.Columns; public void AddColumn(int layer, ColumnMapping mapping) { diff --git a/src/FluentNHibernate/MappingModel/Collections/NestedCompositeElementMapping.cs b/src/FluentNHibernate/MappingModel/Collections/NestedCompositeElementMapping.cs index 515cf2056..57c1f72bf 100644 --- a/src/FluentNHibernate/MappingModel/Collections/NestedCompositeElementMapping.cs +++ b/src/FluentNHibernate/MappingModel/Collections/NestedCompositeElementMapping.cs @@ -19,15 +19,9 @@ public NestedCompositeElementMapping(AttributeStore attributes) this.attributes = attributes; } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); public void Set(Expression> expression, int layer, T value) { diff --git a/src/FluentNHibernate/MappingModel/Collections/OneToManyMapping.cs b/src/FluentNHibernate/MappingModel/Collections/OneToManyMapping.cs index 63f256f67..1086a8134 100644 --- a/src/FluentNHibernate/MappingModel/Collections/OneToManyMapping.cs +++ b/src/FluentNHibernate/MappingModel/Collections/OneToManyMapping.cs @@ -24,25 +24,13 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.ProcessOneToMany(this); } - public Type ChildType - { - get { return attributes.GetOrDefault("ChildType"); } - } + public Type ChildType => attributes.GetOrDefault("ChildType"); - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); - public string NotFound - { - get { return attributes.GetOrDefault("NotFound"); } - } + public string NotFound => attributes.GetOrDefault("NotFound"); - public string EntityName - { - get { return attributes.GetOrDefault("EntityName"); } - } + public string EntityName => attributes.GetOrDefault("EntityName"); public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/ColumnBasedMappingBase.cs b/src/FluentNHibernate/MappingModel/ColumnBasedMappingBase.cs index 26c0938a0..6f3525d0c 100644 --- a/src/FluentNHibernate/MappingModel/ColumnBasedMappingBase.cs +++ b/src/FluentNHibernate/MappingModel/ColumnBasedMappingBase.cs @@ -15,10 +15,7 @@ protected ColumnBasedMappingBase(AttributeStore underlyingStore) attributes = underlyingStore.Clone(); } - public IEnumerable Columns - { - get { return columns.Columns; } - } + public IEnumerable Columns => columns.Columns; public void AddColumn(int layer, ColumnMapping mapping) { diff --git a/src/FluentNHibernate/MappingModel/ColumnMapping.cs b/src/FluentNHibernate/MappingModel/ColumnMapping.cs index 2c271e72d..e3f730127 100644 --- a/src/FluentNHibernate/MappingModel/ColumnMapping.cs +++ b/src/FluentNHibernate/MappingModel/ColumnMapping.cs @@ -32,65 +32,29 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) public Member Member { get; set; } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public int Length - { - get { return attributes.GetOrDefault("Length"); } - } + public int Length => attributes.GetOrDefault("Length"); - public bool NotNull - { - get { return attributes.GetOrDefault("NotNull"); } - } + public bool NotNull => attributes.GetOrDefault("NotNull"); - public bool Nullable - { - get { return !NotNull; } - } + public bool Nullable => !NotNull; - public bool Unique - { - get { return attributes.GetOrDefault("Unique"); } - } + public bool Unique => attributes.GetOrDefault("Unique"); - public string UniqueKey - { - get { return attributes.GetOrDefault("UniqueKey"); } - } + public string UniqueKey => attributes.GetOrDefault("UniqueKey"); - public string SqlType - { - get { return attributes.GetOrDefault("SqlType"); } - } + public string SqlType => attributes.GetOrDefault("SqlType"); - public string Index - { - get { return attributes.GetOrDefault("Index"); } - } + public string Index => attributes.GetOrDefault("Index"); - public string Check - { - get { return attributes.GetOrDefault("Check"); } - } + public string Check => attributes.GetOrDefault("Check"); - public int Precision - { - get { return attributes.GetOrDefault("Precision"); } - } + public int Precision => attributes.GetOrDefault("Precision"); - public int Scale - { - get { return attributes.GetOrDefault("Scale"); } - } + public int Scale => attributes.GetOrDefault("Scale"); - public string Default - { - get { return attributes.GetOrDefault("Default"); } - } + public string Default => attributes.GetOrDefault("Default"); public ColumnMapping Clone() { diff --git a/src/FluentNHibernate/MappingModel/DiscriminatorMapping.cs b/src/FluentNHibernate/MappingModel/DiscriminatorMapping.cs index 80c6a705e..ce9ba4e43 100644 --- a/src/FluentNHibernate/MappingModel/DiscriminatorMapping.cs +++ b/src/FluentNHibernate/MappingModel/DiscriminatorMapping.cs @@ -23,25 +23,13 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) Columns.Each(visitor.Visit); } - public bool Force - { - get { return attributes.GetOrDefault("Force"); } - } + public bool Force => attributes.GetOrDefault("Force"); - public bool Insert - { - get { return attributes.GetOrDefault("Insert"); } - } + public bool Insert => attributes.GetOrDefault("Insert"); - public string Formula - { - get { return attributes.GetOrDefault("Formula"); } - } + public string Formula => attributes.GetOrDefault("Formula"); - public TypeReference Type - { - get { return attributes.GetOrDefault("Type"); } - } + public TypeReference Type => attributes.GetOrDefault("Type"); public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/FilterDefinitionMapping.cs b/src/FluentNHibernate/MappingModel/FilterDefinitionMapping.cs index 312db29de..aca9d1b53 100644 --- a/src/FluentNHibernate/MappingModel/FilterDefinitionMapping.cs +++ b/src/FluentNHibernate/MappingModel/FilterDefinitionMapping.cs @@ -24,15 +24,9 @@ public FilterDefinitionMapping(AttributeStore attributes) public IDictionary Parameters { get; } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Condition - { - get { return attributes.GetOrDefault("Condition"); } - } + public string Condition => attributes.GetOrDefault("Condition"); public override void AcceptVisitor(IMappingModelVisitor visitor) { diff --git a/src/FluentNHibernate/MappingModel/FilterMapping.cs b/src/FluentNHibernate/MappingModel/FilterMapping.cs index 021f8bea7..2cea1ce30 100644 --- a/src/FluentNHibernate/MappingModel/FilterMapping.cs +++ b/src/FluentNHibernate/MappingModel/FilterMapping.cs @@ -19,15 +19,9 @@ public FilterMapping(AttributeStore attributes) this.attributes = attributes; } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Condition - { - get { return attributes.GetOrDefault("Condition"); } - } + public string Condition => attributes.GetOrDefault("Condition"); public void AcceptVisitor(IMappingModelVisitor visitor) { diff --git a/src/FluentNHibernate/MappingModel/HibernateMapping.cs b/src/FluentNHibernate/MappingModel/HibernateMapping.cs index faecbd090..94653d94a 100644 --- a/src/FluentNHibernate/MappingModel/HibernateMapping.cs +++ b/src/FluentNHibernate/MappingModel/HibernateMapping.cs @@ -40,20 +40,11 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(filterMapping); } - public IEnumerable Classes - { - get { return classes; } - } + public IEnumerable Classes => classes; - public IEnumerable Filters - { - get { return filters; } - } + public IEnumerable Filters => filters; - public IEnumerable Imports - { - get { return imports; } - } + public IEnumerable Imports => imports; public void AddClass(ClassMapping classMapping) { @@ -70,45 +61,21 @@ public void AddImport(ImportMapping importMapping) imports.Add(importMapping); } - public string Catalog - { - get { return attributes.GetOrDefault("Catalog"); } - } + public string Catalog => attributes.GetOrDefault("Catalog"); - public string DefaultAccess - { - get { return attributes.GetOrDefault("DefaultAccess"); } - } + public string DefaultAccess => attributes.GetOrDefault("DefaultAccess"); - public string DefaultCascade - { - get { return attributes.GetOrDefault("DefaultCascade"); } - } + public string DefaultCascade => attributes.GetOrDefault("DefaultCascade"); - public bool AutoImport - { - get { return attributes.GetOrDefault("AutoImport"); } - } + public bool AutoImport => attributes.GetOrDefault("AutoImport"); - public string Schema - { - get { return attributes.GetOrDefault("Schema"); } - } + public string Schema => attributes.GetOrDefault("Schema"); - public bool DefaultLazy - { - get { return attributes.GetOrDefault("DefaultLazy"); } - } + public bool DefaultLazy => attributes.GetOrDefault("DefaultLazy"); - public string Namespace - { - get { return attributes.GetOrDefault("Namespace"); } - } + public string Namespace => attributes.GetOrDefault("Namespace"); - public string Assembly - { - get { return attributes.GetOrDefault("Assembly"); } - } + public string Assembly => attributes.GetOrDefault("Assembly"); public bool Equals(HibernateMapping other) { diff --git a/src/FluentNHibernate/MappingModel/Identity/CompositeIdMapping.cs b/src/FluentNHibernate/MappingModel/Identity/CompositeIdMapping.cs index a29082315..0c830e54b 100644 --- a/src/FluentNHibernate/MappingModel/Identity/CompositeIdMapping.cs +++ b/src/FluentNHibernate/MappingModel/Identity/CompositeIdMapping.cs @@ -34,35 +34,17 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) } } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public bool Mapped - { - get { return attributes.GetOrDefault("Mapped") || !string.IsNullOrEmpty(Name); } - } + public bool Mapped => attributes.GetOrDefault("Mapped") || !string.IsNullOrEmpty(Name); - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); - public string UnsavedValue - { - get { return attributes.GetOrDefault("UnsavedValue"); } - } + public string UnsavedValue => attributes.GetOrDefault("UnsavedValue"); - public IEnumerable Keys - { - get { return keys; } - } + public IEnumerable Keys => keys; public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/Identity/GeneratorMapping.cs b/src/FluentNHibernate/MappingModel/Identity/GeneratorMapping.cs index e158cd20a..56b7a719c 100644 --- a/src/FluentNHibernate/MappingModel/Identity/GeneratorMapping.cs +++ b/src/FluentNHibernate/MappingModel/Identity/GeneratorMapping.cs @@ -21,10 +21,7 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.ProcessGenerator(this); } - public string Class - { - get { return attributes.GetOrDefault("Class"); } - } + public string Class => attributes.GetOrDefault("Class"); public IDictionary Params { get; private set; } public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/Identity/IdMapping.cs b/src/FluentNHibernate/MappingModel/Identity/IdMapping.cs index cdda4c9b7..261779fe5 100644 --- a/src/FluentNHibernate/MappingModel/Identity/IdMapping.cs +++ b/src/FluentNHibernate/MappingModel/Identity/IdMapping.cs @@ -18,10 +18,7 @@ public IdMapping(AttributeStore underlyingStore) public Member Member { get; set; } - public GeneratorMapping Generator - { - get { return attributes.GetOrDefault("Generator"); } - } + public GeneratorMapping Generator => attributes.GetOrDefault("Generator"); public override void AcceptVisitor(IMappingModelVisitor visitor) { @@ -34,25 +31,13 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(Generator); } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public TypeReference Type - { - get { return attributes.GetOrDefault("Type"); } - } + public TypeReference Type => attributes.GetOrDefault("Type"); - public string UnsavedValue - { - get { return attributes.GetOrDefault("UnsavedValue"); } - } + public string UnsavedValue => attributes.GetOrDefault("UnsavedValue"); public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/Identity/KeyManyToOneMapping.cs b/src/FluentNHibernate/MappingModel/Identity/KeyManyToOneMapping.cs index dfb90db12..d4b48ac85 100644 --- a/src/FluentNHibernate/MappingModel/Identity/KeyManyToOneMapping.cs +++ b/src/FluentNHibernate/MappingModel/Identity/KeyManyToOneMapping.cs @@ -20,48 +20,21 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(column); } - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); - public string ForeignKey - { - get { return attributes.GetOrDefault("ForeignKey"); } - } + public string ForeignKey => attributes.GetOrDefault("ForeignKey"); - public bool Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public bool Lazy => attributes.GetOrDefault("Lazy"); - public string NotFound - { - get { return attributes.GetOrDefault("NotFound"); } - } + public string NotFound => attributes.GetOrDefault("NotFound"); - public string EntityName - { - get { return attributes.GetOrDefault("EntityName"); } - } + public string EntityName => attributes.GetOrDefault("EntityName"); - public IEnumerable Columns - { - get - { - return columns; - } - } + public IEnumerable Columns => columns; public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/Identity/KeyPropertyMapping.cs b/src/FluentNHibernate/MappingModel/Identity/KeyPropertyMapping.cs index cc0f2b05e..8fdbbb304 100644 --- a/src/FluentNHibernate/MappingModel/Identity/KeyPropertyMapping.cs +++ b/src/FluentNHibernate/MappingModel/Identity/KeyPropertyMapping.cs @@ -20,30 +20,15 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(column); } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public TypeReference Type - { - get { return attributes.GetOrDefault("Type"); } - } + public TypeReference Type => attributes.GetOrDefault("Type"); - public int Length - { - get { return attributes.GetOrDefault("Length"); } - } + public int Length => attributes.GetOrDefault("Length"); - public IEnumerable Columns - { - get { return columns; } - } + public IEnumerable Columns => columns; public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/ImportMapping.cs b/src/FluentNHibernate/MappingModel/ImportMapping.cs index 73a5017ba..47a28e5a4 100644 --- a/src/FluentNHibernate/MappingModel/ImportMapping.cs +++ b/src/FluentNHibernate/MappingModel/ImportMapping.cs @@ -22,15 +22,9 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.ProcessImport(this); } - public string Rename - { - get { return attributes.GetOrDefault("Rename"); } - } + public string Rename => attributes.GetOrDefault("Rename"); - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); public bool Equals(ImportMapping other) { diff --git a/src/FluentNHibernate/MappingModel/JoinMapping.cs b/src/FluentNHibernate/MappingModel/JoinMapping.cs index 24afb061b..f15f2e72f 100644 --- a/src/FluentNHibernate/MappingModel/JoinMapping.cs +++ b/src/FluentNHibernate/MappingModel/JoinMapping.cs @@ -25,35 +25,17 @@ public JoinMapping(AttributeStore attributes) mappedMembers = new MappedMembers(); } - public KeyMapping Key - { - get { return attributes.GetOrDefault("Key"); } - } + public KeyMapping Key => attributes.GetOrDefault("Key"); - public IEnumerable Properties - { - get { return mappedMembers.Properties; } - } + public IEnumerable Properties => mappedMembers.Properties; - public IEnumerable References - { - get { return mappedMembers.References; } - } + public IEnumerable References => mappedMembers.References; - public IEnumerable Components - { - get { return mappedMembers.Components; } - } + public IEnumerable Components => mappedMembers.Components; - public IEnumerable Anys - { - get { return mappedMembers.Anys; } - } + public IEnumerable Anys => mappedMembers.Anys; - public IEnumerable Collections - { - get { return mappedMembers.Collections; } - } + public IEnumerable Collections => mappedMembers.Collections; public void AddProperty(PropertyMapping property) { @@ -85,40 +67,19 @@ public void AddStoredProcedure(StoredProcedureMapping storedProcedureMapping) mappedMembers.AddStoredProcedure(storedProcedureMapping); } - public string TableName - { - get { return attributes.GetOrDefault("TableName"); } - } + public string TableName => attributes.GetOrDefault("TableName"); - public string Schema - { - get { return attributes.GetOrDefault("Schema"); } - } + public string Schema => attributes.GetOrDefault("Schema"); - public string Catalog - { - get { return attributes.GetOrDefault("Catalog"); } - } + public string Catalog => attributes.GetOrDefault("Catalog"); - public string Subselect - { - get { return attributes.GetOrDefault("Subselect"); } - } + public string Subselect => attributes.GetOrDefault("Subselect"); - public string Fetch - { - get { return attributes.GetOrDefault("Fetch"); } - } + public string Fetch => attributes.GetOrDefault("Fetch"); - public bool Inverse - { - get { return attributes.GetOrDefault("Inverse"); } - } + public bool Inverse => attributes.GetOrDefault("Inverse"); - public bool Optional - { - get { return attributes.GetOrDefault("Optional"); } - } + public bool Optional => attributes.GetOrDefault("Optional"); public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/KeyMapping.cs b/src/FluentNHibernate/MappingModel/KeyMapping.cs index 6d13b64fb..da4e2a753 100644 --- a/src/FluentNHibernate/MappingModel/KeyMapping.cs +++ b/src/FluentNHibernate/MappingModel/KeyMapping.cs @@ -31,40 +31,19 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.Visit(column); } - public string ForeignKey - { - get { return attributes.GetOrDefault("ForeignKey"); } - } + public string ForeignKey => attributes.GetOrDefault("ForeignKey"); - public string PropertyRef - { - get { return attributes.GetOrDefault("PropertyRef"); } - } + public string PropertyRef => attributes.GetOrDefault("PropertyRef"); - public string OnDelete - { - get { return attributes.GetOrDefault("OnDelete"); } - } + public string OnDelete => attributes.GetOrDefault("OnDelete"); - public bool NotNull - { - get { return attributes.GetOrDefault("NotNull"); } - } + public bool NotNull => attributes.GetOrDefault("NotNull"); - public bool Update - { - get { return attributes.GetOrDefault("Update"); } - } + public bool Update => attributes.GetOrDefault("Update"); - public bool Unique - { - get { return attributes.GetOrDefault("Unique"); } - } + public bool Unique => attributes.GetOrDefault("Unique"); - public IEnumerable Columns - { - get { return columns.Columns; } - } + public IEnumerable Columns => columns.Columns; public void AddColumn(int layer, ColumnMapping mapping) { diff --git a/src/FluentNHibernate/MappingModel/ManyToOneMapping.cs b/src/FluentNHibernate/MappingModel/ManyToOneMapping.cs index 498c2de06..bd76d0193 100644 --- a/src/FluentNHibernate/MappingModel/ManyToOneMapping.cs +++ b/src/FluentNHibernate/MappingModel/ManyToOneMapping.cs @@ -33,80 +33,35 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) public Type ContainingEntityType { get; set; } public Member Member { get; set; } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); - public string Cascade - { - get { return attributes.GetOrDefault("Cascade"); } - } + public string Cascade => attributes.GetOrDefault("Cascade"); - public string Fetch - { - get { return attributes.GetOrDefault("Fetch"); } - } + public string Fetch => attributes.GetOrDefault("Fetch"); - public bool Update - { - get { return attributes.GetOrDefault("Update"); } - } + public bool Update => attributes.GetOrDefault("Update"); - public bool Insert - { - get { return attributes.GetOrDefault("Insert"); } - } - - public string Formula - { - get { return attributes.GetOrDefault("Formula"); } - } + public bool Insert => attributes.GetOrDefault("Insert"); - public string ForeignKey - { - get { return attributes.GetOrDefault("ForeignKey"); } - } + public string Formula => attributes.GetOrDefault("Formula"); - public string PropertyRef - { - get { return attributes.GetOrDefault("PropertyRef"); } - } + public string ForeignKey => attributes.GetOrDefault("ForeignKey"); - public string NotFound - { - get { return attributes.GetOrDefault("NotFound"); } - } + public string PropertyRef => attributes.GetOrDefault("PropertyRef"); - public string Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public string NotFound => attributes.GetOrDefault("NotFound"); - public string EntityName - { - get { return attributes.GetOrDefault("EntityName"); } - } + public string Lazy => attributes.GetOrDefault("Lazy"); - public bool OptimisticLock - { - get { return attributes.GetOrDefault("OptimisticLock"); } - } + public string EntityName => attributes.GetOrDefault("EntityName"); - public IEnumerable Columns - { - get { return columns.Columns; } - } + public bool OptimisticLock => attributes.GetOrDefault("OptimisticLock"); + + public IEnumerable Columns => columns.Columns; public void AddColumn(int layer, ColumnMapping mapping) { diff --git a/src/FluentNHibernate/MappingModel/MetaValueMapping.cs b/src/FluentNHibernate/MappingModel/MetaValueMapping.cs index 868220a04..646e17488 100644 --- a/src/FluentNHibernate/MappingModel/MetaValueMapping.cs +++ b/src/FluentNHibernate/MappingModel/MetaValueMapping.cs @@ -24,15 +24,9 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.ProcessMetaValue(this); } - public string Value - { - get { return attributes.GetOrDefault("Value"); } - } + public string Value => attributes.GetOrDefault("Value"); - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/NaturalIdMapping.cs b/src/FluentNHibernate/MappingModel/NaturalIdMapping.cs index 0cd52b360..064b1c379 100644 --- a/src/FluentNHibernate/MappingModel/NaturalIdMapping.cs +++ b/src/FluentNHibernate/MappingModel/NaturalIdMapping.cs @@ -19,20 +19,11 @@ public NaturalIdMapping(AttributeStore attributes) this.attributes = attributes; } - public bool Mutable - { - get { return attributes.GetOrDefault("Mutable"); } - } + public bool Mutable => attributes.GetOrDefault("Mutable"); - public IEnumerable Properties - { - get { return properties; } - } + public IEnumerable Properties => properties; - public IEnumerable ManyToOnes - { - get { return manyToOnes; } - } + public IEnumerable ManyToOnes => manyToOnes; public void AddProperty(PropertyMapping mapping) { diff --git a/src/FluentNHibernate/MappingModel/OneToOneMapping.cs b/src/FluentNHibernate/MappingModel/OneToOneMapping.cs index 12c600381..c6af8448c 100644 --- a/src/FluentNHibernate/MappingModel/OneToOneMapping.cs +++ b/src/FluentNHibernate/MappingModel/OneToOneMapping.cs @@ -24,54 +24,25 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) visitor.ProcessOneToOne(this); } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public TypeReference Class - { - get { return attributes.GetOrDefault("Class"); } - } + public TypeReference Class => attributes.GetOrDefault("Class"); - public string Cascade - { - get { return attributes.GetOrDefault("Cascade"); } - } - public bool Constrained - { - get { return attributes.GetOrDefault("Constrained"); } - } + public string Cascade => attributes.GetOrDefault("Cascade"); - public string Fetch - { - get { return attributes.GetOrDefault("Fetch"); } - } + public bool Constrained => attributes.GetOrDefault("Constrained"); - public string ForeignKey - { - get { return attributes.GetOrDefault("ForeignKey"); } - } + public string Fetch => attributes.GetOrDefault("Fetch"); - public string PropertyRef - { - get { return attributes.GetOrDefault("PropertyRef"); } - } + public string ForeignKey => attributes.GetOrDefault("ForeignKey"); - public string Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public string PropertyRef => attributes.GetOrDefault("PropertyRef"); - public string EntityName - { - get { return attributes.GetOrDefault("EntityName"); } - } + public string Lazy => attributes.GetOrDefault("Lazy"); + + public string EntityName => attributes.GetOrDefault("EntityName"); public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/MappingModel/ParentMapping.cs b/src/FluentNHibernate/MappingModel/ParentMapping.cs index d7ad71e87..70a2cb5c9 100644 --- a/src/FluentNHibernate/MappingModel/ParentMapping.cs +++ b/src/FluentNHibernate/MappingModel/ParentMapping.cs @@ -26,15 +26,9 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) public Type ContainingEntityType { get; set; } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); public override bool Equals(object obj) { diff --git a/src/FluentNHibernate/MappingModel/PropertyMapping.cs b/src/FluentNHibernate/MappingModel/PropertyMapping.cs index 503fa2590..577286436 100644 --- a/src/FluentNHibernate/MappingModel/PropertyMapping.cs +++ b/src/FluentNHibernate/MappingModel/PropertyMapping.cs @@ -26,50 +26,23 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) public Type ContainingEntityType { get; set; } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public bool Insert - { - get { return attributes.GetOrDefault("Insert"); } - } + public bool Insert => attributes.GetOrDefault("Insert"); - public bool Update - { - get { return attributes.GetOrDefault("Update"); } - } + public bool Update => attributes.GetOrDefault("Update"); - public string Formula - { - get { return attributes.GetOrDefault("Formula"); } - } + public string Formula => attributes.GetOrDefault("Formula"); - public bool Lazy - { - get { return attributes.GetOrDefault("Lazy"); } - } + public bool Lazy => attributes.GetOrDefault("Lazy"); - public bool OptimisticLock - { - get { return attributes.GetOrDefault("OptimisticLock"); } - } + public bool OptimisticLock => attributes.GetOrDefault("OptimisticLock"); - public string Generated - { - get { return attributes.GetOrDefault("Generated"); } - } + public string Generated => attributes.GetOrDefault("Generated"); - public TypeReference Type - { - get { return attributes.GetOrDefault("Type"); } - } + public TypeReference Type => attributes.GetOrDefault("Type"); public Member Member { get; set; } diff --git a/src/FluentNHibernate/MappingModel/StoredProcedureMapping.cs b/src/FluentNHibernate/MappingModel/StoredProcedureMapping.cs index 3bdd23d28..6faff7dce 100644 --- a/src/FluentNHibernate/MappingModel/StoredProcedureMapping.cs +++ b/src/FluentNHibernate/MappingModel/StoredProcedureMapping.cs @@ -32,15 +32,9 @@ public StoredProcedureMapping(string spType, string innerText, AttributeStore at Set(x => x.Check, Layer.Defaults, "none"); } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public Type Type - { - get { return attributes.GetOrDefault("Type"); } - } + public Type Type => attributes.GetOrDefault("Type"); public override void AcceptVisitor(IMappingModelVisitor visitor) { @@ -52,20 +46,11 @@ public override bool IsSpecified(string attribute) return attributes.IsSpecified(attribute); } - public string Check - { - get { return attributes.GetOrDefault("Check"); } - } + public string Check => attributes.GetOrDefault("Check"); - public string SPType - { - get { return attributes.GetOrDefault("SPType"); } - } + public string SPType => attributes.GetOrDefault("SPType"); - public string Query - { - get { return attributes.GetOrDefault("Query"); } - } + public string Query => attributes.GetOrDefault("Query"); public bool Equals(StoredProcedureMapping other) { diff --git a/src/FluentNHibernate/MappingModel/TuplizerMapping.cs b/src/FluentNHibernate/MappingModel/TuplizerMapping.cs index 4be63a8f2..16ee6b872 100644 --- a/src/FluentNHibernate/MappingModel/TuplizerMapping.cs +++ b/src/FluentNHibernate/MappingModel/TuplizerMapping.cs @@ -29,20 +29,11 @@ public override bool IsSpecified(string attribute) return attributes.IsSpecified(attribute); } - public TuplizerMode Mode - { - get { return attributes.GetOrDefault("Mode"); } - } + public TuplizerMode Mode => attributes.GetOrDefault("Mode"); - public string EntityName - { - get { return attributes.GetOrDefault("EntityName"); } - } + public string EntityName => attributes.GetOrDefault("EntityName"); - public TypeReference Type - { - get { return attributes.GetOrDefault("Type"); } - } + public TypeReference Type => attributes.GetOrDefault("Type"); public bool Equals(TuplizerMapping other) { diff --git a/src/FluentNHibernate/MappingModel/TypeReference.cs b/src/FluentNHibernate/MappingModel/TypeReference.cs index 3e6c0bb2a..767b9e7e9 100644 --- a/src/FluentNHibernate/MappingModel/TypeReference.cs +++ b/src/FluentNHibernate/MappingModel/TypeReference.cs @@ -79,15 +79,9 @@ public Type GetGenericTypeDefinition() return innerType?.GetGenericTypeDefinition(); } - public Type GenericTypeDefinition - { - get { return GetGenericTypeDefinition(); } - } + public Type GenericTypeDefinition => GetGenericTypeDefinition(); - public bool IsNullable - { - get { return GenericTypeDefinition == typeof(Nullable<>); } - } + public bool IsNullable => GenericTypeDefinition == typeof(Nullable<>); public Type[] GetGenericArguments() { @@ -97,10 +91,7 @@ public Type[] GetGenericArguments() return innerType.GetGenericArguments(); } - public IEnumerable GenericArguments - { - get { return GetGenericArguments(); } - } + public IEnumerable GenericArguments => GetGenericArguments(); public override string ToString() { diff --git a/src/FluentNHibernate/MappingModel/VersionMapping.cs b/src/FluentNHibernate/MappingModel/VersionMapping.cs index 8ecd3ba3b..e0d39519a 100644 --- a/src/FluentNHibernate/MappingModel/VersionMapping.cs +++ b/src/FluentNHibernate/MappingModel/VersionMapping.cs @@ -23,30 +23,15 @@ public override void AcceptVisitor(IMappingModelVisitor visitor) Columns.Each(visitor.Visit); } - public string Name - { - get { return attributes.GetOrDefault("Name"); } - } + public string Name => attributes.GetOrDefault("Name"); - public string Access - { - get { return attributes.GetOrDefault("Access"); } - } + public string Access => attributes.GetOrDefault("Access"); - public TypeReference Type - { - get { return attributes.GetOrDefault("Type"); } - } + public TypeReference Type => attributes.GetOrDefault("Type"); - public string UnsavedValue - { - get { return attributes.GetOrDefault("UnsavedValue"); } - } + public string UnsavedValue => attributes.GetOrDefault("UnsavedValue"); - public string Generated - { - get { return attributes.GetOrDefault("Generated"); } - } + public string Generated => attributes.GetOrDefault("Generated"); public Type ContainingEntityType { get; set; } diff --git a/src/FluentNHibernate/PersistenceModel.cs b/src/FluentNHibernate/PersistenceModel.cs index b24cbd318..0d804fd17 100644 --- a/src/FluentNHibernate/PersistenceModel.cs +++ b/src/FluentNHibernate/PersistenceModel.cs @@ -305,8 +305,8 @@ public bool ContainsMapping(Type type) /// public bool ValidationEnabled { - get { return validationVisitor.Enabled; } - set { validationVisitor.Enabled = value; } + get => validationVisitor.Enabled; + set => validationVisitor.Enabled = value; } internal void ImportProviders(PersistenceModel model) diff --git a/src/FluentNHibernate/Testing/Values/List.cs b/src/FluentNHibernate/Testing/Values/List.cs index 30508fe5a..e09cb1f69 100644 --- a/src/FluentNHibernate/Testing/Values/List.cs +++ b/src/FluentNHibernate/Testing/Values/List.cs @@ -50,7 +50,7 @@ public override Action> ValueSetter propertyAccessor.SetValue(target, collection); }; } - set { _valueSetter = value; } + set => _valueSetter = value; } protected IEnumerable Expected { get; } diff --git a/src/FluentNHibernate/Testing/Values/Property.cs b/src/FluentNHibernate/Testing/Values/Property.cs index 21deedced..2fb52add6 100644 --- a/src/FluentNHibernate/Testing/Values/Property.cs +++ b/src/FluentNHibernate/Testing/Values/Property.cs @@ -36,7 +36,7 @@ public virtual Action ValueSetter return DefaultValueSetter; } - set { _valueSetter = value; } + set => _valueSetter = value; } protected Accessor PropertyAccessor { get; } diff --git a/src/FluentNHibernate/Utils/Reflection/PropertyChain.cs b/src/FluentNHibernate/Utils/Reflection/PropertyChain.cs index 48406cd19..ad0a4bf9b 100644 --- a/src/FluentNHibernate/Utils/Reflection/PropertyChain.cs +++ b/src/FluentNHibernate/Utils/Reflection/PropertyChain.cs @@ -45,20 +45,11 @@ public object GetValue(object target) return innerMember.GetValue(target); } - public string FieldName - { - get { return innerMember.FieldName; } - } + public string FieldName => innerMember.FieldName; - public Type PropertyType - { - get { return innerMember.PropertyType; } - } + public Type PropertyType => innerMember.PropertyType; - public Member InnerMember - { - get { return innerMember.InnerMember; } - } + public Member InnerMember => innerMember.InnerMember; public Accessor GetChildAccessor(Expression> expression) { diff --git a/src/FluentNHibernate/Utils/Reflection/SingleMember.cs b/src/FluentNHibernate/Utils/Reflection/SingleMember.cs index 3b9324c8b..70a634e60 100644 --- a/src/FluentNHibernate/Utils/Reflection/SingleMember.cs +++ b/src/FluentNHibernate/Utils/Reflection/SingleMember.cs @@ -12,15 +12,9 @@ public SingleMember(Member member) #region Accessor Members - public string FieldName - { - get { return InnerMember.Name; } - } + public string FieldName => InnerMember.Name; - public Type PropertyType - { - get { return InnerMember.PropertyType; } - } + public Type PropertyType => InnerMember.PropertyType; public Member InnerMember { get; } @@ -30,10 +24,7 @@ public Accessor GetChildAccessor(Expression> expression) return new PropertyChain(new[] {InnerMember, property}); } - public string Name - { - get { return InnerMember.Name; } - } + public string Name => InnerMember.Name; public void SetValue(object target, object propertyValue) { From 953bae5c71aa0eb534123fa3d980894f128789e3 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Mon, 11 Mar 2024 20:51:19 +1000 Subject: [PATCH 2/2] Resolve Deepsource warning --- .../Testing/PersistenceSpecificationTester.cs | 3 +-- src/FluentNHibernate/Automapping/AutoPersistenceModel.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationTester.cs b/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationTester.cs index 4c388e085..1461c0cdb 100644 --- a/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationTester.cs +++ b/src/FluentNHibernate.Testing/Testing/PersistenceSpecificationTester.cs @@ -177,8 +177,7 @@ public void Comparing_two_properties_should_use_the_specified_property_IEquality [Test] public void VerifyTheMappings_returns_instance() { - var cat = spec.CheckProperty(x => x.FirstKitten, this.cat.FirstKitten).VerifyTheMappings(); - cat.ShouldNotBeNull(); + spec.CheckProperty(x => x.FirstKitten, this.cat.FirstKitten).VerifyTheMappings().ShouldNotBeNull(); } [Test] diff --git a/src/FluentNHibernate/Automapping/AutoPersistenceModel.cs b/src/FluentNHibernate/Automapping/AutoPersistenceModel.cs index 9a39f571c..b036a97ac 100644 --- a/src/FluentNHibernate/Automapping/AutoPersistenceModel.cs +++ b/src/FluentNHibernate/Automapping/AutoPersistenceModel.cs @@ -468,7 +468,7 @@ protected override string GetMappingFileName() return "AutoMappings.hbm.xml"; } - bool HasUserDefinedConfiguration => !(cfg is ExpressionBasedAutomappingConfiguration); + bool HasUserDefinedConfiguration => cfg is not ExpressionBasedAutomappingConfiguration; } public class AutomappedComponentResolver : IComponentReferenceResolver