From 0ed9bb650ebb8dd4d63c75e1d69645d432736bc9 Mon Sep 17 00:00:00 2001 From: Collin Barrett Date: Sun, 5 Aug 2018 17:48:12 -0500 Subject: [PATCH] minor cleanup --- .../Extensions/ConfigureServicesCollection.cs | 14 +-- .../20180210130730_InitialCreate.cs | 102 +++++++++--------- ...0210204923_AddIsCompletedFlagToSnapshot.cs | 4 +- ...180210234702_AddSnapshotModifiedDateUtc.cs | 2 + .../20180213171240_AddDefaultLicenseId.cs | 4 +- .../20180214152734_AddPublishedDate.cs | 2 + ...180214153140_DefaultOptionalDatesToNull.cs | 2 + .../Migrations/20180324001253_addChatUrl.cs | 4 +- .../FilterListsDbContextModelSnapshot.cs | 2 + src/FilterLists.Api/Program.cs | 9 +- src/FilterLists.Api/Startup.cs | 32 +++--- .../V1/Controllers/ForksController.cs | 5 +- .../V1/Controllers/ListsController.cs | 2 +- .../V1/Controllers/MergesController.cs | 5 +- .../Extensions/ConfigureServicesCollection.cs | 12 +-- .../Extensions/EnumerableExtensions.cs | 2 +- .../Snapshot/SnapshotDe.cs | 2 +- 17 files changed, 114 insertions(+), 91 deletions(-) diff --git a/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs index fafddc6b2..9f90bab67 100644 --- a/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -24,10 +24,10 @@ public static void AddFilterListsApi(this IServiceCollection services) private static void ConfigureCookiePolicy(this IServiceCollection services) { - services.Configure(options => + services.Configure(opts => { - options.CheckConsentNeeded = context => true; - options.MinimumSameSitePolicy = SameSiteMode.None; + opts.CheckConsentNeeded = context => true; + opts.MinimumSameSitePolicy = SameSiteMode.None; }); } @@ -38,14 +38,14 @@ private static void AddMvcCustom(this IServiceCollection services) private static void AddRoutingCustom(this IServiceCollection services) { - services.AddRouting(options => options.LowercaseUrls = true); + services.AddRouting(opts => opts.LowercaseUrls = true); } private static void AddSwaggerGenCustom(this IServiceCollection services) { - services.AddSwaggerGen(c => + services.AddSwaggerGen(opts => { - c.SwaggerDoc("v1", + opts.SwaggerDoc("v1", new Info { Title = "FilterLists API", @@ -65,7 +65,7 @@ private static void AddSwaggerGenCustom(this IServiceCollection services) Url = "https://github.com/collinbarrett/FilterLists/blob/master/LICENSE" } }); - c.IncludeXmlComments(Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, + opts.IncludeXmlComments(Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "FilterLists.Api.xml")); }); } diff --git a/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.cs b/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.cs index 717f097d6..22a1f66e5 100644 --- a/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.cs +++ b/src/FilterLists.Api/Migrations/20180210130730_InitialCreate.cs @@ -1,9 +1,11 @@ using System; +using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; namespace FilterLists.Api.Migrations { + [UsedImplicitly] public partial class InitialCreate : Migration { protected override void Up(MigrationBuilder migrationBuilder) @@ -12,10 +14,10 @@ protected override void Up(MigrationBuilder migrationBuilder) "languages", table => new { - Id = table.Column("SMALLINT UNSIGNED", nullable: false) + Id = table.Column("SMALLINT UNSIGNED") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), Iso6391 = table.Column("VARCHAR(2)", nullable: true, defaultValueSql: "NULL"), @@ -24,7 +26,7 @@ protected override void Up(MigrationBuilder migrationBuilder) Iso6392T = table.Column("VARCHAR(3)", nullable: true, defaultValueSql: "NULL"), Iso6393 = table.Column("VARCHAR(3)", nullable: true, defaultValueSql: "NULL"), LocalName = table.Column("VARCHAR(126)", nullable: true, defaultValueSql: "NULL"), - ModifiedDateUtc = table.Column("TIMESTAMP", nullable: false), + ModifiedDateUtc = table.Column("TIMESTAMP"), Name = table.Column("VARCHAR(126)", nullable: true, defaultValueSql: "NULL") }, constraints: table => { table.PrimaryKey("PK_languages", x => x.Id); }); @@ -33,17 +35,17 @@ protected override void Up(MigrationBuilder migrationBuilder) "licenses", table => new { - Id = table.Column("TINYINT UNSIGNED", nullable: false) + Id = table.Column("TINYINT UNSIGNED") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), DescriptionUrl = table.Column("TEXT", nullable: true), - ModifiedDateUtc = table.Column("TIMESTAMP", nullable: false), - Name = table.Column("VARCHAR(126)", nullable: false), - PermissiveAdaptation = table.Column(nullable: false), - PermissiveCommercial = table.Column(nullable: false) + ModifiedDateUtc = table.Column("TIMESTAMP"), + Name = table.Column("VARCHAR(126)"), + PermissiveAdaptation = table.Column(), + PermissiveCommercial = table.Column() }, constraints: table => { table.PrimaryKey("PK_licenses", x => x.Id); }); @@ -51,16 +53,16 @@ protected override void Up(MigrationBuilder migrationBuilder) "maintainers", table => new { - Id = table.Column("SMALLINT UNSIGNED", nullable: false) + Id = table.Column("SMALLINT UNSIGNED") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), EmailAddress = table.Column("VARCHAR(126)", nullable: true, defaultValueSql: "NULL"), HomeUrl = table.Column("TEXT", nullable: true), - ModifiedDateUtc = table.Column("TIMESTAMP", nullable: false), - Name = table.Column("VARCHAR(126)", nullable: false), + ModifiedDateUtc = table.Column("TIMESTAMP"), + Name = table.Column("VARCHAR(126)"), TwitterHandle = table.Column("VARCHAR(126)", nullable: true, defaultValueSql: "NULL") }, constraints: table => { table.PrimaryKey("PK_maintainers", x => x.Id); }); @@ -69,13 +71,13 @@ protected override void Up(MigrationBuilder migrationBuilder) "rules", table => new { - Id = table.Column("INT UNSIGNED", nullable: false) + Id = table.Column("INT UNSIGNED") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Raw = table.Column("VARCHAR(8192)", nullable: false) + Raw = table.Column("VARCHAR(8192)") }, constraints: table => { table.PrimaryKey("PK_rules", x => x.Id); }); @@ -83,16 +85,16 @@ protected override void Up(MigrationBuilder migrationBuilder) "software", table => new { - Id = table.Column("TINYINT UNSIGNED", nullable: false) + Id = table.Column("TINYINT UNSIGNED") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), DownloadUrl = table.Column("TEXT", nullable: true), HomeUrl = table.Column("TEXT", nullable: true), - ModifiedDateUtc = table.Column("TIMESTAMP", nullable: false), - Name = table.Column("VARCHAR(126)", nullable: false) + ModifiedDateUtc = table.Column("TIMESTAMP"), + Name = table.Column("VARCHAR(126)") }, constraints: table => { table.PrimaryKey("PK_software", x => x.Id); }); @@ -100,15 +102,15 @@ protected override void Up(MigrationBuilder migrationBuilder) "syntaxes", table => new { - Id = table.Column("TINYINT UNSIGNED", nullable: false) + Id = table.Column("TINYINT UNSIGNED") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), DefinitionUrl = table.Column("TEXT", nullable: true), - ModifiedDateUtc = table.Column("TIMESTAMP", nullable: false), - Name = table.Column("VARCHAR(126)", nullable: false) + ModifiedDateUtc = table.Column("TIMESTAMP"), + Name = table.Column("VARCHAR(126)") }, constraints: table => { table.PrimaryKey("PK_syntaxes", x => x.Id); }); @@ -116,10 +118,10 @@ protected override void Up(MigrationBuilder migrationBuilder) "filterlists", table => new { - Id = table.Column("SMALLINT UNSIGNED", nullable: false) + Id = table.Column("SMALLINT UNSIGNED") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), Description = table.Column("TEXT", nullable: true), @@ -131,8 +133,8 @@ protected override void Up(MigrationBuilder migrationBuilder) HomeUrl = table.Column("TEXT", nullable: true), IssuesUrl = table.Column("TEXT", nullable: true), LicenseId = table.Column(nullable: true), - ModifiedDateUtc = table.Column("TIMESTAMP", nullable: false), - Name = table.Column("VARCHAR(126)", nullable: false), + ModifiedDateUtc = table.Column("TIMESTAMP"), + Name = table.Column("VARCHAR(126)"), PolicyUrl = table.Column("TEXT", nullable: true), SubmissionUrl = table.Column("TEXT", nullable: true), SyntaxId = table.Column(nullable: true), @@ -159,9 +161,9 @@ protected override void Up(MigrationBuilder migrationBuilder) "software_syntaxes", table => new { - SyntaxId = table.Column(nullable: false), - SoftwareId = table.Column(nullable: false), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + SyntaxId = table.Column(), + SoftwareId = table.Column(), + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn) }, @@ -186,9 +188,9 @@ protected override void Up(MigrationBuilder migrationBuilder) "filterlists_languages", table => new { - FilterListId = table.Column(nullable: false), - LanguageId = table.Column(nullable: false), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + FilterListId = table.Column(), + LanguageId = table.Column(), + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn) }, @@ -213,9 +215,9 @@ protected override void Up(MigrationBuilder migrationBuilder) "filterlists_maintainers", table => new { - FilterListId = table.Column(nullable: false), - MaintainerId = table.Column(nullable: false), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + FilterListId = table.Column(), + MaintainerId = table.Column(), + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn) }, @@ -240,9 +242,9 @@ protected override void Up(MigrationBuilder migrationBuilder) "forks", table => new { - ForkFilterListId = table.Column(nullable: false), - UpstreamFilterListId = table.Column(nullable: false), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + ForkFilterListId = table.Column(), + UpstreamFilterListId = table.Column(), + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn) }, @@ -267,9 +269,9 @@ protected override void Up(MigrationBuilder migrationBuilder) "merges", table => new { - MergeFilterListId = table.Column(nullable: false), - UpstreamFilterListId = table.Column(nullable: false), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + MergeFilterListId = table.Column(), + UpstreamFilterListId = table.Column(), + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn) }, @@ -294,13 +296,13 @@ protected override void Up(MigrationBuilder migrationBuilder) "snapshots", table => new { - Id = table.Column("MEDIUMINT UNSIGNED", nullable: false) + Id = table.Column("MEDIUMINT UNSIGNED") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - FilterListId = table.Column(nullable: false), + FilterListId = table.Column(), HttpStatusCode = table.Column("VARCHAR(3)", nullable: true, defaultValueSql: "NULL") }, constraints: table => @@ -318,12 +320,12 @@ protected override void Up(MigrationBuilder migrationBuilder) "snapshots_rules", table => new { - AddedBySnapshotId = table.Column(nullable: false), - RuleId = table.Column(nullable: false), - CreatedDateUtc = table.Column("TIMESTAMP", nullable: false) + AddedBySnapshotId = table.Column(), + RuleId = table.Column(), + CreatedDateUtc = table.Column("TIMESTAMP") .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - ModifiedDateUtc = table.Column("TIMESTAMP", nullable: false), + ModifiedDateUtc = table.Column("TIMESTAMP"), RemovedBySnapshotId = table.Column(nullable: true) }, constraints: table => diff --git a/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs b/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs index 029ca3dc1..1cf818856 100644 --- a/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs +++ b/src/FilterLists.Api/Migrations/20180210204923_AddIsCompletedFlagToSnapshot.cs @@ -1,7 +1,9 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using JetBrains.Annotations; +using Microsoft.EntityFrameworkCore.Migrations; namespace FilterLists.Api.Migrations { + [UsedImplicitly] public partial class AddIsCompletedFlagToSnapshot : Migration { protected override void Up(MigrationBuilder migrationBuilder) diff --git a/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs b/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs index 81f8d9b93..a163a26a3 100644 --- a/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs +++ b/src/FilterLists.Api/Migrations/20180210234702_AddSnapshotModifiedDateUtc.cs @@ -1,8 +1,10 @@ using System; +using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Migrations; namespace FilterLists.Api.Migrations { + [UsedImplicitly] public partial class AddSnapshotModifiedDateUtc : Migration { protected override void Up(MigrationBuilder migrationBuilder) diff --git a/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.cs b/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.cs index df677140f..bf8112a05 100644 --- a/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.cs +++ b/src/FilterLists.Api/Migrations/20180213171240_AddDefaultLicenseId.cs @@ -1,7 +1,9 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using JetBrains.Annotations; +using Microsoft.EntityFrameworkCore.Migrations; namespace FilterLists.Api.Migrations { + [UsedImplicitly] public partial class AddDefaultLicenseId : Migration { protected override void Up(MigrationBuilder migrationBuilder) diff --git a/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.cs b/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.cs index 7ed342d48..642903d30 100644 --- a/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.cs +++ b/src/FilterLists.Api/Migrations/20180214152734_AddPublishedDate.cs @@ -1,8 +1,10 @@ using System; +using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Migrations; namespace FilterLists.Api.Migrations { + [UsedImplicitly] public partial class AddPublishedDate : Migration { protected override void Up(MigrationBuilder migrationBuilder) diff --git a/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.cs b/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.cs index 5771ac327..9094b4afb 100644 --- a/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.cs +++ b/src/FilterLists.Api/Migrations/20180214153140_DefaultOptionalDatesToNull.cs @@ -1,8 +1,10 @@ using System; +using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Migrations; namespace FilterLists.Api.Migrations { + [UsedImplicitly] public partial class DefaultOptionalDatesToNull : Migration { protected override void Up(MigrationBuilder migrationBuilder) diff --git a/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs b/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs index fdea4b97f..5f1eab0df 100644 --- a/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs +++ b/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs @@ -1,7 +1,9 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using JetBrains.Annotations; +using Microsoft.EntityFrameworkCore.Migrations; namespace FilterLists.Api.Migrations { + [UsedImplicitly] public partial class addChatUrl : Migration { protected override void Up(MigrationBuilder migrationBuilder) diff --git a/src/FilterLists.Api/Migrations/FilterListsDbContextModelSnapshot.cs b/src/FilterLists.Api/Migrations/FilterListsDbContextModelSnapshot.cs index e0f70704b..d6c93c1bc 100644 --- a/src/FilterLists.Api/Migrations/FilterListsDbContextModelSnapshot.cs +++ b/src/FilterLists.Api/Migrations/FilterListsDbContextModelSnapshot.cs @@ -2,12 +2,14 @@ using System; using FilterLists.Data; +using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; namespace FilterLists.Api.Migrations { + [UsedImplicitly] [DbContext(typeof(FilterListsDbContext))] internal class FilterListsDbContextModelSnapshot : ModelSnapshot { diff --git a/src/FilterLists.Api/Program.cs b/src/FilterLists.Api/Program.cs index 5b2dc3950..e7adfec6b 100644 --- a/src/FilterLists.Api/Program.cs +++ b/src/FilterLists.Api/Program.cs @@ -10,9 +10,10 @@ public static void Main(string[] args) CreateWebHostBuilder(args).Build().Run(); } - private static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseUrls("http://localhost:5000") - .UseApplicationInsights() - .UseStartup(); + private static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseUrls("http://localhost:5000") + .UseApplicationInsights() + .UseStartup(); } } \ No newline at end of file diff --git a/src/FilterLists.Api/Startup.cs b/src/FilterLists.Api/Startup.cs index 2de073bbe..f163d6f1b 100644 --- a/src/FilterLists.Api/Startup.cs +++ b/src/FilterLists.Api/Startup.cs @@ -24,12 +24,14 @@ public Startup(IConfiguration configuration) private IConfiguration Configuration { get; } + [UsedImplicitly] public void ConfigureServices(IServiceCollection services) { services.AddFilterListsServices(Configuration); services.AddFilterListsApi(); } + [UsedImplicitly] public void Configure(IApplicationBuilder app, IHostingEnvironment env) { if (env.IsDevelopment()) @@ -50,33 +52,34 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); app.UseCookiePolicy(); app.UseMvc(); - app.UseSwagger(c => + app.UseSwagger(opts => { - c.PreSerializeFilters.Add((swaggerDoc, httpReq) => swaggerDoc.Host = httpReq.Host.Value); + opts.PreSerializeFilters.Add((swaggerDoc, httpReq) => swaggerDoc.Host = httpReq.Host.Value); //TODO: remove preprocessor directives #if RELEASE - c.PreSerializeFilters.Add((swaggerDoc, httpReq) => swaggerDoc.BasePath = "/api"); + opts.PreSerializeFilters.Add((swaggerDoc, httpReq) => swaggerDoc.BasePath = "/api"); #endif - c.RouteTemplate = "docs/{documentName}/swagger.json"; - UseLowercaseControllerNameInSwaggerHack(c); + opts.RouteTemplate = "docs/{documentName}/swagger.json"; + UseLowercaseControllerNameInSwaggerHack(opts); }); - app.UseSwaggerUI(c => + app.UseSwaggerUI(opts => { - c.SwaggerEndpoint("v1/swagger.json", "FilterLists API v1"); - c.DocumentTitle = "FilterLists API v1"; - c.RoutePrefix = "docs"; + opts.SwaggerEndpoint("v1/swagger.json", "FilterLists API v1"); + opts.DocumentTitle = "FilterLists API v1"; + opts.RoutePrefix = "docs"; }); MigrateAndSeedDatabase(app); } //TODO: remove hack (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/74#issuecomment-386762178) - private static void UseLowercaseControllerNameInSwaggerHack(SwaggerOptions c) + private static void UseLowercaseControllerNameInSwaggerHack(SwaggerOptions opts) { - c.PreSerializeFilters.Add((document, request) => + opts.PreSerializeFilters.Add((document, request) => { var paths = document.Paths.ToDictionary(item => item.Key.ToLowerInvariant(), item => item.Value); document.Paths.Clear(); - foreach (var pathItem in paths) document.Paths.Add(pathItem.Key, pathItem.Value); + foreach (var pathItem in paths) + document.Paths.Add(pathItem.Key, pathItem.Value); }); } @@ -85,8 +88,9 @@ private void MigrateAndSeedDatabase(IApplicationBuilder app) var dataPath = Configuration.GetSection("DataDirectory").GetValue("Path"); using (var serviceScope = app.ApplicationServices.GetRequiredService().CreateScope()) { - serviceScope.ServiceProvider.GetService().Database.Migrate(); - serviceScope.ServiceProvider.GetService().SeedOrUpdate(dataPath); + var filterListsDbContext = serviceScope.ServiceProvider.GetService(); + filterListsDbContext.Database.Migrate(); + filterListsDbContext.SeedOrUpdate(dataPath); } } } diff --git a/src/FilterLists.Api/V1/Controllers/ForksController.cs b/src/FilterLists.Api/V1/Controllers/ForksController.cs index 14d9ce143..974c8f38a 100644 --- a/src/FilterLists.Api/V1/Controllers/ForksController.cs +++ b/src/FilterLists.Api/V1/Controllers/ForksController.cs @@ -13,7 +13,8 @@ public ForksController(SeedService seedService) : base(seedService) } [HttpGet("seed")] - public async Task Seed() => Json(await SeedService.GetAllAsync( - typeof(Fork).GetProperty("UpstreamFilterListId"), typeof(Fork).GetProperty("ForkFilterListId"))); + public async Task Seed() => + Json(await SeedService.GetAllAsync(typeof(Fork).GetProperty("UpstreamFilterListId"), + typeof(Fork).GetProperty("ForkFilterListId"))); } } \ No newline at end of file diff --git a/src/FilterLists.Api/V1/Controllers/ListsController.cs b/src/FilterLists.Api/V1/Controllers/ListsController.cs index 3d96c79e1..01d8b3d8c 100644 --- a/src/FilterLists.Api/V1/Controllers/ListsController.cs +++ b/src/FilterLists.Api/V1/Controllers/ListsController.cs @@ -22,7 +22,7 @@ public ListsController(SeedService seedService, FilterListService filterListServ [HttpGet] [Route("{id}")] //TODO: respond with appropriate exception if negative id queried - public async Task GetById(int id) => Json(await filterListService.GetDetailsAsync((uint)id)); + public async Task GetById(int id) => Json(await filterListService.GetDetailsAsync((uint) id)); [HttpGet("seed")] public async Task Seed() => Json(await SeedService.GetAllAsync()); diff --git a/src/FilterLists.Api/V1/Controllers/MergesController.cs b/src/FilterLists.Api/V1/Controllers/MergesController.cs index 5546c382a..2086257be 100644 --- a/src/FilterLists.Api/V1/Controllers/MergesController.cs +++ b/src/FilterLists.Api/V1/Controllers/MergesController.cs @@ -13,7 +13,8 @@ public MergesController(SeedService seedService) : base(seedService) } [HttpGet("seed")] - public async Task Seed() => Json(await SeedService.GetAllAsync( - typeof(Merge).GetProperty("MergeFilterListId"), typeof(Merge).GetProperty("UpstreamFilterListId"))); + public async Task Seed() => + Json(await SeedService.GetAllAsync(typeof(Merge).GetProperty("MergeFilterListId"), + typeof(Merge).GetProperty("UpstreamFilterListId"))); } } \ No newline at end of file diff --git a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs index 536350435..1fd53f48f 100644 --- a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -12,14 +12,14 @@ namespace FilterLists.Services.DependencyInjection.Extensions { public static class ConfigureServicesCollection { - public static void AddFilterListsServices(this IServiceCollection services, IConfiguration configuration) + public static void AddFilterListsServices(this IServiceCollection services, IConfiguration config) { - services.AddSingleton(c => configuration); + services.AddSingleton(c => config); services.AddEntityFrameworkMySql() - .AddDbContextPool(options => - options.UseMySql(configuration.GetConnectionString("FilterListsConnection"), - b => b.MigrationsAssembly("FilterLists.Api")) - .EnableSensitiveDataLogging()); + .AddDbContextPool(opts => + opts.UseMySql(config.GetConnectionString("FilterListsConnection"), + x => x.MigrationsAssembly("FilterLists.Api")) + .EnableSensitiveDataLogging()); services.TryAddScoped(); services.TryAddScoped(); services.TryAddScoped(); diff --git a/src/FilterLists.Services/Extensions/EnumerableExtensions.cs b/src/FilterLists.Services/Extensions/EnumerableExtensions.cs index b2b510006..d6594d702 100644 --- a/src/FilterLists.Services/Extensions/EnumerableExtensions.cs +++ b/src/FilterLists.Services/Extensions/EnumerableExtensions.cs @@ -10,7 +10,7 @@ public static void AddRange(this ICollection destination, IEnumerable s destination.Add(item); } - public static IEnumerable> Batch(this IEnumerable source, int batchSize) + public static IEnumerable> GetBatches(this IEnumerable source, int batchSize) { var batches = new List(batchSize); foreach (var item in source) diff --git a/src/FilterLists.Services/Snapshot/SnapshotDe.cs b/src/FilterLists.Services/Snapshot/SnapshotDe.cs index a8dfcf46f..41157d501 100644 --- a/src/FilterLists.Services/Snapshot/SnapshotDe.cs +++ b/src/FilterLists.Services/Snapshot/SnapshotDe.cs @@ -104,7 +104,7 @@ private static IEnumerable GetRawRules(string content) private IEnumerable GetSnapshotBatches(IEnumerable rawRules) { - return rawRules.Batch(BatchSize) + return rawRules.GetBatches(BatchSize) .Select(rawRuleBatch => new SnapshotBatchDe(dbContext, snapshot, rawRuleBatch)); }