Skip to content

Commit ec7378a

Browse files
damienboddamienbod
committed
Merge branch 'dev'
2 parents 7512eef + 92341cf commit ec7378a

7 files changed

Lines changed: 90 additions & 102 deletions

File tree

‎AspNetCoreServiceBusApi1/Controllers/PayloadController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System.ComponentModel.DataAnnotations;
2-
using AspNetCoreServiceBusApi1.Model;
1+
using AspNetCoreServiceBusApi1.Model;
32
using Microsoft.AspNetCore.Mvc;
43
using ServiceBusMessaging;
4+
using System.ComponentModel.DataAnnotations;
55

66
namespace AspNetCoreServiceBusApi1.Controllers;
77

‎AspNetCoreServiceBusApi1/Controllers/TopicController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System.ComponentModel.DataAnnotations;
2-
using AspNetCoreServiceBusApi1.Model;
1+
using AspNetCoreServiceBusApi1.Model;
32
using Microsoft.AspNetCore.Mvc;
43
using ServiceBusMessaging;
4+
using System.ComponentModel.DataAnnotations;
55

66
namespace AspNetCoreServiceBusApi1.Controllers;
77

‎AspNetCoreServiceBusApi1/Program.cs‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,41 @@
1-
using System;
2-
using Microsoft.AspNetCore.Hosting;
3-
using Microsoft.Extensions.Hosting;
41
using Serilog;
52
using Serilog.Events;
63

7-
namespace AspNetCoreServiceBusApi1
4+
namespace AspNetCoreServiceBusApi1;
5+
6+
public class Program
87
{
9-
public class Program
8+
public static int Main(string[] args)
109
{
11-
public static int Main(string[] args)
12-
{
13-
Log.Logger = new LoggerConfiguration()
14-
.MinimumLevel.Information()
15-
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
16-
.Enrich.FromLogContext()
17-
.WriteTo.Console()
18-
.CreateLogger();
10+
Log.Logger = new LoggerConfiguration()
11+
.MinimumLevel.Information()
12+
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
13+
.Enrich.FromLogContext()
14+
.WriteTo.Console()
15+
.CreateLogger();
1916

20-
try
21-
{
22-
Log.Information("Starting host");
23-
CreateHostBuilder(args).Build().Run();
24-
return 0;
25-
}
26-
catch (Exception ex)
27-
{
28-
Log.Fatal(ex, "Host terminated unexpectedly");
29-
return 1;
30-
}
31-
finally
32-
{
33-
Log.CloseAndFlush();
34-
}
17+
try
18+
{
19+
Log.Information("Starting host");
20+
CreateHostBuilder(args).Build().Run();
21+
return 0;
22+
}
23+
catch (Exception ex)
24+
{
25+
Log.Fatal(ex, "Host terminated unexpectedly");
26+
return 1;
27+
}
28+
finally
29+
{
30+
Log.CloseAndFlush();
3531
}
36-
37-
public static IHostBuilder CreateHostBuilder(string[] args) =>
38-
Host.CreateDefaultBuilder(args)
39-
.ConfigureWebHostDefaults(webBuilder =>
40-
{
41-
webBuilder.UseStartup<Startup>();
42-
})
43-
.UseSerilog();
4432
}
33+
34+
public static IHostBuilder CreateHostBuilder(string[] args) =>
35+
Host.CreateDefaultBuilder(args)
36+
.ConfigureWebHostDefaults(webBuilder =>
37+
{
38+
webBuilder.UseStartup<Startup>();
39+
})
40+
.UseSerilog();
4541
}

‎AspNetCoreServiceBusApi1/Startup.cs‎

Lines changed: 42 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,62 @@
1-
using Microsoft.AspNetCore.Builder;
2-
using Microsoft.AspNetCore.Hosting;
3-
using Microsoft.Extensions.Configuration;
4-
using Microsoft.Extensions.DependencyInjection;
5-
using Microsoft.Extensions.Hosting;
61
using Microsoft.OpenApi.Models;
72
using ServiceBusMessaging;
83

9-
namespace AspNetCoreServiceBusApi1
4+
namespace AspNetCoreServiceBusApi1;
5+
6+
public class Startup
107
{
11-
public class Startup
8+
public Startup(IConfiguration configuration)
129
{
13-
public Startup(IConfiguration configuration)
14-
{
15-
Configuration = configuration;
16-
}
10+
Configuration = configuration;
11+
}
1712

18-
public IConfiguration Configuration { get; }
13+
public IConfiguration Configuration { get; }
1914

20-
public void ConfigureServices(IServiceCollection services)
21-
{
22-
services.AddControllers();
15+
public void ConfigureServices(IServiceCollection services)
16+
{
17+
services.AddControllers();
2318

24-
services.AddScoped<ServiceBusSender>();
25-
services.AddScoped<ServiceBusTopicSender>();
19+
services.AddScoped<ServiceBusSender>();
20+
services.AddScoped<ServiceBusTopicSender>();
2621

27-
services.AddSwaggerGen(c =>
22+
services.AddSwaggerGen(c =>
23+
{
24+
c.SwaggerDoc("v1", new OpenApiInfo
2825
{
29-
c.SwaggerDoc("v1", new OpenApiInfo
30-
{
31-
Version = "v1",
32-
Title = "Payload View API",
33-
});
26+
Version = "v1",
27+
Title = "Payload View API",
3428
});
35-
}
29+
});
30+
}
3631

37-
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
32+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
33+
{
34+
if (env.IsDevelopment())
3835
{
39-
if (env.IsDevelopment())
40-
{
41-
app.UseDeveloperExceptionPage();
42-
}
43-
else
44-
{
45-
app.UseHsts();
46-
}
36+
app.UseDeveloperExceptionPage();
37+
}
38+
else
39+
{
40+
app.UseHsts();
41+
}
4742

48-
app.UseStaticFiles();
49-
app.UseHttpsRedirection();
43+
app.UseStaticFiles();
44+
app.UseHttpsRedirection();
5045

51-
app.UseRouting();
46+
app.UseRouting();
5247

53-
app.UseAuthorization();
54-
app.UseCors();
48+
app.UseAuthorization();
49+
app.UseCors();
5550

56-
app.UseEndpoints(endpoints =>
57-
{
58-
endpoints.MapControllers();
59-
});
51+
app.UseEndpoints(endpoints =>
52+
{
53+
endpoints.MapControllers();
54+
});
6055

61-
app.UseSwagger();
62-
app.UseSwaggerUI(c =>
63-
{
64-
c.SwaggerEndpoint("/swagger/v1/swagger.json", "Payload Management API V1");
65-
});
66-
}
56+
app.UseSwagger();
57+
app.UseSwaggerUI(c =>
58+
{
59+
c.SwaggerEndpoint("/swagger/v1/swagger.json", "Payload Management API V1");
60+
});
6761
}
6862
}

‎AspNetCoreServiceBusApi2/Migrations/20190425163555_init_db.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using Microsoft.EntityFrameworkCore.Migrations;
1+
using Microsoft.EntityFrameworkCore.Migrations;
32

43
namespace AspNetCoreServiceBusApi2.Migrations
54
{

‎AspNetCoreServiceBusApi2/ProcessData.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public ProcessData(IConfiguration configuration)
1515
public async Task Process(MyPayload myPayload)
1616
{
1717
var connection = _configuration.GetConnectionString("DefaultConnection");
18-
if(connection == null) throw new ArgumentNullException(nameof(connection));
18+
if (connection == null) throw new ArgumentNullException(nameof(connection));
1919

2020
using var payloadMessageContext = new PayloadMessageContext(connection);
2121
await payloadMessageContext.AddAsync(new Payload

‎FunctionService3/SubscriptionClientFunction.cs‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
using Microsoft.Extensions.Logging;
33
using Newtonsoft.Json;
44

5-
namespace FunctionService3
5+
namespace FunctionService3;
6+
7+
public static class SubscriptionClientFunction
68
{
7-
public static class SubscriptionClientFunction
9+
[FunctionName("SubscriptionClientFunction")]
10+
public static void Run([ServiceBusTrigger(
11+
"mytopic",
12+
"functionsubscription",
13+
Connection = "ServiceBusConnectionString")]string message, ILogger log)
814
{
9-
[FunctionName("SubscriptionClientFunction")]
10-
public static void Run([ServiceBusTrigger(
11-
"mytopic",
12-
"functionsubscription",
13-
Connection = "ServiceBusConnectionString")]string message, ILogger log)
14-
{
15-
log.LogInformation($"C# ServiceBus topic trigger function processed message: {message}");
15+
log.LogInformation($"C# ServiceBus topic trigger function processed message: {message}");
1616

17-
var payload = JsonConvert.DeserializeObject<MyPayload>(message);
18-
}
17+
var payload = JsonConvert.DeserializeObject<MyPayload>(message);
1918
}
2019
}

0 commit comments

Comments
 (0)