add scope explicitly

nogic1008 · nogic1008 · commit 1908eabc2e77 · 2019-10-15T11:31:54.000+09:00
diff --git a/src/MicroBatchFramework.WebHosting/BatchEngineMiddleware.cs b/src/MicroBatchFramework.WebHosting/BatchEngineMiddleware.cs
@@ -1,4 +1,4 @@
-﻿using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -89,12 +89,12 @@ public override string ToString()
 
     public class BatchEngineMiddleware
     {
-        readonly RequestDelegate next;
-        readonly IServiceProvider provider;
-        readonly ILogger<BatchEngine> logger;
-        readonly IBatchInterceptor interceptor;
+        private readonly RequestDelegate next;
+        private readonly IServiceProvider provider;
+        private readonly ILogger<BatchEngine> logger;
+        private readonly IBatchInterceptor interceptor;
 
-        readonly Dictionary<string, MethodInfo> methodLookup;
+        private readonly Dictionary<string, MethodInfo> methodLookup;
 
         public BatchEngineMiddleware(RequestDelegate next, ILogger<BatchEngine> logger, IBatchInterceptor interceptor, IServiceProvider provider, TargetBatchTypeCollection targetTypes)
         {
diff --git a/src/MicroBatchFramework.WebHosting/BatchEngineSwaggerMiddleware.cs b/src/MicroBatchFramework.WebHosting/BatchEngineSwaggerMiddleware.cs
@@ -9,11 +9,11 @@ namespace MicroBatchFramework.WebHosting
 {
     public class BatchEngineSwaggerMiddleware
     {
-        static readonly Task EmptyTask = Task.FromResult(0);
+        private static readonly Task EmptyTask = Task.FromResult(0);
 
-        readonly RequestDelegate next;
-        readonly MethodInfo[] handlers;
-        readonly SwaggerOptions options;
+        private readonly RequestDelegate next;
+        private readonly MethodInfo[] handlers;
+        private readonly SwaggerOptions options;
 
         public BatchEngineSwaggerMiddleware(RequestDelegate next, TargetBatchTypeCollection targetTypes, SwaggerOptions options)
         {
diff --git a/src/MicroBatchFramework.WebHosting/Swagger/SwaggerDefinitionBuilder.cs b/src/MicroBatchFramework.WebHosting/Swagger/SwaggerDefinitionBuilder.cs
@@ -1,4 +1,4 @@
-﻿using MicroBatchFramework.WebHosting.Swagger.Schemas;
+using MicroBatchFramework.WebHosting.Swagger.Schemas;
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
@@ -16,11 +16,11 @@ namespace MicroBatchFramework.WebHosting.Swagger
 {
     public class SwaggerDefinitionBuilder
     {
-        readonly SwaggerOptions options;
-        readonly HttpContext httpContext;
-        readonly IEnumerable<MethodInfo> handlers;
+        private readonly SwaggerOptions options;
+        private readonly HttpContext httpContext;
+        private readonly IEnumerable<MethodInfo> handlers;
 
-        ILookup<Tuple<string, string>, XmlCommentStructure> xDocLookup;
+        private ILookup<Tuple<string, string>, XmlCommentStructure> xDocLookup;
 
         public SwaggerDefinitionBuilder(SwaggerOptions options, HttpContext httpContext, IEnumerable<MethodInfo> handlers)
         {
diff --git a/src/MicroBatchFramework.WebHosting/Swagger/SwaggerOptions.cs b/src/MicroBatchFramework.WebHosting/Swagger/SwaggerOptions.cs
@@ -6,7 +6,7 @@ namespace MicroBatchFramework.WebHosting.Swagger
 {
     public class SwaggerOptions
     {
-        public string ApiBasePath { get; private set; }
+        public string ApiBasePath { get; }
         public Info Info { get; set; }
 
         /// <summary>
diff --git a/src/MicroBatchFramework.WebHosting/TargetBatchTypeCollection.cs b/src/MicroBatchFramework.WebHosting/TargetBatchTypeCollection.cs
@@ -6,7 +6,7 @@ namespace MicroBatchFramework.WebHosting
 {
     public class TargetBatchTypeCollection : IEnumerable<Type>
     {
-        readonly IEnumerable<Type> types;
+        private readonly IEnumerable<Type> types;
 
         public TargetBatchTypeCollection(IEnumerable<Type> types)
         {
diff --git a/src/MicroBatchFramework/BatchContext.cs b/src/MicroBatchFramework/BatchContext.cs
@@ -6,10 +6,10 @@ namespace MicroBatchFramework
 {
     public class BatchContext
     {
-        public string[] Arguments { get; private set; }
-        public DateTime Timestamp { get; private set; }
-        public CancellationToken CancellationToken { get; private set; }
-        public ILogger<BatchEngine> Logger { get; private set; }
+        public string[] Arguments { get; }
+        public DateTime Timestamp { get; }
+        public CancellationToken CancellationToken { get; }
+        public ILogger<BatchEngine> Logger { get; }
 
         public BatchContext(string[] arguments, DateTime timestamp, CancellationToken cancellationToken, ILogger<BatchEngine> logger)
         {
diff --git a/src/MicroBatchFramework/BatchEngine.cs b/src/MicroBatchFramework/BatchEngine.cs
@@ -1,4 +1,4 @@
-﻿using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -13,10 +13,10 @@ namespace MicroBatchFramework
 {
     public class BatchEngine
     {
-        readonly ILogger<BatchEngine> logger;
-        readonly IServiceProvider provider;
-        readonly IBatchInterceptor interceptor;
-        readonly CancellationToken cancellationToken;
+        private readonly ILogger<BatchEngine> logger;
+        private readonly IServiceProvider provider;
+        private readonly IBatchInterceptor interceptor;
+        private readonly CancellationToken cancellationToken;
 
         public BatchEngine(ILogger<BatchEngine> logger, IServiceProvider provider, IBatchInterceptor interceptor, CancellationToken cancellationToken)
         {
diff --git a/src/MicroBatchFramework/BatchEngineHostBuilderExtensions.cs b/src/MicroBatchFramework/BatchEngineHostBuilderExtensions.cs
@@ -10,8 +10,8 @@ namespace MicroBatchFramework
 {
     public static class BatchEngineHostBuilderExtensions
     {
-        const string ListCommand = "list";
-        const string HelpCommand = "help";
+        private const string ListCommand = "list";
+        private const string HelpCommand = "help";
 
         public static IHostBuilder UseBatchEngine(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null)
         {
@@ -153,7 +153,7 @@ public static Task RunBatchEngineAsync<T>(this IHostBuilder hostBuilder, string[
             return UseBatchEngine<T>(hostBuilder, args, interceptor).Build().RunAsync();
         }
 
-        static void ShowMethodList()
+        private static void ShowMethodList()
         {
             Console.WriteLine("list of methods:");
             var list = GetBatchTypes();
@@ -166,7 +166,7 @@ static void ShowMethodList()
             }
         }
 
-        static List<Type> GetBatchTypes()
+        private static List<Type> GetBatchTypes()
         {
             List<Type> batchBaseTypes = new List<Type>();
 
@@ -196,7 +196,7 @@ static List<Type> GetBatchTypes()
             return batchBaseTypes;
         }
 
-        static (Type, MethodInfo) GetTypeFromAssemblies(string arg0)
+        private static (Type, MethodInfo) GetTypeFromAssemblies(string arg0)
         {
             var batchBaseTypes = GetBatchTypes();
             if (batchBaseTypes == null)
diff --git a/src/MicroBatchFramework/BatchEngineService.cs b/src/MicroBatchFramework/BatchEngineService.cs
@@ -9,15 +9,15 @@ namespace MicroBatchFramework
 {
     public sealed class BatchEngineService : IHostedService
     {
-        string[] args;
-        Type type;
-        MethodInfo methodInfo;
-        IApplicationLifetime appLifetime;
-        ILogger<BatchEngine> logger;
-        IServiceProvider provider;
-        IBatchInterceptor interceptor;
-        Task runningTask;
-        CancellationTokenSource cancellationTokenSource;
+        private readonly string[] args;
+        private readonly Type type;
+        private readonly MethodInfo methodInfo;
+        private readonly IApplicationLifetime appLifetime;
+        private readonly ILogger<BatchEngine> logger;
+        private readonly IServiceProvider provider;
+        private readonly IBatchInterceptor interceptor;
+        private Task runningTask;
+        private readonly CancellationTokenSource cancellationTokenSource;
 
         public BatchEngineService(IApplicationLifetime appLifetime, Type type, string[] args, ILogger<BatchEngine> logger, IServiceProvider provider)
             : this(appLifetime, type, null, args, logger, provider)
diff --git a/src/MicroBatchFramework/CompositeBatchInterceptor.cs b/src/MicroBatchFramework/CompositeBatchInterceptor.cs
@@ -9,7 +9,7 @@ namespace MicroBatchFramework
 {
     public class CompositeBatchInterceptor : IBatchInterceptor
     {
-        readonly IBatchInterceptor[] interceptors;
+        private readonly IBatchInterceptor[] interceptors;
 
         public CompositeBatchInterceptor(params IBatchInterceptor[] interceptors)
         {
@@ -87,7 +87,7 @@ public async ValueTask OnBatchRunCompleteAsync(BatchContext context, string erro
 
     internal struct AggregateExceptionHolder
     {
-        List<ExceptionDispatchInfo> exceptions;
+        private List<ExceptionDispatchInfo> exceptions;
 
         public void Add(Exception ex)
         {
diff --git a/src/MicroBatchFramework/EmptyHostedService.cs b/src/MicroBatchFramework/EmptyHostedService.cs
@@ -6,7 +6,7 @@ namespace MicroBatchFramework
 {
     internal class EmptyHostedService : IHostedService
     {
-        readonly IApplicationLifetime appLifetime;
+        private readonly IApplicationLifetime appLifetime;
 
         public EmptyHostedService(IApplicationLifetime appLifetime)
         {
diff --git a/src/MicroBatchFramework/IBatchInterceptor.cs b/src/MicroBatchFramework/IBatchInterceptor.cs
@@ -30,7 +30,7 @@ public interface IBatchInterceptor
     public class NullBatchInterceptor : IBatchInterceptor
     {
         public static readonly IBatchInterceptor Default = new NullBatchInterceptor();
-        readonly ValueTask Empty = default(ValueTask);
+        private readonly ValueTask Empty = default(ValueTask);
 
         public ValueTask OnBatchEngineBeginAsync(IServiceProvider serviceProvider, ILogger<BatchEngine> logger)
         {
diff --git a/src/MicroBatchFramework/SimpleConsoleLogger.cs b/src/MicroBatchFramework/SimpleConsoleLogger.cs
@@ -7,7 +7,7 @@ namespace MicroBatchFramework.Logging
 {
     public class SimpleConsoleLoggerProvider : ILoggerProvider
     {
-        readonly SimpleConsoleLogger logger;
+        private readonly SimpleConsoleLogger logger;
 
         public SimpleConsoleLoggerProvider()
         {
diff --git a/tests/MicroBatchFramework.Tests/CommandAttributeTest.cs b/tests/MicroBatchFramework.Tests/CommandAttributeTest.cs
@@ -10,7 +10,7 @@ public class CommandAttributeTest
     {
         class CommandAttributeTestCommand : BatchBase
         {
-            ResultContainer _Result;
+            private readonly ResultContainer _Result;
             public CommandAttributeTestCommand(ResultContainer r)
             {
                 _Result = r;
diff --git a/tests/MicroBatchFramework.Tests/MultiContainedTest.cs b/tests/MicroBatchFramework.Tests/MultiContainedTest.cs
@@ -34,7 +34,7 @@ public void Hello2(bool x, bool y, string foo, int nano = 999)
 
     public class MultiContainedTest
     {
-        ITestOutputHelper testOutput;
+        private readonly ITestOutputHelper testOutput;
 
         public MultiContainedTest(ITestOutputHelper testOutput)
         {
diff --git a/tests/MicroBatchFramework.Tests/SingleContainedTest.cs b/tests/MicroBatchFramework.Tests/SingleContainedTest.cs
@@ -10,7 +10,7 @@ namespace MicroBatchFramework.Tests
 {
     public class SingleContainedTest
     {
-        ITestOutputHelper testOutput;
+        private readonly ITestOutputHelper testOutput;
 
         public SingleContainedTest(ITestOutputHelper testOutput)
         {
diff --git a/tests/MicroBatchFramework.Tests/XUnitLogger.cs b/tests/MicroBatchFramework.Tests/XUnitLogger.cs
@@ -49,7 +49,7 @@ public static IDisposable BeginSetConsoleOut(ITestOutputHelper helper, LogStack
 
         public struct Scope : IDisposable
         {
-            TextWriter writer;
+            private readonly TextWriter writer;
 
             public Scope(TextWriter writer)
             {

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ namespace MicroBatchFramework.WebHosting`
`9`	`9`	`{`
`10`	`10`	`public class BatchEngineSwaggerMiddleware`
`11`	`11`	`{`
`12`		`- static readonly Task EmptyTask = Task.FromResult(0);`
	`12`	`+ private static readonly Task EmptyTask = Task.FromResult(0);`
`13`	`13`
`14`		`- readonly RequestDelegate next;`
`15`		`- readonly MethodInfo[] handlers;`
`16`		`- readonly SwaggerOptions options;`
	`14`	`+ private readonly RequestDelegate next;`
	`15`	`+ private readonly MethodInfo[] handlers;`
	`16`	`+ private readonly SwaggerOptions options;`
`17`	`17`
`18`	`18`	`public BatchEngineSwaggerMiddleware(RequestDelegate next, TargetBatchTypeCollection targetTypes, SwaggerOptions options)`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using MicroBatchFramework.WebHosting.Swagger.Schemas;`
	`1`	`+using MicroBatchFramework.WebHosting.Swagger.Schemas;`
`2`	`2`	`using Microsoft.AspNetCore.Http;`
`3`	`3`	`using Newtonsoft.Json;`
`4`	`4`	`using Newtonsoft.Json.Serialization;`
`@@ -16,11 +16,11 @@ namespace MicroBatchFramework.WebHosting.Swagger`
`16`	`16`	`{`
`17`	`17`	`public class SwaggerDefinitionBuilder`
`18`	`18`	`{`
`19`		`- readonly SwaggerOptions options;`
`20`		`- readonly HttpContext httpContext;`
`21`		`- readonly IEnumerable<MethodInfo> handlers;`
	`19`	`+ private readonly SwaggerOptions options;`
	`20`	`+ private readonly HttpContext httpContext;`
	`21`	`+ private readonly IEnumerable<MethodInfo> handlers;`
`22`	`22`
`23`		`- ILookup<Tuple<string, string>, XmlCommentStructure> xDocLookup;`
	`23`	`+ private ILookup<Tuple<string, string>, XmlCommentStructure> xDocLookup;`
`24`	`24`
`25`	`25`	`public SwaggerDefinitionBuilder(SwaggerOptions options, HttpContext httpContext, IEnumerable<MethodInfo> handlers)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace MicroBatchFramework.WebHosting.Swagger`
`6`	`6`	`{`
`7`	`7`	`public class SwaggerOptions`
`8`	`8`	`{`
`9`		`- public string ApiBasePath { get; private set; }`
	`9`	`+ public string ApiBasePath { get; }`
`10`	`10`	`public Info Info { get; set; }`
`11`	`11`
`12`	`12`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace MicroBatchFramework.WebHosting`
`6`	`6`	`{`
`7`	`7`	`public class TargetBatchTypeCollection : IEnumerable<Type>`
`8`	`8`	`{`
`9`		`- readonly IEnumerable<Type> types;`
	`9`	`+ private readonly IEnumerable<Type> types;`
`10`	`10`
`11`	`11`	`public TargetBatchTypeCollection(IEnumerable<Type> types)`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@ namespace MicroBatchFramework`
`6`	`6`	`{`
`7`	`7`	`public class BatchContext`
`8`	`8`	`{`
`9`		`- public string[] Arguments { get; private set; }`
`10`		`- public DateTime Timestamp { get; private set; }`
`11`		`- public CancellationToken CancellationToken { get; private set; }`
`12`		`- public ILogger<BatchEngine> Logger { get; private set; }`
	`9`	`+ public string[] Arguments { get; }`
	`10`	`+ public DateTime Timestamp { get; }`
	`11`	`+ public CancellationToken CancellationToken { get; }`
	`12`	`+ public ILogger<BatchEngine> Logger { get; }`
`13`	`13`
`14`	`14`	`public BatchContext(string[] arguments, DateTime timestamp, CancellationToken cancellationToken, ILogger<BatchEngine> logger)`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Microsoft.Extensions.Logging;`
	`1`	`+using Microsoft.Extensions.Logging;`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Collections.ObjectModel;`
`@@ -13,10 +13,10 @@ namespace MicroBatchFramework`
`13`	`13`	`{`
`14`	`14`	`public class BatchEngine`
`15`	`15`	`{`
`16`		`- readonly ILogger<BatchEngine> logger;`
`17`		`- readonly IServiceProvider provider;`
`18`		`- readonly IBatchInterceptor interceptor;`
`19`		`- readonly CancellationToken cancellationToken;`
	`16`	`+ private readonly ILogger<BatchEngine> logger;`
	`17`	`+ private readonly IServiceProvider provider;`
	`18`	`+ private readonly IBatchInterceptor interceptor;`
	`19`	`+ private readonly CancellationToken cancellationToken;`
`20`	`20`
`21`	`21`	`public BatchEngine(ILogger<BatchEngine> logger, IServiceProvider provider, IBatchInterceptor interceptor, CancellationToken cancellationToken)`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ namespace MicroBatchFramework`
`10`	`10`	`{`
`11`	`11`	`public static class BatchEngineHostBuilderExtensions`
`12`	`12`	`{`
`13`		`- const string ListCommand = "list";`
`14`		`- const string HelpCommand = "help";`
	`13`	`+ private const string ListCommand = "list";`
	`14`	`+ private const string HelpCommand = "help";`
`15`	`15`
`16`	`16`	`public static IHostBuilder UseBatchEngine(this IHostBuilder hostBuilder, string[] args, IBatchInterceptor interceptor = null)`
`17`	`17`	`{`
`@@ -153,7 +153,7 @@ public static Task RunBatchEngineAsync<T>(this IHostBuilder hostBuilder, string[`
`153`	`153`	`return UseBatchEngine<T>(hostBuilder, args, interceptor).Build().RunAsync();`
`154`	`154`	`}`
`155`	`155`
`156`		`- static void ShowMethodList()`
	`156`	`+ private static void ShowMethodList()`
`157`	`157`	`{`
`158`	`158`	`Console.WriteLine("list of methods:");`
`159`	`159`	`var list = GetBatchTypes();`
`@@ -166,7 +166,7 @@ static void ShowMethodList()`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`- static List<Type> GetBatchTypes()`
	`169`	`+ private static List<Type> GetBatchTypes()`
`170`	`170`	`{`
`171`	`171`	`List<Type> batchBaseTypes = new List<Type>();`
`172`	`172`
`@@ -196,7 +196,7 @@ static List<Type> GetBatchTypes()`
`196`	`196`	`return batchBaseTypes;`
`197`	`197`	`}`
`198`	`198`
`199`		`- static (Type, MethodInfo) GetTypeFromAssemblies(string arg0)`
	`199`	`+ private static (Type, MethodInfo) GetTypeFromAssemblies(string arg0)`
`200`	`200`	`{`
`201`	`201`	`var batchBaseTypes = GetBatchTypes();`
`202`	`202`	`if (batchBaseTypes == null)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace MicroBatchFramework`
`9`	`9`	`{`
`10`	`10`	`public class CompositeBatchInterceptor : IBatchInterceptor`
`11`	`11`	`{`
`12`		`- readonly IBatchInterceptor[] interceptors;`
	`12`	`+ private readonly IBatchInterceptor[] interceptors;`
`13`	`13`
`14`	`14`	`public CompositeBatchInterceptor(params IBatchInterceptor[] interceptors)`
`15`	`15`	`{`
`@@ -87,7 +87,7 @@ public async ValueTask OnBatchRunCompleteAsync(BatchContext context, string erro`
`87`	`87`
`88`	`88`	`internal struct AggregateExceptionHolder`
`89`	`89`	`{`
`90`		`- List<ExceptionDispatchInfo> exceptions;`
	`90`	`+ private List<ExceptionDispatchInfo> exceptions;`
`91`	`91`
`92`	`92`	`public void Add(Exception ex)`
`93`	`93`	`{`