Throw NullRef exception if no client

ThreeMammals · Oct 2, 2023 · ef754e1 · ef754e1
1 parent 679c4ff
commit ef754e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Ocelot.Provider.Eureka/Eureka.cs b/src/Ocelot.Provider.Eureka/Eureka.cs
@@ -5,13 +5,13 @@ namespace Ocelot.Provider.Eureka
 {
     public class Eureka : IServiceDiscoveryProvider
     {
-        private readonly IDiscoveryClient _client;
         private readonly string _serviceName;
+        private readonly IDiscoveryClient _client;
 
         public Eureka(string serviceName, IDiscoveryClient client)
         {
-            _client = client;
-            _serviceName = serviceName;
+            _serviceName = serviceName ?? throw new ArgumentNullException(nameof(serviceName));
+            _client = client ?? throw new ArgumentNullException(nameof(client));
         }
 
         public Task<List<Service>> GetAsync()

diff --git a/src/Ocelot.Provider.Eureka/EurekaProviderFactory.cs b/src/Ocelot.Provider.Eureka/EurekaProviderFactory.cs
@@ -16,8 +16,12 @@ public static class EurekaProviderFactory
     private static IServiceDiscoveryProvider CreateProvider(IServiceProvider provider, ServiceProviderConfiguration config, DownstreamRoute route)
     {
         var client = provider.GetService<IDiscoveryClient>();
+        if (client == null)
+        {
+            throw new NullReferenceException($"Cannot get an {nameof(IDiscoveryClient)} service during {nameof(CreateProvider)} operation to instanciate the {nameof(Eureka)} provider!");
+        }
 
-        return Eureka.Equals(config.Type, StringComparison.OrdinalIgnoreCase) && client != null
+        return Eureka.Equals(config.Type, StringComparison.OrdinalIgnoreCase)
             ? new Eureka(route.ServiceName, client)
             : null;
     }