Remove underscore prefix from private variables. (#58)

Author: antao

BunqSdk.Tests/Context/ApiContextTest.cs

@@ -14,11 +14,11 @@ public class ApiContextTest : BunqSdkTestBase, IClassFixture<ApiContextTest>
         /// </summary>
         private const string ContextFilenameTest = "context-save-restore-test.conf";
 
-        private static ApiContext _apiContext;
+        private static ApiContext apiContext;
 
         public ApiContextTest()
         {
-            if (_apiContext == null) _apiContext = GetApiContext();
+            if (apiContext == null) apiContext = GetApiContext();
         }
 
         /// <summary>
@@ -27,7 +27,7 @@ public ApiContextTest()
         [Fact]
         public void TestApiContextSerializeDeserialize()
         {
-            var apiContextJson = _apiContext.ToJson();
+            var apiContextJson = apiContext.ToJson();
             var apiContextDeSerialised = ApiContext.FromJson(apiContextJson);
 
             Assert.Equal(apiContextJson, apiContextDeSerialised.ToJson());
@@ -39,8 +39,8 @@ public void TestApiContextSerializeDeserialize()
         [Fact]
         public void TestApiContextSaveRestore()
         {
-            var apiContextJson = _apiContext.ToJson();
-            _apiContext.Save(ContextFilenameTest);
+            var apiContextJson = apiContext.ToJson();
+            apiContext.Save(ContextFilenameTest);
             var apiContextRestored = ApiContext.Restore(ContextFilenameTest);
 
             Assert.Equal(apiContextJson, apiContextRestored.ToJson());

BunqSdk/Http/ApiClient.cs

@@ -79,21 +79,21 @@ public class ApiClient
         /// </summary>
         public const char DelimiterUriParams = '&';
 
-        private readonly HttpClient _client;
+        private readonly HttpClient client;
 
-        private readonly ApiContext _apiContext;
+        private readonly ApiContext apiContext;
 
         public ApiClient(ApiContext apiContext)
         {
-            this._apiContext = apiContext;
-            _client = CreateHttpClient();
+            this.apiContext = apiContext;
+            client = CreateHttpClient();
         }
 
         private HttpClient CreateHttpClient()
         {
             return new HttpClient(CreateHttpClientHandler())
             {
-                BaseAddress = new Uri(_apiContext.GetBaseUri())
+                BaseAddress = new Uri(apiContext.GetBaseUri())
             };
         }
 
@@ -105,9 +105,9 @@ private HttpClientHandler CreateHttpClientHandler()
             // Simply put, we reduce the amount of certificates which are accepted in bunq API responses.
             var handler = new HttpClientHandler();
 
-            if (_apiContext.Proxy != null)
+            if (apiContext.Proxy != null)
             {
-                handler.Proxy = new BunqProxy(_apiContext.Proxy);
+                handler.Proxy = new BunqProxy(apiContext.Proxy);
                 handler.UseProxy = true;
             }
 
@@ -145,13 +145,13 @@ private BunqResponseRaw SendRequest(HttpRequestMessage requestMessage,
         {
             if (!UrisNotRequiringActiveSession.Contains(uriRelative))
             {
-                _apiContext.EnsureSessionActive();
+                apiContext.EnsureSessionActive();
             }
 
             SetDefaultHeaders(requestMessage);
             SetHeaders(requestMessage, customHeaders);
             SetSessionHeaders(requestMessage);
-            var responseMessage = _client.SendAsync(requestMessage).Result;
+            var responseMessage = client.SendAsync(requestMessage).Result;
             AssertResponseSuccess(responseMessage);
             ValidateResponse(responseMessage);
 
@@ -175,7 +175,7 @@ private static IDictionary<string, string> GetHeaders(HttpResponseMessage respon
 
         private void ValidateResponse(HttpResponseMessage responseMessage)
         {
-            var installationContext = _apiContext.InstallationContext;
+            var installationContext = apiContext.InstallationContext;
 
             if (installationContext != null)
             {
@@ -262,7 +262,7 @@ private static string GenerateRandomRequestId()
 
         private void SetSessionHeaders(HttpRequestMessage requestMessage)
         {
-            var sessionToken = _apiContext.GetSessionToken();
+            var sessionToken = apiContext.GetSessionToken();
 
             if (sessionToken == null) return;
 
@@ -272,7 +272,7 @@ private void SetSessionHeaders(HttpRequestMessage requestMessage)
 
         private string GenerateSignature(HttpRequestMessage requestMessage)
         {
-            return SecurityUtils.GenerateSignature(requestMessage, _apiContext.InstallationContext.KeyPairClient);
+            return SecurityUtils.GenerateSignature(requestMessage, apiContext.InstallationContext.KeyPairClient);
         }
 
         private static void AssertResponseSuccess(HttpResponseMessage responseMessage)

BunqSdk/Json/BunqJsonConvert.cs

@@ -9,14 +9,14 @@ public static class BunqJsonConvert
     {
         private const string FormatDate = "yyyy-MM-dd HH:mm:ss.ffffff";
 
-        private static bool _isInitialized;
+        private static bool isInitialized;
 
         /// <summary>
         /// This method MUST be called before any (de)serialization with Newtonsoft JSON happens.
         /// </summary>
         private static void Initialize()
         {
-            if (_isInitialized)  
+            if (isInitialized)  
             {
                 return;
             }
@@ -30,7 +30,7 @@ private static void Initialize()
                 NullValueHandling = NullValueHandling.Ignore,
             };
 
-            _isInitialized = true;
+            isInitialized = true;
         }
 
         /// <summary>Serializes the specified object to a JSON string.</summary>

BunqSdk/Model/Core/Installation.cs

@@ -19,14 +19,14 @@ public class Installation : BunqModel
         private const string FieldClientPublicKey = "client_public_key";
 
         public SessionToken SessionToken { get; private set; }
-        private readonly Id _id;
-        private readonly PublicKeyServer _publicKeyServer;
+        private readonly Id id;
+        private readonly PublicKeyServer publicKeyServer;
 
         public Installation(Id id, SessionToken sessionToken, PublicKeyServer publicKeyServer)
         {
-            _id = id;
+            this.id = id;
             SessionToken = sessionToken;
-            _publicKeyServer = publicKeyServer;
+            this.publicKeyServer = publicKeyServer;
         }
 
         /// <summary>
@@ -58,12 +58,12 @@ private static byte[] GenerateRequestBodyBytes(string publicKeyClientString)
 
         public int GetIdInt()
         {
-            return _id.IdInt;
+            return id.IdInt;
         }
 
         public string GetPublicKeyServerString()
         {
-            return _publicKeyServer.ServerPublicKey;
+            return publicKeyServer.ServerPublicKey;
         }
 
         public override bool IsAllFieldNull()
@@ -73,12 +73,12 @@ public override bool IsAllFieldNull()
                 return false;
             }           
 
-            if (this._id != null)
+            if (this.id != null)
             {
                 return false;
             }
 
-            if (this._publicKeyServer != null)
+            if (this.publicKeyServer != null)
             {
                 return false;
             }