Skip to content

Commit 4779852

Browse files
neueccneuecc
committed
all `Batch` code is replaced to `ConsoleApp`
1 parent e908659 commit 4779852

24 files changed

+247
-247
lines changed

‎sandbox/MultiContainedApp/Program.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ class Program
1010
{
1111
static async Task Main(string[] args)
1212
{
13-
await BatchHost.CreateDefaultBuilder()
14-
.RunBatchEngineAsync(args);
13+
await ConsoleAppHost.CreateDefaultBuilder()
14+
.RunConsoleAppEngineAsync(args);
1515
}
1616
}
1717

18-
public class Foo : BatchBase
18+
public class Foo : ConsoleAppBase
1919
{
2020
[Command("Echo", "Echo message to the logger")]
2121
public void Echo([Option("msg", "Message to send.")]string msg)
@@ -29,7 +29,7 @@ public void Sum([Option(0)]int x, [Option(1)]int y)
2929
}
3030
}
3131

32-
public class Bar : BatchBase
32+
public class Bar : ConsoleAppBase
3333
{
3434
public void Hello2()
3535
{

‎sandbox/SingleContainedApp/Program.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace SingleContainedApp
1616
{
17-
public class MyFirstBatch : BatchBase
17+
public class MyFirstBatch : ConsoleAppBase
1818
{
1919
public void Hello(
2020
[Option("n", "name of send user.")]string name,
@@ -88,7 +88,7 @@ public class MyConfig
8888
public bool Bar { get; set; }
8989
}
9090

91-
public class OverrideCheck : BatchBase
91+
public class OverrideCheck : ConsoleAppBase
9292
{
9393
[Command("encode", "encode input string to base64url")]
9494
public void Encode([Option(0)]string input) => Console.WriteLine((input));
@@ -113,7 +113,7 @@ public void Help()
113113
}
114114
}
115115

116-
public class ComplexArgTest : BatchBase
116+
public class ComplexArgTest : ConsoleAppBase
117117
{
118118
public void Foo(int[] array, Person person)
119119
{
@@ -134,13 +134,13 @@ static async Task Main(string[] args)
134134
{
135135
args = new[] { "-array", "10,20,30", "-person", @"{""Age"":10,""Name"":""foo""}" };
136136

137-
await BatchHost.CreateDefaultBuilder()
137+
await ConsoleAppHost.CreateDefaultBuilder()
138138
.ConfigureServices((hostContext, services) =>
139139
{
140140
// mapping config json to IOption<MyConfig>
141141
services.Configure<MyConfig>(hostContext.Configuration);
142142
})
143-
.RunBatchEngineAsync<ComplexArgTest>(args);
143+
.RunConsoleAppEngineAsync<ComplexArgTest>(args);
144144
}
145145
}
146146
}

‎sandbox/SingleContainedAppWithConfig/Program.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Microsoft.Extensions.Options;
55
using System.Threading.Tasks;
66

7-
public class Baz : BatchBase
7+
public class Baz : ConsoleAppBase
88
{
99
private readonly IOptions<SingleContainedAppWithConfig.AppConfig> config;
1010
// Batche inject Config on constructor.
@@ -36,7 +36,7 @@ class Program
3636
static async Task Main(string[] args)
3737
{
3838
// using ConsoleAppFramework.Configuration;
39-
await ConsoleAppFramework.BatchHost.CreateDefaultBuilder()
39+
await ConsoleAppFramework.ConsoleAppHost.CreateDefaultBuilder()
4040
.ConfigureServices((hostContext, services) =>
4141
{
4242
services.AddOptions();
@@ -47,7 +47,7 @@ await ConsoleAppFramework.BatchHost.CreateDefaultBuilder()
4747
services.AddTransient<MyServiceB>();
4848
services.AddSingleton<MyServiceC>();
4949
})
50-
.RunBatchEngineAsync<Baz>(args);
50+
.RunConsoleAppEngineAsync<Baz>(args);
5151
}
5252
}
5353

‎sandbox/WebHostingApp/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ public class Program
1111
{
1212
public static async Task Main(string[] args)
1313
{
14-
await new WebHostBuilder().RunBatchEngineWebHosting("http://localhost:12345");
14+
await new WebHostBuilder().RunConsoleAppEngineWebHosting("http://localhost:12345");
1515
}
1616
}
1717

18-
public class MyBatch : BatchBase
18+
public class MyBatch : ConsoleAppBase
1919
{
2020
public void Foo()
2121
{

src/ConsoleAppFramework.WebHosting/BatchEngineHostingExtensions.cs renamed to src/ConsoleAppFramework.WebHosting/ConsoleAppEngineHostingExtensions.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@
1313

1414
namespace ConsoleAppFramework // .WebHosting
1515
{
16-
public static class BatchEngineHostingExtensions
16+
public static class ConsoleAppEngineHostingExtensions
1717
{
18-
public static IWebHostBuilder PrepareBatchEngineMiddleware(this IWebHostBuilder builder, IBatchInterceptor? interceptor = null)
18+
public static IWebHostBuilder PrepareConsoleAppEngineMiddleware(this IWebHostBuilder builder, IConsoleAppInterceptor? interceptor = null)
1919
{
20-
var batchTypes = CollectBatchTypes();
21-
var target = new TargetBatchTypeCollection(batchTypes);
20+
var consoleAppTypes = CollectConsoleAppTypes();
21+
var target = new TargetConsoleAppTypeCollection(consoleAppTypes);
2222

2323
return builder
2424
.ConfigureServices(services =>
2525
{
26-
services.AddSingleton<IBatchInterceptor>(interceptor ?? NullBatchInterceptor.Default);
27-
services.AddSingleton<TargetBatchTypeCollection>(target);
26+
services.AddSingleton<IConsoleAppInterceptor>(interceptor ?? NullConsoleAppInterceptor.Default);
27+
services.AddSingleton<TargetConsoleAppTypeCollection>(target);
2828
foreach (var item in target)
2929
{
3030
services.AddTransient(item);
3131
}
3232
});
3333
}
3434

35-
public static Task RunBatchEngineWebHosting(this IWebHostBuilder builder, string urls, SwaggerOptions? swaggerOptions = null, IBatchInterceptor? interceptor = null)
35+
public static Task RunConsoleAppEngineWebHosting(this IWebHostBuilder builder, string urls, SwaggerOptions? swaggerOptions = null, IConsoleAppInterceptor? interceptor = null)
3636
{
3737
return builder
38-
.PrepareBatchEngineMiddleware(interceptor)
38+
.PrepareConsoleAppEngineMiddleware(interceptor)
3939
.ConfigureServices(services =>
4040
{
4141
if (swaggerOptions == null)
@@ -55,29 +55,29 @@ public static Task RunBatchEngineWebHosting(this IWebHostBuilder builder, string
5555
.RunAsync();
5656
}
5757

58-
public static IApplicationBuilder UseBatchEngineMiddleware(this IApplicationBuilder builder)
58+
public static IApplicationBuilder UseConsoleAppEngineMiddleware(this IApplicationBuilder builder)
5959
{
60-
return builder.UseMiddleware<BatchEngineMiddleware>();
60+
return builder.UseMiddleware<ConsoleAppEngineMiddleware>();
6161
}
6262

63-
public static IApplicationBuilder UseBatchEngineSwaggerMiddleware(this IApplicationBuilder builder, SwaggerOptions options)
63+
public static IApplicationBuilder UseConsoleAppEngineSwaggerMiddleware(this IApplicationBuilder builder, SwaggerOptions options)
6464
{
65-
return builder.UseMiddleware<BatchEngineSwaggerMiddleware>(options);
65+
return builder.UseMiddleware<ConsoleAppEngineSwaggerMiddleware>(options);
6666
}
6767

6868
public class DefaultStartup
6969
{
7070
public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime)
7171
{
72-
var interceptor = app.ApplicationServices.GetService<IBatchInterceptor>();
72+
var interceptor = app.ApplicationServices.GetService<IConsoleAppInterceptor>();
7373
var provider = app.ApplicationServices.GetService<IServiceProvider>();
74-
var logger = app.ApplicationServices.GetService<ILogger<BatchEngine>>();
74+
var logger = app.ApplicationServices.GetService<ILogger<ConsoleAppEngine>>();
7575

7676
lifetime.ApplicationStarted.Register(async () =>
7777
{
7878
try
7979
{
80-
await interceptor.OnBatchEngineBeginAsync(provider, logger);
80+
await interceptor.OnConsoleAppEngineBeginAsync(provider, logger);
8181
}
8282
catch { }
8383
});
@@ -86,20 +86,20 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime
8686
{
8787
try
8888
{
89-
await interceptor.OnBatchEngineEndAsync();
89+
await interceptor.OnConsoleAppEngineEndAsync();
9090
}
9191
catch { }
9292
});
9393

9494
var swaggerOption = app.ApplicationServices.GetService<SwaggerOptions>() ?? new SwaggerOptions("ConsoleAppFramework", "", "/");
95-
app.UseBatchEngineSwaggerMiddleware(swaggerOption);
96-
app.UseBatchEngineMiddleware();
95+
app.UseConsoleAppEngineSwaggerMiddleware(swaggerOption);
96+
app.UseConsoleAppEngineMiddleware();
9797
}
9898
}
9999

100-
static List<Type> CollectBatchTypes()
100+
static List<Type> CollectConsoleAppTypes()
101101
{
102-
List<Type> batchBaseTypes = new List<Type>();
102+
List<Type> consoleAppBaseTypes = new List<Type>();
103103

104104
foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
105105
{
@@ -120,14 +120,14 @@ static List<Type> CollectBatchTypes()
120120
if (types is null) continue;
121121
foreach (var item in types)
122122
{
123-
if (typeof(BatchBase).IsAssignableFrom(item) && item != typeof(BatchBase))
123+
if (typeof(ConsoleAppBase).IsAssignableFrom(item) && item != typeof(ConsoleAppBase))
124124
{
125-
batchBaseTypes.Add(item);
125+
consoleAppBaseTypes.Add(item);
126126
}
127127
}
128128
}
129129

130-
return batchBaseTypes;
130+
return consoleAppBaseTypes;
131131
}
132132
}
133133
}

src/ConsoleAppFramework.WebHosting/BatchEngineMiddleware.cs renamed to src/ConsoleAppFramework.WebHosting/ConsoleAppEngineMiddleware.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,49 @@
99

1010
namespace ConsoleAppFramework.WebHosting
1111
{
12-
internal class WebHostingInterceptor : IBatchInterceptor
12+
internal class WebHostingInterceptor : IConsoleAppInterceptor
1313
{
14-
readonly IBatchInterceptor innerInterceptor;
14+
readonly IConsoleAppInterceptor innerInterceptor;
1515

1616
public bool CompleteSuccessfully { get; private set; }
1717
public string? ErrorMessage { get; private set; }
1818
public Exception? Exception { get; private set; }
1919

20-
public WebHostingInterceptor(IBatchInterceptor innerInterceptor)
20+
public WebHostingInterceptor(IConsoleAppInterceptor innerInterceptor)
2121
{
2222
this.innerInterceptor = innerInterceptor;
2323
}
2424

25-
public ValueTask OnBatchEngineBeginAsync(IServiceProvider serviceProvider, ILogger<BatchEngine> logger)
25+
public ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)
2626
{
27-
return innerInterceptor.OnBatchEngineBeginAsync(serviceProvider, logger);
27+
return innerInterceptor.OnConsoleAppEngineBeginAsync(serviceProvider, logger);
2828
}
2929

30-
public ValueTask OnBatchEngineEndAsync()
30+
public ValueTask OnConsoleAppEngineEndAsync()
3131
{
32-
return innerInterceptor.OnBatchEngineEndAsync();
32+
return innerInterceptor.OnConsoleAppEngineEndAsync();
3333
}
3434

35-
public ValueTask OnBatchRunBeginAsync(BatchContext context)
35+
public ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context)
3636
{
37-
return innerInterceptor.OnBatchRunBeginAsync(context);
37+
return innerInterceptor.OnConsoleAppRunBeginAsync(context);
3838
}
3939

40-
public ValueTask OnBatchRunCompleteAsync(BatchContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)
40+
public ValueTask OnConsoleAppRunCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)
4141
{
4242
this.CompleteSuccessfully = (errorMessageIfFailed == null && exceptionIfExists == null);
4343
this.ErrorMessage = errorMessageIfFailed;
4444
this.Exception = exceptionIfExists;
45-
return innerInterceptor.OnBatchRunCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);
45+
return innerInterceptor.OnConsoleAppRunCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);
4646
}
4747
}
4848

49-
internal class LogCollector : ILogger<BatchEngine>
49+
internal class LogCollector : ILogger<ConsoleAppEngine>
5050
{
51-
readonly ILogger<BatchEngine> innerLogger;
51+
readonly ILogger<ConsoleAppEngine> innerLogger;
5252
readonly StringBuilder sb;
5353

54-
public LogCollector(ILogger<BatchEngine> innerLogger)
54+
public LogCollector(ILogger<ConsoleAppEngine> innerLogger)
5555
{
5656
this.innerLogger = innerLogger;
5757
this.sb = new StringBuilder();
@@ -87,16 +87,16 @@ public override string ToString()
8787
}
8888
}
8989

90-
public class BatchEngineMiddleware
90+
public class ConsoleAppEngineMiddleware
9191
{
9292
readonly RequestDelegate next;
9393
readonly IServiceProvider provider;
94-
readonly ILogger<BatchEngine> logger;
95-
readonly IBatchInterceptor interceptor;
94+
readonly ILogger<ConsoleAppEngine> logger;
95+
readonly IConsoleAppInterceptor interceptor;
9696

9797
readonly Dictionary<string, MethodInfo> methodLookup;
9898

99-
public BatchEngineMiddleware(RequestDelegate next, ILogger<BatchEngine> logger, IBatchInterceptor interceptor, IServiceProvider provider, TargetBatchTypeCollection targetTypes)
99+
public ConsoleAppEngineMiddleware(RequestDelegate next, ILogger<ConsoleAppEngine> logger, IConsoleAppInterceptor interceptor, IServiceProvider provider, TargetConsoleAppTypeCollection targetTypes)
100100
{
101101
this.next = next;
102102
this.logger = logger;
@@ -152,7 +152,7 @@ public async Task Invoke(HttpContext httpContext)
152152
var hostingInterceptor = new WebHostingInterceptor(interceptor);
153153
var collectLogger = new LogCollector(logger);
154154

155-
var engine = new BatchEngine(collectLogger, provider, hostingInterceptor, httpContext.RequestAborted);
155+
var engine = new ConsoleAppEngine(collectLogger, provider, hostingInterceptor, httpContext.RequestAborted);
156156
await engine.RunAsync(methodInfo.DeclaringType, methodInfo, args);
157157

158158
// out result
@@ -172,11 +172,11 @@ public async Task Invoke(HttpContext httpContext)
172172
}
173173
}
174174

175-
static Dictionary<string, MethodInfo> BuildMethodLookup(IEnumerable<Type> batchTypes)
175+
static Dictionary<string, MethodInfo> BuildMethodLookup(IEnumerable<Type> consoleAppTypes)
176176
{
177177
var methods = new Dictionary<string, MethodInfo>();
178178

179-
foreach (var type in batchTypes)
179+
foreach (var type in consoleAppTypes)
180180
{
181181
foreach (var item in type.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
182182
{

src/ConsoleAppFramework.WebHosting/BatchEngineSwaggerMiddleware.cs renamed to src/ConsoleAppFramework.WebHosting/ConsoleAppEngineSwaggerMiddleware.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
namespace ConsoleAppFramework.WebHosting
99
{
10-
public class BatchEngineSwaggerMiddleware
10+
public class ConsoleAppEngineSwaggerMiddleware
1111
{
1212
static readonly Task EmptyTask = Task.FromResult(0);
1313

1414
readonly RequestDelegate next;
1515
readonly MethodInfo[] handlers;
1616
readonly SwaggerOptions options;
1717

18-
public BatchEngineSwaggerMiddleware(RequestDelegate next, TargetBatchTypeCollection targetTypes, SwaggerOptions options)
18+
public ConsoleAppEngineSwaggerMiddleware(RequestDelegate next, TargetConsoleAppTypeCollection targetTypes, SwaggerOptions options)
1919
{
2020
this.next = next;
2121
this.handlers = targetTypes.SelectMany(x => x.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)).ToArray();
@@ -42,7 +42,7 @@ public async Task Invoke(HttpContext httpContext)
4242
return;
4343
}
4444

45-
var myAssembly = typeof(BatchEngineSwaggerMiddleware).GetTypeInfo().Assembly;
45+
var myAssembly = typeof(ConsoleAppEngineSwaggerMiddleware).GetTypeInfo().Assembly;
4646

4747
using (var stream = myAssembly.GetManifestResourceStream(filePath))
4848
{

src/ConsoleAppFramework.WebHosting/TargetBatchTypeCollection.cs renamed to src/ConsoleAppFramework.WebHosting/TargetConsoleAppTypeCollection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
namespace ConsoleAppFramework.WebHosting
66
{
7-
public class TargetBatchTypeCollection : IEnumerable<Type>
7+
public class TargetConsoleAppTypeCollection : IEnumerable<Type>
88
{
99
readonly IEnumerable<Type> types;
1010

11-
public TargetBatchTypeCollection(IEnumerable<Type> types)
11+
public TargetConsoleAppTypeCollection(IEnumerable<Type> types)
1212
{
1313
this.types = types;
1414
}

0 commit comments

Comments
 (0)