chore: Modify obsolete wording and bad code smell

Author: zhenlei520

src/Contrib/StackSdks/Masa.Contrib.StackSdks.Tsc.Elasticsearch/Extenistions/ServiceExtenistion.cs

@@ -90,12 +90,12 @@ private static IServiceCollection AddElasticsearch(IServiceCollection services,
              });
     }
 
-    internal static IElasticClient CreateElasticClient(this IElasticsearchFactory elasticsearchFactory, bool isLog)
+    internal static IElasticClient CreateElasticClient(this IElasticClientFactory elasticsearchFactory, bool isLog)
     {
         if (isLog)
-            return elasticsearchFactory.CreateElasticClient(ElasticConstant.Log.IsIndependent ? ElasticConstant.LOG_CALLER_CLIENT_NAME : ElasticConstant.DEFAULT_CALLER_CLIENT_NAME);
+            return elasticsearchFactory.Create(ElasticConstant.Log.IsIndependent ? ElasticConstant.LOG_CALLER_CLIENT_NAME : ElasticConstant.DEFAULT_CALLER_CLIENT_NAME);
         else
-            return elasticsearchFactory.CreateElasticClient(ElasticConstant.Trace.IsIndependent ? ElasticConstant.TRACE_CALLER_CLIENT_NAME : ElasticConstant.DEFAULT_CALLER_CLIENT_NAME);
+            return elasticsearchFactory.Create(ElasticConstant.Trace.IsIndependent ? ElasticConstant.TRACE_CALLER_CLIENT_NAME : ElasticConstant.DEFAULT_CALLER_CLIENT_NAME);
     }
 
     internal static ICaller Create(this ICallerFactory callerFactory, bool isLog)

src/Contrib/StackSdks/Masa.Contrib.StackSdks.Tsc.Elasticsearch/LogService.cs

@@ -8,9 +8,9 @@ internal class LogService : ILogService
     private readonly IElasticClient _client;
     private readonly ICallerFactory _callerFactory;
 
-    public LogService(IElasticsearchFactory elasticsearchFactory, ICallerFactory callerFactory)
+    public LogService(IElasticClientFactory elasticClientFactory, ICallerFactory callerFactory)
     {
-        _client = elasticsearchFactory.CreateElasticClient(true);
+        _client = elasticClientFactory.CreateElasticClient(true);
         _callerFactory = callerFactory;
     }
 

src/Contrib/StackSdks/Masa.Contrib.StackSdks.Tsc.Elasticsearch/TraceService.cs

@@ -7,9 +7,9 @@ internal class TraceService : ITraceService
 {
     private readonly IElasticClient _client;
 
-    public TraceService(IElasticsearchFactory elasticsearchFactory)
+    public TraceService(IElasticClientFactory elasticClientFactory)
     {
-        _client = elasticsearchFactory.CreateElasticClient(false);
+        _client = elasticClientFactory.CreateElasticClient(false);
     }
 
     public async Task<object> AggregateAsync(SimpleAggregateRequestDto query)

src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Tsc.Elasticsearch.Tests/Extensions/ServiceExtenistionTests.cs

@@ -3,6 +3,7 @@
 
 namespace Masa.Contrib.StackSdks.Tsc.Elasticsearch.Tests.Extensions;
 
+#pragma warning disable CS0618
 [TestClass]
 public class ServiceExtenistionTests
 {
@@ -23,6 +24,7 @@ public void AddLogNodesTest()
 
         var factory = services.BuildServiceProvider().GetRequiredService<IElasticsearchFactory>();
         Assert.IsNotNull(factory);
+
         Assert.IsNotNull(factory.CreateElasticClient(ElasticConstant.LOG_CALLER_CLIENT_NAME));
         Assert.ThrowsException<NotSupportedException>(() => factory.CreateElasticClient(ElasticConstant.TRACE_CALLER_CLIENT_NAME));
         Assert.ThrowsException<NotSupportedException>(() => factory.CreateElasticClient(ElasticConstant.DEFAULT_CALLER_CLIENT_NAME));
@@ -133,3 +135,4 @@ public void AddLogTraceOptionsTest()
         Assert.IsNotNull(factory.CreateElasticClient(ElasticConstant.DEFAULT_CALLER_CLIENT_NAME));
     }
 }
+#pragma warning restore CS0618

src/Utils/Data/Masa.Utils.Data.Elasticsearch/DefaultElasticClientFactory.cs

@@ -21,7 +21,7 @@ public IElasticClient Create()
 
         if (elasticsearchOptions.Nodes is null) elasticsearchOptions = _elasticsearchOptions.Get(_names.FirstOrDefault());
 
-        if (elasticsearchOptions.Nodes is null) throw new Exception("The default ElasticClient is not found, please check if Elasticsearch is added");
+        if (elasticsearchOptions.Nodes is null) throw new ArgumentException("The default ElasticClient is not found, please check if Elasticsearch is added");
 
         return Create(elasticsearchOptions);
     }
@@ -43,15 +43,15 @@ private IElasticClient Create(ElasticsearchOptions elasticsearchOptions)
         return new ElasticClient(settings);
     }
 
-    private ConnectionSettings GetConnectionSettingsBySingleNode(ElasticsearchOptions relation)
+    private static ConnectionSettings GetConnectionSettingsBySingleNode(ElasticsearchOptions relation)
     {
         var connectionSetting = new ConnectionSettings(new Uri(relation.Nodes[0]))
             .EnableApiVersioningHeader();
         relation.Action?.Invoke(connectionSetting);
         return connectionSetting;
     }
 
-    private ConnectionSettings GetConnectionSettingsConnectionPool(ElasticsearchOptions relation)
+    private static ConnectionSettings GetConnectionSettingsConnectionPool(ElasticsearchOptions relation)
     {
         var pool = new StaticConnectionPool(
             relation.Nodes.Select(node => new Uri(node)),

src/Utils/Data/Masa.Utils.Data.Elasticsearch/Extensions/ServiceCollectionExtensions.cs

@@ -34,9 +34,9 @@ public static IServiceCollection AddElasticsearch(this IServiceCollection servic
     {
         ArgumentNullException.ThrowIfNull(name);
 
-        AddElasticsearchCore(services);
-
-        services.AddElasticsearchOptions(name, func.Invoke());
+        services
+            .AddElasticsearchCore()
+            .AddElasticsearchOptions(name, func.Invoke());
 
         return services;
     }

src/Utils/Data/Masa.Utils.Data.Elasticsearch/IElasticsearchFactory.cs

@@ -5,11 +5,15 @@ namespace Masa.Utils.Data.Elasticsearch;
 
 public interface IElasticsearchFactory
 {
+    [Obsolete("Please use IMasaElasticClientFactory.Create() instead")]
     IMasaElasticClient CreateClient();
 
+    [Obsolete("Please use IMasaElasticClientFactory.Create(name) instead")]
     IMasaElasticClient CreateClient(string name);
 
+    [Obsolete("Please use IElasticClientFactory.Create() instead")]
     IElasticClient CreateElasticClient();
 
+    [Obsolete("Please use IElasticClientFactory.Create(name) instead")]
     IElasticClient CreateElasticClient(string name);
 }