Cleanup code

Author: KrzysFR

FoundationDB.Client/Fdb.Errors.cs

@@ -51,7 +51,7 @@ internal static Exception KeyCannotBeNull(string paramName = "key")
 
 			internal static Exception KeyIsTooBig(Slice key, string paramName = "key")
 			{
-				return new ArgumentException(String.Format("Key is too big ({0} > {1}).", key.Count, Fdb.MaxKeySize), paramName);
+				return new ArgumentException($"Key is too big ({key.Count} > {Fdb.MaxKeySize}).", paramName);
 			}
 
 			internal static Exception ValueCannotBeNull(Slice value, string paramName = "value")
@@ -61,7 +61,7 @@ internal static Exception ValueCannotBeNull(Slice value, string paramName = "val
 
 			internal static Exception ValueIsTooBig(Slice value, string paramName = "value")
 			{
-				return new ArgumentException(String.Format("Value is too big ({0} > {1}).", value.Count, Fdb.MaxValueSize), paramName);
+				return new ArgumentException($"Value is too big ({value.Count} > {Fdb.MaxValueSize}).", paramName);
 			}
 
 			internal static Exception InvalidKeyOutsideDatabaseNamespace(IFdbDatabase db, Slice key)
@@ -70,9 +70,9 @@ internal static Exception InvalidKeyOutsideDatabaseNamespace(IFdbDatabase db, Sl
 				return new FdbException(
 					FdbError.KeyOutsideLegalRange,
 #if DEBUG
-					String.Format("An attempt was made to use a key '{2}' that is outside of the global namespace {0} of database '{1}'", db.GlobalSpace, db.Name, FdbKey.Dump(key))
+					$"An attempt was made to use a key '{FdbKey.Dump(key)}' that is outside of the global namespace {db.GlobalSpace} of database '{db.Name}'"
 #else
-					String.Format("An attempt was made to use a key that is outside of the global namespace {0} of database '{1}'", db.GlobalSpace, db.Name)
+					$"An attempt was made to use a key that is outside of the global namespace {db.GlobalSpace} of database '{db.Name}'"
 #endif
 				);
 			}
@@ -82,7 +82,7 @@ internal static Exception InvalidKeyOutsideDatabaseNamespace(IFdbDatabase db, Sl
 			internal static Exception FailedToRegisterTransactionOnDatabase(IFdbTransaction transaction, FdbDatabase db)
 			{
 				Contract.Requires(transaction != null && db != null);
-				return new InvalidOperationException(String.Format("Failed to register transaction #{0} with this instance of database {1}", transaction.Id, db.Name));
+				return new InvalidOperationException($"Failed to register transaction #{transaction.Id} with this instance of database {db.Name}");
 			}
 
 			internal static Exception CannotIncrementKey()

FoundationDB.Client/Fdb.Options.cs

@@ -72,7 +72,7 @@ public static void EnableNativeLibraryPreloading()
 			/// </remarks>
 			public static void SetNativeLibPath(string path)
 			{
-				if (path == null) throw new ArgumentNullException("path");
+				if (path == null) throw new ArgumentNullException(nameof(path));
 
 				//TODO: throw if native library has already been loaded
 				Fdb.Options.NativeLibPath = path;

FoundationDB.Client/Fdb.System.cs

@@ -34,7 +34,6 @@ namespace FoundationDB.Client
 	using System.Collections.Generic;
 	using System.Threading;
 	using System.Threading.Tasks;
-	using Doxense.Collections.Tuples;
 	using Doxense.Diagnostics.Contracts;
 	using FoundationDB.Client.Status;
 	using FoundationDB.Client.Utils;
@@ -348,7 +347,7 @@ private static async Task<List<Slice>> GetBoundaryKeysInternalAsync([NotNull] IF
 							{
 								results.Add(kvp.Key.Substring(KeyServers.Count));
 							}
-							begin = chunk.Last.Key.Substring(KeyServers.Count) + (byte)0;
+							begin = chunk.Last.Key.Substring(KeyServers.Count) + 0;
 						}
 						if (!chunk.HasMore)
 						{

FoundationDB.Client/Fdb.cs

@@ -30,16 +30,15 @@ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
 
 namespace FoundationDB.Client
 {
-	using FoundationDB.Client.Native;
-	using FoundationDB.Client.Utils;
-	using JetBrains.Annotations;
 	using System;
 	using System.Diagnostics;
 	using System.Runtime.CompilerServices;
 	using System.Runtime.ExceptionServices;
 	using System.Threading;
 	using System.Threading.Tasks;
 	using SystemIO = System.IO;
+	using FoundationDB.Client.Native;
+	using JetBrains.Annotations;
 
 	/// <summary>FoundationDB binding</summary>
 	[PublicAPI]
@@ -115,10 +114,7 @@ public static int GetMaxSafeApiVersion()
 
 		/// <summary>Returns the currently selected API version.</summary>
 		/// <remarks>Unless explicitely selected by calling <see cref="UseApiVersion"/> before, the default API version level will be returned</remarks>
-		public static int ApiVersion
-		{
-			get { return s_apiVersion; }
-		}
+		public static int ApiVersion => s_apiVersion;
 
 		/// <summary>Sets the desired API version of the binding.
 		/// The selected version level may affect the availability and behavior or certain features.
@@ -138,14 +134,14 @@ public static void UseApiVersion(int value)
 				value = DefaultApiVersion;
 			}
 			if (s_apiVersion == value) return; //Alreay set to same version... skip it.
-			if (s_started) throw new InvalidOperationException(string.Format("You cannot set API version {0} because version {1} has already been selected", value, s_apiVersion));
+			if (s_started) throw new InvalidOperationException($"You cannot set API version {value} because version {Fdb.s_apiVersion} has already been selected");
 
 			//note: we don't actually select the version yet, only when Start() is called.
 
 			int min = GetMinApiVersion();
-			if (value < min) throw new ArgumentException(String.Format("The minimum API version supported by this binding is {0} and the default version is {1}.", min, DefaultApiVersion));
+			if (value < min) throw new ArgumentException($"The minimum API version supported by this binding is {min} and the default version is {Fdb.DefaultApiVersion}.");
 			int max = GetMaxApiVersion();
-			if (value > max) throw new ArgumentException(String.Format("The maximum API version supported by this binding is {0} and the default version is {1}.", max, DefaultApiVersion));
+			if (value > max) throw new ArgumentException($"The maximum API version supported by this binding is {max} and the default version is {Fdb.DefaultApiVersion}.");
 
 			s_apiVersion = value;
 		}
@@ -182,7 +178,7 @@ public static Exception MapToException(FdbError code)
 			if (code == FdbError.Success) return null;
 
 			string msg = GetErrorMessage(code);
-			if (msg == null) throw new FdbException(code, String.Format("Unexpected error code {0}", (int)code));
+			if (msg == null) throw new FdbException(code, $"Unexpected error code {(int) code}");
 
 			//TODO: create a custom FdbException to be able to store the error code and error message
 			switch(code)
@@ -252,7 +248,7 @@ private static void StopEventLoop()
 				var err = FdbNative.StopNetwork();
 				if (err != FdbError.Success)
 				{
-					if (Logging.On) Logging.Warning(typeof(Fdb), "StopEventLoop", String.Format("Failed to stop event loop: {0}", err.ToString()));
+					if (Logging.On) Logging.Warning(typeof(Fdb), "StopEventLoop", $"Failed to stop event loop: {err.ToString()}");
 				}
 				s_eventLoopStarted = false;
 
@@ -276,7 +272,7 @@ private static void StopEventLoop()
 
 						if (thread.IsAlive)
 						{
-							if (Logging.On) Logging.Warning(typeof(Fdb), "StopEventLoop", String.Format("The fdb network thread has not stopped after {0} seconds. Forcing shutdown...", duration.Elapsed.TotalSeconds.ToString("N0")));
+							if (Logging.On) Logging.Warning(typeof(Fdb), "StopEventLoop", $"The fdb network thread has not stopped after {duration.Elapsed.TotalSeconds:N0} seconds. Forcing shutdown...");
 
 							// Force a shutdown
 							thread.Abort();
@@ -287,7 +283,7 @@ private static void StopEventLoop()
 
 							if (!stopped)
 							{
-								if (Logging.On) Logging.Warning(typeof(Fdb), "StopEventLoop", String.Format("The fdb network thread failed to stop after more than {0} seconds. Transaction integrity may not be guaranteed.", duration.Elapsed.TotalSeconds.ToString("N0")));
+								if (Logging.On) Logging.Warning(typeof(Fdb), "StopEventLoop", $"The fdb network thread failed to stop after more than {duration.Elapsed.TotalSeconds:N0} seconds. Transaction integrity may not be guaranteed.");
 							}
 						}
 					}
@@ -301,7 +297,7 @@ private static void StopEventLoop()
 						duration.Stop();
 						if (duration.Elapsed.TotalSeconds >= 20)
 						{
-							if (Logging.On) Logging.Warning(typeof(Fdb), "StopEventLoop", String.Format("The fdb network thread took a long time to stop ({0} seconds).", duration.Elapsed.TotalSeconds.ToString("N0")));
+							if (Logging.On) Logging.Warning(typeof(Fdb), "StopEventLoop", $"The fdb network thread took a long time to stop ({duration.Elapsed.TotalSeconds:N0} seconds).");
 						}
 					}
 				}
@@ -321,18 +317,18 @@ private static void EventLoop()
 
 				s_eventLoopThreadId = Thread.CurrentThread.ManagedThreadId;
 
-				if (Logging.On) Logging.Verbose(typeof(Fdb), "EventLoop", String.Format("FDB Event Loop running on thread #{0}...", s_eventLoopThreadId.Value));
+				if (Logging.On) Logging.Verbose(typeof(Fdb), "EventLoop", $"FDB Event Loop running on thread #{Fdb.s_eventLoopThreadId.Value}...");
 
 				var err = FdbNative.RunNetwork();
 				if (err != FdbError.Success)
 				{
 					if (s_eventLoopStopRequested || Environment.HasShutdownStarted)
 					{ // this was requested, or can be explained by the computer shutting down...
-						if (Logging.On) Logging.Info(typeof(Fdb), "EventLoop", String.Format("The fdb network thread returned with error code {0}: {1}", err, GetErrorMessage(err)));
+						if (Logging.On) Logging.Info(typeof(Fdb), "EventLoop", $"The fdb network thread returned with error code {err}: {GetErrorMessage(err)}");
 					}
 					else
 					{ // this was NOT expected !
-						if (Logging.On) Logging.Error(typeof(Fdb), "EventLoop", String.Format("The fdb network thread returned with error code {0}: {1}", err, GetErrorMessage(err)));
+						if (Logging.On) Logging.Error(typeof(Fdb), "EventLoop", $"The fdb network thread returned with error code {err}: {GetErrorMessage(err)}");
 #if DEBUG
 						Console.Error.WriteLine("THE FDB NETWORK EVENT LOOP HAS FAILED!");
 						Console.Error.WriteLine("=> " + err);
@@ -394,10 +390,7 @@ private static void EventLoop()
 		}
 
 		/// <summary>Returns true if the Network thread start is executing, otherwise falsse</summary>
-		public static bool IsNetworkRunning
-		{
-			get { return s_eventLoopRunning; }
-		}
+		public static bool IsNetworkRunning => s_eventLoopRunning;
 
 		/// <summary>Returns 'true' if we are currently running on the Event Loop thread</summary>
 		internal static bool IsNetworkThread
@@ -563,8 +556,8 @@ internal static async Task<FdbDatabase> OpenInternalAsync(string clusterFile, st
 				if (!success)
 				{
 					// cleanup the cluter if something went wrong
-					if (db != null) db.Dispose();
-					if (cluster != null) cluster.Dispose();
+					db?.Dispose();
+					cluster?.Dispose();
 				}
 			}
 		}
@@ -597,19 +590,19 @@ public static void Start()
 			int apiVersion = s_apiVersion;
 			if (apiVersion <= 0) apiVersion = DefaultApiVersion;
 
-			if (Logging.On) Logging.Info(typeof(Fdb), "Start", String.Format("Selecting fdb API version {0}", apiVersion));
+			if (Logging.On) Logging.Info(typeof(Fdb), "Start", $"Selecting fdb API version {apiVersion}");
 
 			FdbError err = FdbNative.SelectApiVersion(apiVersion);
 			if (err != FdbError.Success)
 			{
-				if (Logging.On) Logging.Error(typeof(Fdb), "Start", String.Format("Failed to fdb API version {0}: {1}", apiVersion, err));
+				if (Logging.On) Logging.Error(typeof(Fdb), "Start", $"Failed to fdb API version {apiVersion}: {err}");
 
 				switch (err)
 				{
 					case FdbError.ApiVersionNotSupported:
 					{ // bad version was selected ?
 						// note: we already bound check the values before, so that means that fdb_c.dll is either an older version or an incompatible new version.
-						throw new FdbException(err, String.Format("The API version {0} is not supported by the FoundationDB client library (fdb_c.dll) installed on this system. The binding only supports versions {1} to {2}. You either need to upgrade the .NET binding or the FoundationDB client library to a newer version.", apiVersion, GetMinApiVersion(), GetMaxApiVersion()));
+						throw new FdbException(err, $"The API version {apiVersion} is not supported by the FoundationDB client library (fdb_c.dll) installed on this system. The binding only supports versions {GetMinApiVersion()} to {GetMaxApiVersion()}. You either need to upgrade the .NET binding or the FoundationDB client library to a newer version.");
 					}
 #if DEBUG
 					case FdbError.ApiVersionAlreadySet:
@@ -626,7 +619,7 @@ public static void Start()
 
 			if (!string.IsNullOrWhiteSpace(Fdb.Options.TracePath))
 			{
-				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", String.Format("Will trace client activity in '{0}'", Fdb.Options.TracePath));
+				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", $"Will trace client activity in '{Fdb.Options.TracePath}'");
 				// create trace directory if missing...
 				if (!SystemIO.Directory.Exists(Fdb.Options.TracePath)) SystemIO.Directory.CreateDirectory(Fdb.Options.TracePath);
 
@@ -635,40 +628,40 @@ public static void Start()
 
 			if (!string.IsNullOrWhiteSpace(Fdb.Options.TLSPlugin))
 			{
-				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", String.Format("Will use custom TLS plugin '{0}'", Fdb.Options.TLSPlugin));
+				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", $"Will use custom TLS plugin '{Fdb.Options.TLSPlugin}'");
 
 				DieOnError(SetNetworkOption(FdbNetworkOption.TLSPlugin, Fdb.Options.TLSPlugin));
 			}
 
 			if (Fdb.Options.TLSCertificateBytes.IsPresent)
 			{
-				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", String.Format("Will load TLS root certificate and private key from memory ({0} bytes)", Fdb.Options.TLSCertificateBytes.Count));
+				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", $"Will load TLS root certificate and private key from memory ({Fdb.Options.TLSCertificateBytes.Count} bytes)");
 
 				DieOnError(SetNetworkOption(FdbNetworkOption.TLSCertBytes, Fdb.Options.TLSCertificateBytes));
 			}
 			else if (!string.IsNullOrWhiteSpace(Fdb.Options.TLSCertificatePath))
 			{
-				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", String.Format("Will load TLS root certificate and private key from '{0}'", Fdb.Options.TLSCertificatePath));
+				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", $"Will load TLS root certificate and private key from '{Fdb.Options.TLSCertificatePath}'");
 
 				DieOnError(SetNetworkOption(FdbNetworkOption.TLSCertPath, Fdb.Options.TLSCertificatePath));
 			}
 
 			if (Fdb.Options.TLSPrivateKeyBytes.IsPresent)
 			{
-				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", String.Format("Will load TLS private key from memory ({0} bytes)", Fdb.Options.TLSPrivateKeyBytes.Count));
+				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", $"Will load TLS private key from memory ({Fdb.Options.TLSPrivateKeyBytes.Count} bytes)");
 
 				DieOnError(SetNetworkOption(FdbNetworkOption.TLSKeyBytes, Fdb.Options.TLSPrivateKeyBytes));
 			}
 			else if (!string.IsNullOrWhiteSpace(Fdb.Options.TLSPrivateKeyPath))
 			{
-				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", String.Format("Will load TLS private key from '{0}'", Fdb.Options.TLSPrivateKeyPath));
+				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", $"Will load TLS private key from '{Fdb.Options.TLSPrivateKeyPath}'");
 
 				DieOnError(SetNetworkOption(FdbNetworkOption.TLSKeyPath, Fdb.Options.TLSPrivateKeyPath));
 			}
 
 			if (Fdb.Options.TLSVerificationPattern.IsPresent)
 			{
-				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", String.Format("Will verify TLS peers with pattern '{0}'", Fdb.Options.TLSVerificationPattern));
+				if (Logging.On) Logging.Verbose(typeof(Fdb), "Start", $"Will verify TLS peers with pattern '{Fdb.Options.TLSVerificationPattern}'");
 
 				DieOnError(SetNetworkOption(FdbNetworkOption.TLSVerifyPeers, Fdb.Options.TLSVerificationPattern));
 			}