[refactor] remove unused project

farhadzm · farhadzm · commit dad6cfe85fa2 · 2021-10-15T16:43:00.000+03:30
diff --git a/RedisPubSub.Common/RedisPubSub.Common.csproj b/RedisPubSub.Common/RedisPubSub.Common.csproj
diff --git a/RedisPubSub.Publisher/Program.cs b/RedisPubSub.Publisher/Program.cs
diff --git a/RedisPubSub.Subscriber/Properties/launchSettings.json b/RedisPubSub.Subscriber/Properties/launchSettings.json
diff --git a/RedisPubSub.Subscriber/RedisPubSub.Subscriber.csproj b/RedisPubSub.Subscriber/RedisPubSub.Subscriber.csproj
diff --git a/RedisPubSub.Subscriber/RedisPubSub.Subscriber.csproj.user b/RedisPubSub.Subscriber/RedisPubSub.Subscriber.csproj.user
diff --git a/RedisPubSub.Subscriber/Startup.cs b/RedisPubSub.Subscriber/Startup.cs
diff --git a/RedisPubSub.sln b/RedisPubSub.sln
@@ -3,11 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedisPubSub.Publisher", "RedisPubSub.Publisher\RedisPubSub.Publisher.csproj", "{E57A9EF8-879B-4746-9E13-6E787A46F956}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisPubSub.Common", "RedisPubSub.Common\RedisPubSub.Common.csproj", "{250CBFDA-5B47-4E35-A742-BA3E6A2A2C3A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisPubSub.Subscriber", "RedisPubSub.Subscriber\RedisPubSub.Subscriber.csproj", "{11642D18-4B01-41AE-9D04-A411762EB12B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedisPubSub", "RedisPubSub\RedisPubSub.csproj", "{E57A9EF8-879B-4746-9E13-6E787A46F956}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,14 +15,6 @@ Global
 		{E57A9EF8-879B-4746-9E13-6E787A46F956}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E57A9EF8-879B-4746-9E13-6E787A46F956}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E57A9EF8-879B-4746-9E13-6E787A46F956}.Release|Any CPU.Build.0 = Release|Any CPU
-		{250CBFDA-5B47-4E35-A742-BA3E6A2A2C3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{250CBFDA-5B47-4E35-A742-BA3E6A2A2C3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{250CBFDA-5B47-4E35-A742-BA3E6A2A2C3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{250CBFDA-5B47-4E35-A742-BA3E6A2A2C3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11642D18-4B01-41AE-9D04-A411762EB12B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11642D18-4B01-41AE-9D04-A411762EB12B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11642D18-4B01-41AE-9D04-A411762EB12B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11642D18-4B01-41AE-9D04-A411762EB12B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/RedisPubSub/Constants/RedisChannelConstant.cs b/RedisPubSub/Constants/RedisChannelConstant.cs
@@ -1,8 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Linq;
+using System.Threading.Tasks;
 
-namespace RedisPubSub.Common.Constants
+namespace RedisPubSub.Constants
 {
     public static class RedisChannelConstant
     {
diff --git a/RedisPubSub/Controllers/PublisherController.cs b/RedisPubSub/Controllers/PublisherController.cs
@@ -1,12 +1,12 @@
 ﻿using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using RedisPubSub.Publisher.Services;
+using RedisPubSub.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace RedisPubSub.Publisher.Controllers
+namespace RedisPubSub.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
diff --git a/RedisPubSub/Extensions/StartupExtension.cs b/RedisPubSub/Extensions/StartupExtension.cs
@@ -1,10 +1,9 @@
 ﻿using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using StackExchange.Redis;
-
-namespace RedisPubSub.Common.Extensions
+namespace RedisPubSub.Extensions
 {
-  public static  class StartupExtension
+    public static class StartupExtension
     {
         public static void RegisterMultiplexer(this IServiceCollection services, IConfiguration configuration)
         {
diff --git a/RedisPubSub/HostedServices/RedisSubscriberHostedService.cs b/RedisPubSub/HostedServices/RedisSubscriberHostedService.cs
@@ -1,14 +1,13 @@
 ﻿using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using RedisPubSub.Common.Constants;
-using RedisPubSub.Common.Models;
+using RedisPubSub.Constants;
+using RedisPubSub.Models;
 using StackExchange.Redis;
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace RedisPubSub.Subscriber.HostedServices
+namespace RedisPubSub.HostedServices
 {
     public class RedisSubscriberHostedService : BackgroundService
     {
@@ -25,12 +24,12 @@ public RedisSubscriberHostedService(IConnectionMultiplexer connectionMultiplexer
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
             await _subscriber.SubscribeAsync(RedisChannelConstant.MemoryCache, (a, updatedData) =>
-             {
-                 var data = System.Text.Json.JsonSerializer.Deserialize<MemoryCacheDataDto>(updatedData);
-                 _memoryCache.Remove(data.CacheKey);
-                 _memoryCache.Set(data.CacheKey, data.Data);
-                 _logger.LogInformation($"MemoryCache update. Key:{data.CacheKey}");
-             });
+            {
+                var data = System.Text.Json.JsonSerializer.Deserialize<MemoryCacheDataDto>(updatedData);
+                _memoryCache.Remove(data.CacheKey);
+                _memoryCache.Set(data.CacheKey, data.Data);
+                _logger.LogInformation($"MemoryCache update. Key:{data.CacheKey}");
+            });
         }
         public override async Task StopAsync(CancellationToken cancellationToken)
         {
diff --git a/RedisPubSub/Models/MemoryCacheDataDto.cs b/RedisPubSub/Models/MemoryCacheDataDto.cs
@@ -1,8 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Linq;
+using System.Threading.Tasks;
 
-namespace RedisPubSub.Common.Models
+namespace RedisPubSub.Models
 {
     public class MemoryCacheDataDto
     {
diff --git a/RedisPubSub/Program.cs b/RedisPubSub/Program.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace RedisPubSub.Subscriber
+namespace RedisPubSub
 {
     public class Program
     {
@@ -21,6 +21,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
+                    webBuilder.UseUrls(args);
                 });
     }
 }
diff --git a/RedisPubSub/Properties/launchSettings.json b/RedisPubSub/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "RedisPubSub.Publisher": {
+    "RedisPubSub": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
diff --git a/RedisPubSub/RedisPubSub.csproj b/RedisPubSub/RedisPubSub.csproj
@@ -3,9 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\RedisPubSub.Common\RedisPubSub.Common.csproj" />
+    <PackageReference Include="EasyCaching.Redis" Version="1.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/RedisPubSub/RedisPubSub.csproj.user b/RedisPubSub/RedisPubSub.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath>
-    <ActiveDebugProfile>RedisPubSub.Publisher</ActiveDebugProfile>
+    <ActiveDebugProfile>RedisPubSub</ActiveDebugProfile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
diff --git a/RedisPubSub/Services/RedisPublisher.cs b/RedisPubSub/Services/RedisPublisher.cs
@@ -1,9 +1,9 @@
-﻿using RedisPubSub.Common.Constants;
-using RedisPubSub.Common.Models;
+﻿using RedisPubSub.Constants;
+using RedisPubSub.Models;
 using StackExchange.Redis;
 using System.Threading.Tasks;
 
-namespace RedisPubSub.Publisher.Services
+namespace RedisPubSub.Services
 {
     public interface IRedisPublisher
     {
diff --git a/RedisPubSub/Startup.cs b/RedisPubSub/Startup.cs
@@ -3,16 +3,11 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using RedisPubSub.Common.Extensions;
-using RedisPubSub.Publisher.Services;
-using StackExchange.Redis;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using RedisPubSub.Extensions;
+using RedisPubSub.HostedServices;
+using RedisPubSub.Services;
 
-namespace RedisPubSub.Publisher
+namespace RedisPubSub
 {
     public class Startup
     {
@@ -27,6 +22,8 @@ public void ConfigureServices(IServiceCollection services)
             services.RegisterMultiplexer(Configuration);
             services.AddSingleton<IRedisPublisher, RedisPublisher>();
             services.AddControllers();
+            services.AddMemoryCache();
+            services.AddHostedService<RedisSubscriberHostedService>();
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using System.Text;`
	`3`	`+using System.Linq;`
	`4`	`+using System.Threading.Tasks;`
`4`	`5`
`5`		`-namespace RedisPubSub.Common.Constants`
	`6`	`+namespace RedisPubSub.Constants`
`6`	`7`	`{`
`7`	`8`	`public static class RedisChannelConstant`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`using Microsoft.Extensions.Configuration;`
`2`	`2`	`using Microsoft.Extensions.DependencyInjection;`
`3`	`3`	`using StackExchange.Redis;`
`4`		`-`
`5`		`-namespace RedisPubSub.Common.Extensions`
	`4`	`+namespace RedisPubSub.Extensions`
`6`	`5`	`{`
`7`		`- public static class StartupExtension`
	`6`	`+ public static class StartupExtension`
`8`	`7`	`{`
`9`	`8`	`public static void RegisterMultiplexer(this IServiceCollection services, IConfiguration configuration)`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System.Linq;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`
`10`		`-namespace RedisPubSub.Subscriber`
	`10`	`+namespace RedisPubSub`
`11`	`11`	`{`
`12`	`12`	`public class Program`
`13`	`13`	`{`
`@@ -21,6 +21,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>`
`21`	`21`	`.ConfigureWebHostDefaults(webBuilder =>`
`22`	`22`	`{`
`23`	`23`	`webBuilder.UseStartup<Startup>();`
	`24`	`+ webBuilder.UseUrls(args);`
`24`	`25`	`});`
`25`	`26`	`}`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"ASPNETCORE_ENVIRONMENT": "Development"`
`16`	`16`	`}`
`17`	`17`	`},`
`18`		`- "RedisPubSub.Publisher": {`
	`18`	`+ "RedisPubSub": {`
`19`	`19`	`"commandName": "Project",`
`20`	`20`	`"launchBrowser": true,`
`21`	`21`	`"environmentVariables": {`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-using RedisPubSub.Common.Constants;`
`2`		`-using RedisPubSub.Common.Models;`
	`1`	`+using RedisPubSub.Constants;`
	`2`	`+using RedisPubSub.Models;`
`3`	`3`	`using StackExchange.Redis;`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`
`6`		`-namespace RedisPubSub.Publisher.Services`
	`6`	`+namespace RedisPubSub.Services`
`7`	`7`	`{`
`8`	`8`	`public interface IRedisPublisher`
`9`	`9`	`{`