Merge pull request #38 from DickBaker/Dev_defaults

TylerCarlson1 · web-flow · commit 5dc14524f623 · 2020-08-24T11:50:41.000-05:00
tidy/spelling/modernize refactoring changes
diff --git a/src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreTestsBase.cs b/src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreTestsBase.cs
@@ -7,7 +7,7 @@
 
 namespace AutoMapper.Collection.EntityFrameworkCore.Tests
 {
-    public abstract class EntityFramworkCoreTestsBase
+    public abstract class EntityFrameworkCoreTestsBase
     {
         protected abstract DBContextBase GetDbContext();
         protected abstract IMapper GetMapper();
@@ -292,13 +292,14 @@ public class Thing
         {
             public int ID { get; set; }
             public string Title { get; set; }
-            public override string ToString() { return Title; }
+            public override string ToString() => Title;
         }
 
         public class ThingDto
         {
             public int ID { get; set; }
             public string Title { get; set; }
+            public override string ToString() => Title;
         }
     }
 }
diff --git a/src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreUsingCtorTests.cs b/src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreUsingCtorTests.cs
@@ -4,11 +4,11 @@
 
 namespace AutoMapper.Collection.EntityFrameworkCore.Tests
 {
-    public class EntityFramworkCoreUsingCtorTests : EntityFramworkCoreTestsBase
+    public class EntityFrameworkCoreUsingCtorTests : EntityFrameworkCoreTestsBase
     {
         private readonly Mapper _mapper;
 
-        public EntityFramworkCoreUsingCtorTests()
+        public EntityFrameworkCoreUsingCtorTests()
         {
             _mapper = new Mapper(new MapperConfiguration(x =>
             {
@@ -18,15 +18,9 @@ public EntityFramworkCoreUsingCtorTests()
             }));
         }
 
-        protected override DBContextBase GetDbContext()
-        {
-            return new DB();
-        }
+        protected override DBContextBase GetDbContext() => new DB();
 
-        protected override IMapper GetMapper()
-        {
-            return _mapper;
-        }
+        protected override IMapper GetMapper() => _mapper;
 
         public class DB : DBContextBase
         {
diff --git a/src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreUsingDITests.cs b/src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreUsingDITests.cs
@@ -1,18 +1,17 @@
 ﻿using System;
-using AutoMapper.EntityFrameworkCore;
 using AutoMapper.EquivalencyExpression;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace AutoMapper.Collection.EntityFrameworkCore.Tests
 {
-    public class EntityFramworkCoreUsingDITests : EntityFramworkCoreTestsBase, IDisposable
+    public class EntityFrameworkCoreUsingDITests : EntityFrameworkCoreTestsBase, IDisposable
     {
         private readonly ServiceProvider _serviceProvider;
         private readonly Mapper _mapper;
         private readonly IServiceScope _serviceScope;
 
-        public EntityFramworkCoreUsingDITests()
+        public EntityFrameworkCoreUsingDITests()
         {
             var services = new ServiceCollection();
 
@@ -39,15 +38,9 @@ public void Dispose()
             _serviceProvider?.Dispose();
         }
 
-        protected override DBContextBase GetDbContext()
-        {
-            return _serviceScope.ServiceProvider.GetRequiredService<DB>();
-        }
+        protected override DBContextBase GetDbContext() => _serviceScope.ServiceProvider.GetRequiredService<DB>();
 
-        protected override IMapper GetMapper()
-        {
-            return _mapper;
-        }
+        protected override IMapper GetMapper() => _mapper;
 
         public class DB : DBContextBase
         {
diff --git a/src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreUsingMicrosoftDITests.cs b/src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreUsingMicrosoftDITests.cs
@@ -6,7 +6,7 @@
 
 namespace AutoMapper.Collection.EntityFrameworkCore.Tests
 {
-    public class EntityFrameworkCoreUsingMicrosoftDITests : EntityFramworkCoreTestsBase, IDisposable
+    public class EntityFrameworkCoreUsingMicrosoftDITests : EntityFrameworkCoreTestsBase, IDisposable
     {
         private readonly ServiceProvider _serviceProvider;
         private readonly IServiceScope _serviceScope;
@@ -26,25 +26,19 @@ public EntityFrameworkCoreUsingMicrosoftDITests()
                 x.CreateMap<ThingDto, Thing>().ReverseMap();
             }, new Assembly[0]);
 
-            this._serviceProvider = services.BuildServiceProvider();
-            this._serviceScope = this._serviceProvider.CreateScope();
+            _serviceProvider = services.BuildServiceProvider();
+            _serviceScope = _serviceProvider.CreateScope();
         }
 
         public void Dispose()
         {
-            this._serviceScope?.Dispose();
-            this._serviceProvider?.Dispose();
+            _serviceScope?.Dispose();
+            _serviceProvider?.Dispose();
         }
 
-        protected override DBContextBase GetDbContext()
-        {
-            return this._serviceScope.ServiceProvider.GetRequiredService<DB>();
-        }
+        protected override DBContextBase GetDbContext() => _serviceScope.ServiceProvider.GetRequiredService<DB>();
 
-        protected override IMapper GetMapper()
-        {
-            return this._serviceScope.ServiceProvider.GetRequiredService<IMapper>();
-        }
+        protected override IMapper GetMapper() => _serviceScope.ServiceProvider.GetRequiredService<IMapper>();
 
         public class DB : DBContextBase
         {
diff --git a/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj b/src/AutoMapper.Collection.EntityFrameworkCore/AutoMapper.Collection.EntityFrameworkCore.csproj
@@ -20,7 +20,15 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="2.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="3.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.1" />
+    <PackageReference Include="Roslynator.Analyzers" Version="2.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
diff --git a/src/AutoMapper.Collection.EntityFrameworkCore/GenerateEntityFrameworkCorePrimaryKeyPropertyMaps.cs b/src/AutoMapper.Collection.EntityFrameworkCore/GenerateEntityFrameworkCorePrimaryKeyPropertyMaps.cs
@@ -12,10 +12,7 @@ public class GenerateEntityFrameworkCorePrimaryKeyPropertyMaps<TDatabaseContext>
     {
         private readonly IModel _model;
 
-        public GenerateEntityFrameworkCorePrimaryKeyPropertyMaps()
-        {
-            throw new InvalidOperationException($"Use {nameof(MapperConfigurationExpressionExtensions.UseEntityFrameworkCoreModel)} instead of using SetGeneratePropertyMaps.");
-        }
+        public GenerateEntityFrameworkCorePrimaryKeyPropertyMaps() => throw new InvalidOperationException($"Use {nameof(MapperConfigurationExpressionExtensions.UseEntityFrameworkCoreModel)} instead of using SetGeneratePropertyMaps.");
 
         public GenerateEntityFrameworkCorePrimaryKeyPropertyMaps(IModel model) => _model = model;
 
diff --git a/src/AutoMapper.Collection.EntityFrameworkCore/IPersistence.cs b/src/AutoMapper.Collection.EntityFrameworkCore/IPersistence.cs
@@ -23,7 +23,7 @@ public interface IPersistence<TTo>
         /// <param name="from">Object to update to <see cref="T:System.Data.Entity.DbSet`1"/></param>
         /// <param name="cancellationToken">A cancellation token to observe the task.</param>
         /// <returns>A task containing the updated or inserted entity</returns>
-        Task<TTo> InsertOrUpdateAsync<TFrom>(TFrom from, CancellationToken cancellationToken = default(CancellationToken)) where TFrom : class;
+        Task<TTo> InsertOrUpdateAsync<TFrom>(TFrom from, CancellationToken cancellationToken = default) where TFrom : class;
 
         /// <summary>
         /// Insert Or Update the <see cref="T:System.Data.Entity.DbSet`1"/> with <paramref name="from"/>
@@ -42,7 +42,7 @@ public interface IPersistence<TTo>
         /// <param name="from">Object to update to <see cref="T:System.Data.Entity.DbSet`1"/></param>
         /// <param name="cancellationToken">A cancellation token to observe the task.</param>
         /// <returns>A task containing the updated or inserted entity</returns>
-        Task<TTo> InsertOrUpdateAsync(Type type, object from, CancellationToken cancellationToken = default(CancellationToken));
+        Task<TTo> InsertOrUpdateAsync(Type type, object from, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Remove from <see cref="T:System.Data.Entity.DbSet`1"/> with <paramref name="from"/>
@@ -60,7 +60,6 @@ public interface IPersistence<TTo>
         /// <param name="from">Object to remove that is Equivalent in <see cref="T:System.Data.Entity.DbSet`1"/></param>
         /// <param name="cancellationToken">A cancellation token to observe the task.</param>
         /// <returns>A task object indicating the status of the asynchronous operation</returns>
-        Task RemoveAsync<TFrom>(TFrom from, CancellationToken cancellationToken = default(CancellationToken)) where TFrom : class;
-
+        Task RemoveAsync<TFrom>(TFrom from, CancellationToken cancellationToken = default) where TFrom : class;
     }
 }
diff --git a/src/AutoMapper.Collection.EntityFrameworkCore/MapperConfigurationExpressionExtensions.cs b/src/AutoMapper.Collection.EntityFrameworkCore/MapperConfigurationExpressionExtensions.cs
@@ -56,9 +56,6 @@ public static void UseEntityFrameworkCoreModel<TContext>(this IMapperConfigurati
         /// only used if you are using <see cref="DbContextOptionsBuilder.UseModel(IModel)"/>.
         /// </summary>
         public static void UseEntityFrameworkCoreModel<TContext>(this IMapperConfigurationExpression config, IModel model)
-            where TContext : DbContext
-        {
-            config.SetGeneratePropertyMaps(new GenerateEntityFrameworkCorePrimaryKeyPropertyMaps<TContext>(model));
-        }
+            where TContext : DbContext => config.SetGeneratePropertyMaps(new GenerateEntityFrameworkCorePrimaryKeyPropertyMaps<TContext>(model));
     }
 }
diff --git a/src/AutoMapper.Collection.EntityFrameworkCore/Persistence.cs b/src/AutoMapper.Collection.EntityFrameworkCore/Persistence.cs
@@ -20,35 +20,33 @@ public Persistence(DbSet<TTo> sourceSet, IMapper mapper)
         }
 
         public TTo InsertOrUpdate<TFrom>(TFrom from)
-            where TFrom : class
-        {
-            return InsertOrUpdate(typeof(TFrom), from);
-        }
+            where TFrom : class => InsertOrUpdate(typeof(TFrom), from);
 
-        public Task<TTo> InsertOrUpdateAsync<TFrom>(TFrom from, CancellationToken cancellationToken = default(CancellationToken))
-            where TFrom : class
-        {
-            return InsertOrUpdateAsync(typeof(TFrom), from, cancellationToken);
-        }
+        public Task<TTo> InsertOrUpdateAsync<TFrom>(TFrom from, CancellationToken cancellationToken = default)
+            where TFrom : class => InsertOrUpdateAsync(typeof(TFrom), from, cancellationToken);
 
         public TTo InsertOrUpdate(Type type, object from)
         {
             var equivExpr = GetEquivalenceExpression(type, from);
             if (equivExpr == null)
-                throw new ArgumentException($"Could not retreive equivalency expression for mapping {type.Name} --> {typeof(TTo).Name}");
+            {
+                throw new ArgumentException($"Could not retrieve equivalency expression for mapping {type.Name} --> {typeof(TTo).Name}");
+            }
 
             var to = _sourceSet.FirstOrDefault(equivExpr);
 
             return MapObject(type, from, to);
         }
 
-        public async Task<TTo> InsertOrUpdateAsync(Type type, object from, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<TTo> InsertOrUpdateAsync(Type type, object from, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             var equivExpr = GetEquivalenceExpression(type, from);
             if (equivExpr == null)
-                throw new ArgumentException($"Could not retreive equivalency expression for mapping {type.Name} --> {typeof(TTo).Name}");
+            {
+                throw new ArgumentException($"Could not retrieve equivalency expression for mapping {type.Name} --> {typeof(TTo).Name}");
+            }
 
             var to = await _sourceSet.FirstOrDefaultAsync(equivExpr, cancellationToken).ConfigureAwait(false);
 
@@ -60,25 +58,35 @@ public void Remove<TFrom>(TFrom from)
         {
             var equivExpr = GetEquivalenceExpression(from);
             if (equivExpr == null)
+            {
                 return;
+            }
+
             var to = _sourceSet.FirstOrDefault(equivExpr);
 
             if (to != null)
+            {
                 _sourceSet.Remove(to);
+            }
         }
 
-        public async Task RemoveAsync<TFrom>(TFrom from, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task RemoveAsync<TFrom>(TFrom from, CancellationToken cancellationToken = default)
             where TFrom : class
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             var equivExpr = GetEquivalenceExpression(from);
             if (equivExpr == null)
+            {
                 return;
+            }
+
             var to = await _sourceSet.FirstOrDefaultAsync(equivExpr, cancellationToken).ConfigureAwait(false);
 
             if (to != null)
+            {
                 _sourceSet.Remove(to);
+            }
         }
 
         private TTo MapObject(Type type, object from, TTo to)
@@ -95,14 +103,8 @@ private TTo MapObject(Type type, object from, TTo to)
             return to;
         }
 
-        private Expression<Func<TTo, bool>> GetEquivalenceExpression<TFrom>(TFrom from)
-        {
-            return GetEquivalenceExpression(typeof(TFrom), from);
-        }
+        private Expression<Func<TTo, bool>> GetEquivalenceExpression<TFrom>(TFrom from) => GetEquivalenceExpression(typeof(TFrom), from);
 
-        private Expression<Func<TTo, bool>> GetEquivalenceExpression(Type type, object from)
-        {
-            return _mapper.Map(from, type, typeof(Expression<Func<TTo, bool>>)) as Expression<Func<TTo, bool>>;
-        }
+        private Expression<Func<TTo, bool>> GetEquivalenceExpression(Type type, object from) => _mapper.Map(from, type, typeof(Expression<Func<TTo, bool>>)) as Expression<Func<TTo, bool>>;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace AutoMapper.Collection.EntityFrameworkCore.Tests`
`9`	`9`	`{`
`10`		`- public abstract class EntityFramworkCoreTestsBase`
	`10`	`+ public abstract class EntityFrameworkCoreTestsBase`
`11`	`11`	`{`
`12`	`12`	`protected abstract DBContextBase GetDbContext();`
`13`	`13`	`protected abstract IMapper GetMapper();`
`@@ -292,13 +292,14 @@ public class Thing`
`292`	`292`	`{`
`293`	`293`	`public int ID { get; set; }`
`294`	`294`	`public string Title { get; set; }`
`295`		`- public override string ToString() { return Title; }`
	`295`	`+ public override string ToString() => Title;`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`public class ThingDto`
`299`	`299`	`{`
`300`	`300`	`public int ID { get; set; }`
`301`	`301`	`public string Title { get; set; }`
	`302`	`+ public override string ToString() => Title;`
`302`	`303`	`}`
`303`	`304`	`}`
`304`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`
`5`	`5`	`namespace AutoMapper.Collection.EntityFrameworkCore.Tests`
`6`	`6`	`{`
`7`		`- public class EntityFramworkCoreUsingCtorTests : EntityFramworkCoreTestsBase`
	`7`	`+ public class EntityFrameworkCoreUsingCtorTests : EntityFrameworkCoreTestsBase`
`8`	`8`	`{`
`9`	`9`	`private readonly Mapper _mapper;`
`10`	`10`
`11`		`- public EntityFramworkCoreUsingCtorTests()`
	`11`	`+ public EntityFrameworkCoreUsingCtorTests()`
`12`	`12`	`{`
`13`	`13`	`_mapper = new Mapper(new MapperConfiguration(x =>`
`14`	`14`	`{`
`@@ -18,15 +18,9 @@ public EntityFramworkCoreUsingCtorTests()`
`18`	`18`	`}));`
`19`	`19`	`}`
`20`	`20`
`21`		`- protected override DBContextBase GetDbContext()`
`22`		`- {`
`23`		`- return new DB();`
`24`		`- }`
	`21`	`+ protected override DBContextBase GetDbContext() => new DB();`
`25`	`22`
`26`		`- protected override IMapper GetMapper()`
`27`		`- {`
`28`		`- return _mapper;`
`29`		`- }`
	`23`	`+ protected override IMapper GetMapper() => _mapper;`
`30`	`24`
`31`	`25`	`public class DB : DBContextBase`
`32`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace AutoMapper.Collection.EntityFrameworkCore.Tests`
`8`	`8`	`{`
`9`		`- public class EntityFrameworkCoreUsingMicrosoftDITests : EntityFramworkCoreTestsBase, IDisposable`
	`9`	`+ public class EntityFrameworkCoreUsingMicrosoftDITests : EntityFrameworkCoreTestsBase, IDisposable`
`10`	`10`	`{`
`11`	`11`	`private readonly ServiceProvider _serviceProvider;`
`12`	`12`	`private readonly IServiceScope _serviceScope;`
`@@ -26,25 +26,19 @@ public EntityFrameworkCoreUsingMicrosoftDITests()`
`26`	`26`	`x.CreateMap<ThingDto, Thing>().ReverseMap();`
`27`	`27`	`}, new Assembly[0]);`
`28`	`28`
`29`		`- this._serviceProvider = services.BuildServiceProvider();`
`30`		`- this._serviceScope = this._serviceProvider.CreateScope();`
	`29`	`+ _serviceProvider = services.BuildServiceProvider();`
	`30`	`+ _serviceScope = _serviceProvider.CreateScope();`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public void Dispose()`
`34`	`34`	`{`
`35`		`- this._serviceScope?.Dispose();`
`36`		`- this._serviceProvider?.Dispose();`
	`35`	`+ _serviceScope?.Dispose();`
	`36`	`+ _serviceProvider?.Dispose();`
`37`	`37`	`}`
`38`	`38`
`39`		`- protected override DBContextBase GetDbContext()`
`40`		`- {`
`41`		`- return this._serviceScope.ServiceProvider.GetRequiredService<DB>();`
`42`		`- }`
	`39`	`+ protected override DBContextBase GetDbContext() => _serviceScope.ServiceProvider.GetRequiredService<DB>();`
`43`	`40`
`44`		`- protected override IMapper GetMapper()`
`45`		`- {`
`46`		`- return this._serviceScope.ServiceProvider.GetRequiredService<IMapper>();`
`47`		`- }`
	`41`	`+ protected override IMapper GetMapper() => _serviceScope.ServiceProvider.GetRequiredService<IMapper>();`
`48`	`42`
`49`	`43`	`public class DB : DBContextBase`
`50`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,7 @@ public class GenerateEntityFrameworkCorePrimaryKeyPropertyMaps<TDatabaseContext>`
`12`	`12`	`{`
`13`	`13`	`private readonly IModel _model;`
`14`	`14`
`15`		`- public GenerateEntityFrameworkCorePrimaryKeyPropertyMaps()`
`16`		`- {`
`17`		`- throw new InvalidOperationException($"Use {nameof(MapperConfigurationExpressionExtensions.UseEntityFrameworkCoreModel)} instead of using SetGeneratePropertyMaps.");`
`18`		`- }`
	`15`	`+ public GenerateEntityFrameworkCorePrimaryKeyPropertyMaps() => throw new InvalidOperationException($"Use {nameof(MapperConfigurationExpressionExtensions.UseEntityFrameworkCoreModel)} instead of using SetGeneratePropertyMaps.");`
`19`	`16`
`20`	`17`	`public GenerateEntityFrameworkCorePrimaryKeyPropertyMaps(IModel model) => _model = model;`
`21`	`18`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,6 @@ public static void UseEntityFrameworkCoreModel<TContext>(this IMapperConfigurati`
`56`	`56`	`/// only used if you are using <see cref="DbContextOptionsBuilder.UseModel(IModel)"/>.`
`57`	`57`	`/// </summary>`
`58`	`58`	`public static void UseEntityFrameworkCoreModel<TContext>(this IMapperConfigurationExpression config, IModel model)`
`59`		`- where TContext : DbContext`
`60`		`- {`
`61`		`- config.SetGeneratePropertyMaps(new GenerateEntityFrameworkCorePrimaryKeyPropertyMaps<TContext>(model));`
`62`		`- }`
	`59`	`+ where TContext : DbContext => config.SetGeneratePropertyMaps(new GenerateEntityFrameworkCorePrimaryKeyPropertyMaps<TContext>(model));`
`63`	`60`	`}`
`64`	`61`	`}`