Options rename

stulzq · stulzq · commit 10f68a6c004d · 2020-11-16T16:16:32.000+08:00
diff --git a/CanalSharp.sln b/CanalSharp.sln
@@ -25,7 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{D21B3144
 		build\version.props = build\version.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CanalSharp.SimpleApp", "sample\CanalSharp.SimpleApp\CanalSharp.SimpleApp.csproj", "{BDFF31D3-BA2D-4B67-A805-E864A79A04AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanalSharp.SimpleApp", "sample\CanalSharp.SimpleApp\CanalSharp.SimpleApp.csproj", "{BDFF31D3-BA2D-4B67-A805-E864A79A04AD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/sample/CanalSharp.SimpleApp/Program.cs b/sample/CanalSharp.SimpleApp/Program.cs
@@ -27,8 +27,7 @@ static async Task ClusterConn()
                     .AddConsole();
             });
             _logger = loggerFactory.CreateLogger<Program>();
-            var conn = new ClusterCanalConnection(
-                new ClusterCanalConnectionOptions("localhost:2181", "12350") { UserName = "canal", Password = "canal" },
+            var conn = new ClusterCanalConnection( new ClusterCanalOptions("localhost:2181", "12350") { UserName = "canal", Password = "canal" },
                 loggerFactory);
             await conn.ConnectAsync();
             await conn.SubscribeAsync();
@@ -59,7 +58,7 @@ static async Task SimpleConn()
                     .AddConsole();
             });
             _logger = loggerFactory.CreateLogger<Program>();
-            var conn = new SimpleCanalConnection(new SimpleCanalConnectionOptions("127.0.0.1", 11111, "12349") { UserName = "canal", Password = "canal" }, loggerFactory.CreateLogger<SimpleCanalConnection>());
+            var conn = new SimpleCanalConnection(new SimpleCanalOptions("127.0.0.1", 11111, "12349") { UserName = "canal", Password = "canal" }, loggerFactory.CreateLogger<SimpleCanalConnection>());
             await conn.ConnectAsync();
             await conn.SubscribeAsync();
             await conn.RollbackAsync(0);
diff --git a/src/CanalSharp/CanalSharp.csproj b/src/CanalSharp/CanalSharp.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <!-- <PackageReference Include="NZookeeper" Version="0.1.0" /> -->
+    <PackageReference Include="NZookeeper" Version="0.2.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -40,8 +40,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\NZookeeper\src\NZookeeper\NZookeeper.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/CanalSharp/Connections/CanalOptionsBase.cs b/src/CanalSharp/Connections/CanalOptionsBase.cs
@@ -1,6 +1,6 @@
 ﻿namespace CanalSharp.Connections
 {
-    public class CanalConnectionOptionsBase
+    public class CanalOptionsBase
     {
         /// <summary>
         /// Canal Destination(Optional, default value is 'example')
diff --git a/src/CanalSharp/Connections/HA/ClusterCanalConnection.cs b/src/CanalSharp/Connections/HA/ClusterCanalConnection.cs
@@ -16,7 +16,7 @@ namespace CanalSharp.Connections
     /// </summary>
     public class ClusterCanalConnection : ICanalConnection
     {
-        private readonly ClusterCanalConnectionOptions _options;
+        private readonly ClusterCanalOptions _options;
         private readonly ILoggerFactory _loggerFactory;
         private readonly ILogger<ClusterCanalConnection> _logger;
         // ReSharper disable once InconsistentNaming
@@ -28,7 +28,7 @@ public class ClusterCanalConnection : ICanalConnection
         private SimpleCanalConnection _currentConn;
         private ZkConnection _zk;
 
-        public ClusterCanalConnection([NotNull] ClusterCanalConnectionOptions options, ILoggerFactory loggerFactory)
+        public ClusterCanalConnection([NotNull] ClusterCanalOptions options, ILoggerFactory loggerFactory)
         {
             _options = options;
             _loggerFactory = loggerFactory;
@@ -202,10 +202,10 @@ public Task<Message> GetWithoutAckAsync(int fetchSize, long? timeout,
             return _currentConn.GetWithoutAckAsync(fetchSize, timeout);
         }
 
-        private SimpleCanalConnectionOptions CopyOptions(CanalRunningInfo runningInfo)
+        private SimpleCanalOptions CopyOptions(CanalRunningInfo runningInfo)
         {
             var tmpArr = runningInfo.Address.Split(":");
-            var op = new SimpleCanalConnectionOptions(tmpArr[0], int.Parse(tmpArr[1]), _options.ClientId)
+            var op = new SimpleCanalOptions(tmpArr[0], int.Parse(tmpArr[1]), _options.ClientId)
             {
                 Destination = _options.Destination,
                 IdleTimeout = _options.IdleTimeout,
diff --git a/src/CanalSharp/Connections/HA/ClusterCanalOptions.cs b/src/CanalSharp/Connections/HA/ClusterCanalOptions.cs
@@ -1,8 +1,8 @@
 ﻿namespace CanalSharp.Connections
 {
-    public class ClusterCanalConnectionOptions : CanalConnectionOptionsBase
+    public class ClusterCanalOptions : CanalOptionsBase
     {
-        public ClusterCanalConnectionOptions(string zkAddress, string clientId)
+        public ClusterCanalOptions(string zkAddress, string clientId)
         {
             ClientId = clientId;
             ZkAddress = zkAddress;
diff --git a/src/CanalSharp/Connections/Simple/SimpleCanalConnection.cs b/src/CanalSharp/Connections/Simple/SimpleCanalConnection.cs
@@ -17,13 +17,13 @@ namespace CanalSharp.Connections
     /// </summary>
     public class SimpleCanalConnection : ICanalConnection
     {
-        private readonly SimpleCanalConnectionOptions _options;
+        private readonly SimpleCanalOptions _options;
         private readonly ILogger _logger;
         private TcpClient _client;
 
         public ConnectionState State { get; internal set; }
 
-        public SimpleCanalConnection([NotNull] SimpleCanalConnectionOptions options, ILogger<SimpleCanalConnection> logger)
+        public SimpleCanalConnection([NotNull] SimpleCanalOptions options, ILogger<SimpleCanalConnection> logger)
         {
             Check.NotNull(options, nameof(options));
 
diff --git a/src/CanalSharp/Connections/Simple/SimpleCanalOptions.cs b/src/CanalSharp/Connections/Simple/SimpleCanalOptions.cs
@@ -1,8 +1,8 @@
 ﻿namespace CanalSharp.Connections
 {
-    public class SimpleCanalConnectionOptions: CanalConnectionOptionsBase
+    public class SimpleCanalOptions: CanalOptionsBase
     {
-        public SimpleCanalConnectionOptions(string host, int port, string clientId)
+        public SimpleCanalOptions(string host, int port, string clientId)
         {
             Host = host;
             Port = port;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace CanalSharp.Connections`
`2`	`2`	`{`
`3`		`- public class CanalConnectionOptionsBase`
	`3`	`+ public class CanalOptionsBase`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Canal Destination(Optional, default value is 'example')`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace CanalSharp.Connections`
`16`	`16`	`/// </summary>`
`17`	`17`	`public class ClusterCanalConnection : ICanalConnection`
`18`	`18`	`{`
`19`		`- private readonly ClusterCanalConnectionOptions _options;`
	`19`	`+ private readonly ClusterCanalOptions _options;`
`20`	`20`	`private readonly ILoggerFactory _loggerFactory;`
`21`	`21`	`private readonly ILogger<ClusterCanalConnection> _logger;`
`22`	`22`	`// ReSharper disable once InconsistentNaming`
`@@ -28,7 +28,7 @@ public class ClusterCanalConnection : ICanalConnection`
`28`	`28`	`private SimpleCanalConnection _currentConn;`
`29`	`29`	`private ZkConnection _zk;`
`30`	`30`
`31`		`- public ClusterCanalConnection([NotNull] ClusterCanalConnectionOptions options, ILoggerFactory loggerFactory)`
	`31`	`+ public ClusterCanalConnection([NotNull] ClusterCanalOptions options, ILoggerFactory loggerFactory)`
`32`	`32`	`{`
`33`	`33`	`_options = options;`
`34`	`34`	`_loggerFactory = loggerFactory;`
`@@ -202,10 +202,10 @@ public Task<Message> GetWithoutAckAsync(int fetchSize, long? timeout,`
`202`	`202`	`return _currentConn.GetWithoutAckAsync(fetchSize, timeout);`
`203`	`203`	`}`
`204`	`204`
`205`		`- private SimpleCanalConnectionOptions CopyOptions(CanalRunningInfo runningInfo)`
	`205`	`+ private SimpleCanalOptions CopyOptions(CanalRunningInfo runningInfo)`
`206`	`206`	`{`
`207`	`207`	`var tmpArr = runningInfo.Address.Split(":");`
`208`		`- var op = new SimpleCanalConnectionOptions(tmpArr[0], int.Parse(tmpArr[1]), _options.ClientId)`
	`208`	`+ var op = new SimpleCanalOptions(tmpArr[0], int.Parse(tmpArr[1]), _options.ClientId)`
`209`	`209`	`{`
`210`	`210`	`Destination = _options.Destination,`
`211`	`211`	`IdleTimeout = _options.IdleTimeout,`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`namespace CanalSharp.Connections`
`2`	`2`	`{`
`3`		`- public class ClusterCanalConnectionOptions : CanalConnectionOptionsBase`
	`3`	`+ public class ClusterCanalOptions : CanalOptionsBase`
`4`	`4`	`{`
`5`		`- public ClusterCanalConnectionOptions(string zkAddress, string clientId)`
	`5`	`+ public ClusterCanalOptions(string zkAddress, string clientId)`
`6`	`6`	`{`
`7`	`7`	`ClientId = clientId;`
`8`	`8`	`ZkAddress = zkAddress;`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,13 @@ namespace CanalSharp.Connections`
`17`	`17`	`/// </summary>`
`18`	`18`	`public class SimpleCanalConnection : ICanalConnection`
`19`	`19`	`{`
`20`		`- private readonly SimpleCanalConnectionOptions _options;`
	`20`	`+ private readonly SimpleCanalOptions _options;`
`21`	`21`	`private readonly ILogger _logger;`
`22`	`22`	`private TcpClient _client;`
`23`	`23`
`24`	`24`	`public ConnectionState State { get; internal set; }`
`25`	`25`
`26`		`- public SimpleCanalConnection([NotNull] SimpleCanalConnectionOptions options, ILogger<SimpleCanalConnection> logger)`
	`26`	`+ public SimpleCanalConnection([NotNull] SimpleCanalOptions options, ILogger<SimpleCanalConnection> logger)`
`27`	`27`	`{`
`28`	`28`	`Check.NotNull(options, nameof(options));`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`namespace CanalSharp.Connections`
`2`	`2`	`{`
`3`		`- public class SimpleCanalConnectionOptions: CanalConnectionOptionsBase`
	`3`	`+ public class SimpleCanalOptions: CanalOptionsBase`
`4`	`4`	`{`
`5`		`- public SimpleCanalConnectionOptions(string host, int port, string clientId)`
	`5`	`+ public SimpleCanalOptions(string host, int port, string clientId)`
`6`	`6`	`{`
`7`	`7`	`Host = host;`
`8`	`8`	`Port = port;`