Updated language use. Removed redundant calls and initializers. Use Properties instead of public fields.

Signed-off-by: Konstantina Chremmou <[email protected]>

Author: Konstantina Chremmou

ocaml/sdk-gen/csharp/autogen/src/HTTP.cs

@@ -61,7 +61,7 @@ public TooManyRedirectsException(int redirect, Uri uri)
                 this.uri = uri;
             }
 
-            public TooManyRedirectsException() : base() { }
+            public TooManyRedirectsException() { }
 
             public TooManyRedirectsException(string message) : base(message) { }
 
@@ -91,7 +91,7 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
         [Serializable]
         public class BadServerResponseException : Exception
         {
-            public BadServerResponseException() : base() { }
+            public BadServerResponseException() { }
 
             public BadServerResponseException(string message) : base(message) { }
 
@@ -105,7 +105,7 @@ protected BadServerResponseException(SerializationInfo info, StreamingContext co
         [Serializable]
         public class CancelledException : Exception
         {
-            public CancelledException() : base() { }
+            public CancelledException() { }
 
             public CancelledException(string message) : base(message) { }
 
@@ -118,7 +118,7 @@ protected CancelledException(SerializationInfo info, StreamingContext context) :
         [Serializable]
         public class ProxyServerAuthenticationException : Exception
         {
-            public ProxyServerAuthenticationException() : base() { }
+            public ProxyServerAuthenticationException() { }
 
             public ProxyServerAuthenticationException(string message) : base(message) { }
 
@@ -142,6 +142,9 @@ protected ProxyServerAuthenticationException(SerializationInfo info, StreamingCo
         public const int DEFAULT_HTTPS_PORT = 443;
         private const int NONCE_LENGTH = 16;
 
+        private const int FILE_MOVE_MAX_RETRIES = 5;
+        private const int FILE_MOVE_SLEEP_BETWEEN_RETRIES = 100;
+
         public enum ProxyAuthenticationMethod
         {
             Basic = 0,
@@ -158,7 +161,7 @@ public enum ProxyAuthenticationMethod
 
         private static void WriteLine(String txt, Stream stream)
         {
-            byte[] bytes = System.Text.Encoding.ASCII.GetBytes(String.Format("{0}\r\n", txt));
+            byte[] bytes = Encoding.ASCII.GetBytes($"{txt}\r\n");
             stream.Write(bytes, 0, bytes.Length);
         }
 
@@ -173,7 +176,7 @@ private static void WriteLine(Stream stream)
         // done here.
         private static string ReadLine(Stream stream)
         {
-            System.Text.StringBuilder result = new StringBuilder();
+            StringBuilder result = new StringBuilder();
             while (true)
             {
                 int b = stream.ReadByte();
@@ -217,9 +220,8 @@ private static bool ReadHttpHeaders(ref Stream stream, IWebProxy proxy, bool nod
                     // read chunk size
                     string chunkSizeStr = ReadLine(stream);
                     chunkSizeStr = chunkSizeStr.TrimEnd('\r', '\n');
-                    int chunkSize = 0;
                     int.TryParse(chunkSizeStr, System.Globalization.NumberStyles.HexNumber,
-                        System.Globalization.CultureInfo.InvariantCulture, out chunkSize);
+                        System.Globalization.CultureInfo.InvariantCulture, out var chunkSize);
 
                     // read <chunkSize> number of bytes from the stream
                     int totalNumberOfBytesRead = 0;
@@ -231,8 +233,8 @@ private static bool ReadHttpHeaders(ref Stream stream, IWebProxy proxy, bool nod
                         totalNumberOfBytesRead += numberOfBytesRead;
                     } while (numberOfBytesRead > 0 && totalNumberOfBytesRead < chunkSize);
 
-                    string str = System.Text.Encoding.ASCII.GetString(bytes);
-                    string[] split = str.Split(new string[] {"\r\n"}, StringSplitOptions.RemoveEmptyEntries);
+                    string str = Encoding.ASCII.GetString(bytes);
+                    string[] split = str.Split(new [] {"\r\n"}, StringSplitOptions.RemoveEmptyEntries);
                     headers.AddRange(split);
 
                     entityBody += str;
@@ -276,7 +278,7 @@ private static bool ReadHttpHeaders(ref Stream stream, IWebProxy proxy, bool nod
 
         private static int getResultCode(string line)
         {
-            string[] bits = line.Split(new char[] { ' ' });
+            string[] bits = line.Split(' ');
             return (bits.Length < 2 ? 0 : Int32.Parse(bits[1]));
         }
 
@@ -426,7 +428,7 @@ public static Uri BuildUri(string hostname, string path, params object[] args)
 
         private static string GetPartOrNull(string str, int partIndex)
         {
-            string[] parts = str.Split(new char[] { ' ' }, partIndex + 2, StringSplitOptions.RemoveEmptyEntries);
+            string[] parts = str.Split(new [] { ' ' }, partIndex + 2, StringSplitOptions.RemoveEmptyEntries);
             return partIndex < parts.Length - 1 ? parts[partIndex] : null;
         }
 
@@ -457,8 +459,7 @@ private static NetworkStream ConnectSocket(Uri uri, bool nodelay, int timeoutMs)
         /// <param name="timeoutMs">Timeout, in ms. 0 for no timeout.</param>
         public static Stream ConnectStream(Uri uri, IWebProxy proxy, bool nodelay, int timeoutMs)
         {
-            IMockWebProxy mockProxy = proxy as IMockWebProxy;
-            if (mockProxy != null)
+            if (proxy is IMockWebProxy mockProxy)
                 return mockProxy.GetStream(uri);
 
             Stream stream;
@@ -478,7 +479,7 @@ public static Stream ConnectStream(Uri uri, IWebProxy proxy, bool nodelay, int t
             {
                 if (useProxy)
                 {
-                    string line = string.Format("CONNECT {0}:{1} HTTP/1.0", uri.Host, uri.Port);
+                    string line = $"CONNECT {uri.Host}:{uri.Port} HTTP/1.0";
                     WriteLine(line, stream);
                     WriteLine(stream);
 
@@ -490,8 +491,7 @@ public static Stream ConnectStream(Uri uri, IWebProxy proxy, bool nodelay, int t
 
                 if (UseSSL(uri))
                 {
-                    SslStream sslStream = new SslStream(stream, false,
-                        new RemoteCertificateValidationCallback(ValidateServerCertificate), null);
+                    SslStream sslStream = new SslStream(stream, false, ValidateServerCertificate, null);
                     sslStream.AuthenticateAsClient("", null, SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12, true);
 
                     stream = sslStream;
@@ -523,7 +523,7 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
             }
 
             if (proxy.Credentials == null)
-                throw new BadServerResponseException(string.Format("Received error code {0} from the server", initialResponse[0]));
+                throw new BadServerResponseException($"Received error code {initialResponse[0]} from the server");
 
             NetworkCredential credentials = proxy.Credentials.GetCredential(uri, null);
 
@@ -535,10 +535,9 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                 if (string.IsNullOrEmpty(basicField))
                     throw new ProxyServerAuthenticationException("Basic authentication scheme is not supported/enabled by the proxy server.");
 
-                string authenticationFieldReply = string.Format("Proxy-Authorization: Basic {0}",
-                    Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials.UserName + ":" + credentials.Password)));
+                var creds = Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials.UserName + ":" + credentials.Password));
                 WriteLine(header, stream);
-                WriteLine(authenticationFieldReply, stream);
+                WriteLine($"Proxy-Authorization: Basic {creds}", stream);
                 WriteLine(stream);
             }
             else if (CurrentProxyAuthenticationMethod == ProxyAuthenticationMethod.Digest)
@@ -548,9 +547,7 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                 if (string.IsNullOrEmpty(digestField))
                     throw new ProxyServerAuthenticationException("Digest authentication scheme is not supported/enabled by the proxy server.");
 
-                string authenticationFieldReply = string.Format(
-                    "Proxy-Authorization: Digest username=\"{0}\", uri=\"{1}:{2}\"",
-                    credentials.UserName, uri.Host, uri.Port);
+                string authenticationFieldReply = $"Proxy-Authorization: Digest username=\"{credentials.UserName}\", uri=\"{uri.Host}:{uri.Port}\"";
 
                 int len = "Proxy-Authorization: Digest".Length;
                 string directiveString = digestField.Substring(len, digestField.Length - len);
@@ -571,19 +568,19 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                                 throw new ProxyServerAuthenticationException("Stale nonce in Digest authentication attempt.");
                             break;
                         case "realm=":
-                            authenticationFieldReply += string.Format(", realm=\"{0}\"", directives[++i]);
+                            authenticationFieldReply += $", realm=\"{directives[++i]}\"";
                             realm = directives[i];
                             break;
                         case "nonce=":
-                            authenticationFieldReply += string.Format(", nonce=\"{0}\"", directives[++i]);
+                            authenticationFieldReply += $", nonce=\"{directives[++i]}\"";
                             nonce = directives[i];
                             break;
                         case "opaque=":
-                            authenticationFieldReply += string.Format(", opaque=\"{0}\"", directives[++i]);
+                            authenticationFieldReply += $", opaque=\"{directives[++i]}\"";
                             opaque = directives[i];
                             break;
                         case "algorithm=":
-                            authenticationFieldReply += string.Format(", algorithm={0}", directives[++i]); //unquoted; see RFC7616-3.4
+                            authenticationFieldReply += $", algorithm={directives[++i]}"; //unquoted; see RFC7616-3.4
                             algorithm = directives[i];
                             break;
                         case "qop=":
@@ -593,21 +590,20 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                                 qop = qops.FirstOrDefault(q => q.ToLowerInvariant() == "auth") ??
                                       qops.FirstOrDefault(q => q.ToLowerInvariant() == "auth-int");
                                 if (qop == null)
-                                      throw new ProxyServerAuthenticationException(
-                                          "Digest authentication's quality-of-protection directive is not supported.");
-                                authenticationFieldReply += string.Format(", qop={0}", qop); //unquoted; see RFC7616-3.4
+                                      throw new ProxyServerAuthenticationException("Digest authentication's quality-of-protection directive is not supported.");
+                                authenticationFieldReply += $", qop={qop}"; //unquoted; see RFC7616-3.4
                             }
                             break;
                     }
                 }
 
                 string clientNonce = GenerateNonce();
                 if (qop != null)
-                    authenticationFieldReply += string.Format(", cnonce=\"{0}\"", clientNonce);
+                    authenticationFieldReply += $", cnonce=\"{clientNonce}\"";
 
                 string nonceCount = "00000001"; // todo: track nonces and their corresponding nonce counts
                 if (qop != null)
-                    authenticationFieldReply += string.Format(", nc={0}", nonceCount); //unquoted; see RFC7616-3.4
+                    authenticationFieldReply += $", nc={nonceCount}"; //unquoted; see RFC7616-3.4
 
                 Func<string, string> algFunc;
                 var scratch1 = string.Join(":", credentials.UserName, realm, credentials.Password);
@@ -645,7 +641,7 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                     : new[] {HA1, nonce, nonceCount, clientNonce, qop, HA2};
                 var response = algFunc(string.Join(":", array3));
 
-                authenticationFieldReply += string.Format(", response=\"{0}\"", response);
+                authenticationFieldReply += $", response=\"{response}\"";
 
                 WriteLine(header, stream);
                 WriteLine(authenticationFieldReply, stream);
@@ -654,8 +650,7 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
             else
             {
                 string authType = GetPartOrNull(fields[0], 1);
-                throw new ProxyServerAuthenticationException(
-                    string.Format("Proxy server's {0} authentication method is not supported.", authType ?? "chosen"));
+                throw new ProxyServerAuthenticationException($"Proxy server's {authType ?? "chosen"} authentication method is not supported.");
             }
 
             // handle authentication attempt response
@@ -671,12 +666,10 @@ private static void AuthenticateProxy(ref Stream stream, Uri uri, IWebProxy prox
                 case 407:
                     throw new ProxyServerAuthenticationException("Proxy server denied access due to wrong credentials.");
                 default:
-                    throw new BadServerResponseException(string.Format(
-                        "Received error code {0} from the server", authenticatedResponse[0]));
+                    throw new BadServerResponseException($"Received error code {authenticatedResponse[0]} from the server");
             }
         }
 
-
         private static Stream DoHttp(Uri uri, IWebProxy proxy, bool noDelay, int timeoutMs, params string[] headers)
         {
             Stream stream = ConnectStream(uri, proxy, noDelay, timeoutMs);
@@ -838,9 +831,6 @@ public static void Get(DataCopiedDelegate dataCopiedDelegate, FuncBool cancellin
             }
         }
 
-        private const int FILE_MOVE_MAX_RETRIES = 5;
-        private const int FILE_MOVE_SLEEP_BETWEEN_RETRIES = 100;
-
         /// <summary>
         /// Move a file, retrying a few times with a short sleep between retries.
         /// If it still fails after these retries, then throw the error.

ocaml/sdk-gen/csharp/autogen/src/JsonRpc.cs

@@ -49,9 +49,9 @@ internal abstract class JsonRequest
     {
         protected JsonRequest(int id, string method, JToken parameters)
         {
-            this.Id = id;
-            this.Method = method;
-            this.Parameters = parameters;
+            Id = id;
+            Method = method;
+            Parameters = parameters;
         }
 
         public static JsonRequest Create(JsonRpcVersion jsonRpcVersion, int id, string method, JToken parameters)
@@ -105,18 +105,15 @@ public JsonRequestV2(int id, string method, JToken parameters)
         }
 
         [JsonProperty("jsonrpc", Required = Required.Always)]
-        public string JsonRPC
-        {
-            get { return "2.0"; }
-        }
+        public string JsonRPC => "2.0";
     }
 
 
     internal abstract class JsonResponse<T>
     {
-        [JsonProperty("id", Required = Required.AllowNull)] public int Id = 0;
+        [JsonProperty("id", Required = Required.AllowNull)] public int Id { get; set; }
 
-        [JsonProperty("result", Required = Required.Default)] public T Result = default(T);
+        [JsonProperty("result", Required = Required.Default)] public T Result { get; set; }
 
         public override string ToString()
         {
@@ -126,23 +123,23 @@ public override string ToString()
 
     internal class JsonResponseV1<T> : JsonResponse<T>
     {
-        [JsonProperty("error", Required = Required.AllowNull)] public JToken Error = null;
+        [JsonProperty("error", Required = Required.AllowNull)] public JToken Error { get; set; }
     }
 
     internal class JsonResponseV2<T> : JsonResponse<T>
     {
-        [JsonProperty("error", Required = Required.DisallowNull)] public JsonResponseV2Error Error = null;
+        [JsonProperty("error", Required = Required.DisallowNull)] public JsonResponseV2Error Error { get; set; }
 
-        [JsonProperty("jsonrpc", Required = Required.Always)] public string JsonRpc = null;
+        [JsonProperty("jsonrpc", Required = Required.Always)] public string JsonRpc { get; set; }
     }
 
     internal class JsonResponseV2Error
     {
-        [JsonProperty("code", Required = Required.Always)] public int Code = 0;
+        [JsonProperty("code", Required = Required.Always)] public int Code { get; set; }
 
-        [JsonProperty("message", Required = Required.Always)] public string Message = null;
+        [JsonProperty("message", Required = Required.Always)] public string Message { get; set; }
 
-        [JsonProperty("data", Required = Required.Default)] public JToken Data = null;
+        [JsonProperty("data", Required = Required.Default)] public JToken Data { get; set; }
 
         public override string ToString()
         {