From e9a5ac4f9ad4426c66cac8fdd894e51df1919d6f Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 26 Dec 2023 14:26:03 -0500 Subject: [PATCH] Warnings update --- .../ServiceProviders/UserBasketProvider.cs | 2 +- .../src/EShopOnAbp.BasketService/BasketServiceModule.cs | 6 +++--- .../basket/src/EShopOnAbp.BasketService/Entities/Basket.cs | 2 +- .../EShopOnAbp.BasketService/Entities/BasketRepository.cs | 2 +- .../Services/BasketProductService.cs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/ServiceProviders/UserBasketProvider.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/ServiceProviders/UserBasketProvider.cs index 41a1da88..2974dfb9 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/ServiceProviders/UserBasketProvider.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/ServiceProviders/UserBasketProvider.cs @@ -45,7 +45,7 @@ namespace EShopOnAbp.PublicWeb.ServiceProviders }); } - return anonymousUserId; + return await Task.FromResult(anonymousUserId); } } } \ No newline at end of file diff --git a/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs b/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs index 863e6b15..c1516769 100644 --- a/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs +++ b/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs @@ -35,7 +35,7 @@ public class BasketServiceModule : AbpModule { PreConfigure(options => { - options.ProxyClientBuildActions.Add((remoteServiceName, clientBuilder) => + options.ProxyClientBuildActions.Add((_, clientBuilder) => { clientBuilder.AddTransientHttpErrorPolicy(policyBuilder => policyBuilder.WaitAndRetryAsync( @@ -132,7 +132,7 @@ public class BasketServiceModule : AbpModule { builder .WithOrigins( - configuration["App:CorsOrigins"] + configuration["App:CorsOrigins"]! .Split(",", StringSplitOptions.RemoveEmptyEntries) .Select(o => o.Trim().RemovePostFix("/")) .ToArray() @@ -164,7 +164,7 @@ public class BasketServiceModule : AbpModule var catalogServiceConfiguration = remoteServiceOptions.RemoteServices.GetConfigurationOrDefault("Catalog"); var catalogGrpcUrl = catalogServiceConfiguration.GetOrDefault("GrpcUrl"); - options.Address = new Uri(catalogGrpcUrl); + if (catalogGrpcUrl != null) options.Address = new Uri(catalogGrpcUrl); }); } diff --git a/services/basket/src/EShopOnAbp.BasketService/Entities/Basket.cs b/services/basket/src/EShopOnAbp.BasketService/Entities/Basket.cs index efdf7e5d..d85585d9 100644 --- a/services/basket/src/EShopOnAbp.BasketService/Entities/Basket.cs +++ b/services/basket/src/EShopOnAbp.BasketService/Entities/Basket.cs @@ -4,7 +4,7 @@ namespace EShopOnAbp.BasketService.Entities; public class Basket : AggregateRoot { - public List Items { get; set; } + public List Items { get; set; } = new(); private Basket() { diff --git a/services/basket/src/EShopOnAbp.BasketService/Entities/BasketRepository.cs b/services/basket/src/EShopOnAbp.BasketService/Entities/BasketRepository.cs index 026a10f4..a9f69217 100644 --- a/services/basket/src/EShopOnAbp.BasketService/Entities/BasketRepository.cs +++ b/services/basket/src/EShopOnAbp.BasketService/Entities/BasketRepository.cs @@ -15,7 +15,7 @@ public class BasketRepository : IBasketRepository public async Task GetAsync(Guid id) { - return await _cache.GetOrAddAsync(id, () => Task.FromResult(new Basket(id))); + return (await _cache.GetOrAddAsync(id, () => Task.FromResult(new Basket(id))))!; } public async Task UpdateAsync(Basket basket) diff --git a/services/basket/src/EShopOnAbp.BasketService/Services/BasketProductService.cs b/services/basket/src/EShopOnAbp.BasketService/Services/BasketProductService.cs index b3a19472..18e04a9d 100644 --- a/services/basket/src/EShopOnAbp.BasketService/Services/BasketProductService.cs +++ b/services/basket/src/EShopOnAbp.BasketService/Services/BasketProductService.cs @@ -28,10 +28,10 @@ public class BasketProductService : IBasketProductService, ITransientDependency public async Task GetAsync(Guid productId) { - return await _cache.GetOrAddAsync( + return (await _cache.GetOrAddAsync( productId, () => GetProductAsync(productId) - ); + ))!; } private async Task GetProductAsync(Guid productId)