Merge pull request #840 from stebet/stringInterpolation

lukebakken · web-flow · commit 335e9f13982b · 2020-05-20T13:42:56.000-07:00
Using interpolated strings for better code readability.
diff --git a/projects/Apigen/apigen/AmqpEntity.cs b/projects/Apigen/apigen/AmqpEntity.cs
@@ -82,11 +82,10 @@ public string DocumentationComment(string prefixSpaces, string docXpath) {
         public string DocumentationComment(string prefixSpaces, string docXpath, string tagname) {
             string docStr = GetString(docXpath, "").Trim();
             if (docStr.Length > 0) {
-                return (prefixSpaces + "/// <"+tagname+">\n" +
-                        GetString(docXpath, "") + "\n</"+tagname+">")
-                    .Replace("\n", "\n" + prefixSpaces + "/// ");
+                return $"{prefixSpaces}/// <{tagname}>\n{GetString(docXpath, "")}\n</{tagname}>"
+                    .Replace("\n", $"\n{prefixSpaces}/// ");
             } else {
-                return prefixSpaces + "// (no documentation)";
+                return $"{prefixSpaces}// (no documentation)";
             }
         }
     }
diff --git a/projects/Apigen/apigen/Apigen.cs b/projects/Apigen/apigen/Apigen.cs
@@ -99,7 +99,7 @@ public static string GetString(XmlNode n0, string path)
             string s = GetString(n0, path, null);
             if (s == null)
             {
-                throw new Exception("Missing spec XML node: " + path);
+                throw new Exception($"Missing spec XML node: {path}");
             }
             return s;
         }
@@ -248,7 +248,7 @@ public void HandleOption(string opt)
             }
             else
             {
-                Console.Error.WriteLine("Unsupported command-line option: " + opt);
+                Console.Error.WriteLine($"Unsupported command-line option: {opt}");
                 Usage();
             }
         }
@@ -294,7 +294,7 @@ public void Generate()
 
         public void LoadSpec()
         {
-            Console.WriteLine("* Loading spec from '" + m_inputXmlFilename + "'");
+            Console.WriteLine($"* Loading spec from '{m_inputXmlFilename}'");
             m_spec = new XmlDocument();
 
             using (var stream = new FileStream(m_inputXmlFilename, FileMode.Open, FileAccess.Read))
@@ -358,12 +358,12 @@ public string MapDomain(string d)
 
         public string VersionToken()
         {
-            return "v" + m_majorVersion + "_" + m_minorVersion;
+            return $"v{m_majorVersion}_{m_minorVersion}";
         }
 
         public void GenerateOutput()
         {
-            Console.WriteLine("* Generating code into '" + m_outputFilename + "'");
+            Console.WriteLine($"* Generating code into '{m_outputFilename}'");
 
             string directory = Path.GetDirectoryName(m_outputFilename);
 
@@ -1069,11 +1069,11 @@ public void EmitContentHeaderFactory(MethodInfo method)
             EmitLine("    {");
             if (Attribute(method, typeof(AmqpUnsupportedAttribute)) != null)
             {
-                EmitLine(string.Format("      throw new UnsupportedMethodException(\"" + method.Name + "\");"));
+                EmitLine($"      throw new UnsupportedMethodException(\"{method.Name}\");");
             }
             else
             {
-                EmitLine("      return new " + MangleClass(contentClass) + "Properties();");
+                EmitLine($"      return new {MangleClass(contentClass)}Properties();");
             }
             EmitLine("    }");
         }
@@ -1101,7 +1101,7 @@ public void MaybeEmitModelMethod(MethodInfo method)
             {
                 EmitModelMethodPreamble(method);
                 EmitLine("    {");
-                EmitLine("      throw new UnsupportedMethodException(\"" + method.Name + "\");");
+                EmitLine($"      throw new UnsupportedMethodException(\"{method.Name}\");");
                 EmitLine("    }");
             }
             else
@@ -1198,7 +1198,7 @@ public void LookupAmqpMethod(MethodInfo method,
 
             if (amqpClass == null || amqpMethod == null)
             {
-                throw new Exception("Could not find AMQP class or method for IModel method " + method.Name);
+                throw new Exception($"Could not find AMQP class or method for IModel method {method.Name}");
             }
         }
 
@@ -1227,7 +1227,7 @@ public void EmitModelMethod(MethodInfo method)
                                                         : replyMapping.m_methodName);
                 if (amqpReplyMethod == null)
                 {
-                    throw new Exception("Could not find AMQP reply method for IModel method " + method.Name);
+                    throw new Exception($"Could not find AMQP reply method for IModel method {method.Name}");
                 }
             }
 
@@ -1269,7 +1269,7 @@ public void EmitModelMethod(MethodInfo method)
             string contentHeaderExpr =
                 contentHeaderParameter == null
                 ? "null"
-                : " (" + MangleClass(amqpClass.Name) + "Properties) " + contentHeaderParameter.Name;
+                : $" ({MangleClass(amqpClass.Name)}Properties) {contentHeaderParameter.Name}";
             string contentBodyExpr =
                 contentBodyParameter == null ? "null" : contentBodyParameter.Name;
 
@@ -1316,15 +1316,15 @@ public void EmitModelMethod(MethodInfo method)
 
             if (nowaitParameter != null)
             {
-                EmitLine("      if (" + nowaitParameter.Name + ") {");
-                EmitLine("        ModelSend(__req," + contentHeaderExpr + "," + contentBodyExpr + ");");
+                EmitLine($"      if ({nowaitParameter.Name}) {{");
+                EmitLine($"        ModelSend(__req,{contentHeaderExpr},{contentBodyExpr});");
                 if (method.ReturnType == typeof(void))
                 {
                     EmitLine("        return;");
                 }
                 else
                 {
-                    EmitLine("        return " + nowaitExpression + ";");
+                    EmitLine($"        return {nowaitExpression};");
                 }
                 EmitLine("      }");
             }
@@ -1334,7 +1334,7 @@ public void EmitModelMethod(MethodInfo method)
 
             if (amqpReplyMethod == null)
             {
-                EmitLine("      ModelSend(__req," + contentHeaderExpr + "," + contentBodyExpr + ");");
+                EmitLine($"      ModelSend(__req,{contentHeaderExpr},{contentBodyExpr});");
             }
             else
             {
@@ -1358,24 +1358,24 @@ public void EmitModelMethod(MethodInfo method)
                         string fieldPrefix = IsAmqpClass(method.ReturnType) ? "_" : "";
 
                         // No field mapping --> it's assumed to be a struct to fill in.
-                        EmitLine("      " + method.ReturnType + " __result = new " + method.ReturnType + "();");
+                        EmitLine($"      {method.ReturnType} __result = new {method.ReturnType}();");
                         foreach (FieldInfo fi in method.ReturnType.GetFields())
                         {
                             if (Attribute(fi, typeof(AmqpFieldMappingAttribute)) is AmqpFieldMappingAttribute returnFieldMapping)
                             {
-                                EmitLine("      __result." + fi.Name + " = __rep." + fieldPrefix + returnFieldMapping.m_fieldName + ";");
+                                EmitLine($"      __result.{fi.Name} = __rep.{fieldPrefix}{returnFieldMapping.m_fieldName};");
                             }
                             else
                             {
-                                EmitLine("      __result." + fi.Name + " = __rep." + fieldPrefix + fi.Name + ";");
+                                EmitLine($"      __result.{fi.Name} = __rep.{fieldPrefix}{fi.Name};");
                             }
                         }
                         EmitLine("      return __result;");
                     }
                     else
                     {
                         // Field mapping --> return just the field we're interested in.
-                        EmitLine("      return __rep._" + returnMapping.m_fieldName + ";");
+                        EmitLine($"      return __rep._{returnMapping.m_fieldName};");
                     }
                 }
             }
diff --git a/projects/RabbitMQ.Client/client/api/AmqpTcpEndpoint.cs b/projects/RabbitMQ.Client/client/api/AmqpTcpEndpoint.cs
@@ -281,7 +281,7 @@ public override int GetHashCode()
         /// </remarks>
         public override string ToString()
         {
-            return "amqp://" + HostName + ":" + Port;
+            return $"amqp://{HostName}:{Port}";
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/api/AmqpTimestamp.cs b/projects/RabbitMQ.Client/client/api/AmqpTimestamp.cs
@@ -79,7 +79,7 @@ public AmqpTimestamp(long unixTime) : this()
         /// </summary>
         public override string ToString()
         {
-            return "((time_t)" + UnixTime + ")";
+            return $"((time_t){UnixTime})";
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/api/ConnectionFactory.cs b/projects/RabbitMQ.Client/client/api/ConnectionFactory.cs
@@ -548,7 +548,7 @@ private void SetUri(Uri uri)
             }
             else
             {
-                throw new ArgumentException("Wrong scheme in AMQP URI: " + uri.Scheme);
+                throw new ArgumentException($"Wrong scheme in AMQP URI: {uri.Scheme}");
             }
             string host = uri.Host;
             if (!string.IsNullOrEmpty(host))
@@ -569,7 +569,7 @@ private void SetUri(Uri uri)
                 string[] userPass = userInfo.Split(':');
                 if (userPass.Length > 2)
                 {
-                    throw new ArgumentException("Bad user info in AMQP " + "URI: " + userInfo);
+                    throw new ArgumentException($"Bad user info in AMQP URI: {userInfo}");
                 }
                 UserName = UriDecode(userPass[0]);
                 if (userPass.Length == 2)
@@ -582,9 +582,7 @@ private void SetUri(Uri uri)
                that has at least the path segment "/". */
             if (uri.Segments.Length > 2)
             {
-                throw new ArgumentException("Multiple segments in " +
-                                            "path of AMQP URI: " +
-                                            string.Join(", ", uri.Segments));
+                throw new ArgumentException($"Multiple segments in path of AMQP URI: {string.Join(", ", uri.Segments)}");
             }
             if (uri.Segments.Length == 2)
             {
diff --git a/projects/RabbitMQ.Client/client/api/PlainMechanism.cs b/projects/RabbitMQ.Client/client/api/PlainMechanism.cs
@@ -46,7 +46,7 @@ public class PlainMechanism : IAuthMechanism
     {
         public byte[] handleChallenge(byte[] challenge, IConnectionFactory factory)
         {
-            return Encoding.UTF8.GetBytes("\0" + factory.UserName + "\0" + factory.Password);
+            return Encoding.UTF8.GetBytes($"\0{factory.UserName}\0{factory.Password}");
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/api/PublicationAddress.cs b/projects/RabbitMQ.Client/client/api/PublicationAddress.cs
@@ -147,7 +147,7 @@ public static bool TryParse(string uriLikeString, out PublicationAddress result)
         /// </summary>
         public override string ToString()
         {
-            return ExchangeType + "://" + ExchangeName + "/" + RoutingKey;
+            return $"{ExchangeType}://{ExchangeName}/{RoutingKey}";
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/api/ShutdownReportEntry.cs b/projects/RabbitMQ.Client/client/api/ShutdownReportEntry.cs
@@ -66,8 +66,8 @@ public ShutdownReportEntry(string description, Exception exception)
 
         public override string ToString()
         {
-            string output = "Message: " + Description;
-            return (Exception != null) ? output + " Exception: " + Exception : output;
+            string description = $"Message: {Description}";
+            return (Exception != null) ? $"{description} Exception: {Exception}" : description;
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/impl/AmqpVersion.cs b/projects/RabbitMQ.Client/client/impl/AmqpVersion.cs
@@ -110,7 +110,7 @@ public override int GetHashCode()
         /// </remarks>
         public override string ToString()
         {
-            return Major + "-" + Minor;
+            return $"{Major}-{Minor}";
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -260,8 +260,7 @@ public static IDictionary<string, object> DefaultClientProperties()
                 ["version"] = Encoding.UTF8.GetBytes(s_version),
                 ["platform"] = Encoding.UTF8.GetBytes(".NET"),
                 ["copyright"] = Encoding.UTF8.GetBytes("Copyright (c) 2007-2020 VMware, Inc."),
-                ["information"] = Encoding.UTF8.GetBytes("Licensed under the MPL.  " +
-                                                          "See https://www.rabbitmq.com/")
+                ["information"] = Encoding.UTF8.GetBytes("Licensed under the MPL. See https://www.rabbitmq.com/")
             };
             return table;
         }
@@ -335,8 +334,7 @@ public void Close(ShutdownEventArgs reason, bool abort, TimeSpan timeout)
                         }
                         else
                         {
-                            LogCloseError("Couldn't close connection cleanly. "
-                                          + "Socket closed unexpectedly", ioe);
+                            LogCloseError("Couldn't close connection cleanly. Socket closed unexpectedly", ioe);
                         }
                     }
                 }
@@ -378,14 +376,12 @@ public void ClosingLoop()
             {
                 if (_model0.CloseReason == null)
                 {
-                    LogCloseError("Connection didn't close cleanly. "
-                                  + "Socket closed unexpectedly", eose);
+                    LogCloseError("Connection didn't close cleanly. Socket closed unexpectedly", eose);
                 }
             }
             catch (IOException ioe)
             {
-                LogCloseError("Connection didn't close cleanly. "
-                              + "Socket closed unexpectedly", ioe);
+                LogCloseError("Connection didn't close cleanly. Socket closed unexpectedly", ioe);
             }
             catch (Exception e)
             {
@@ -447,7 +443,7 @@ public void HandleMainLoopException(ShutdownEventArgs reason)
             }
 
             OnShutdown();
-            LogCloseError("Unexpected connection closure: " + reason, new Exception(reason.ToString()));
+            LogCloseError($"Unexpected connection closure: {reason}", new Exception(reason.ToString()));
         }
 
         public bool HardProtocolExceptionHandler(HardProtocolException hpe)
@@ -470,8 +466,7 @@ public bool HardProtocolExceptionHandler(HardProtocolException hpe)
             }
             else
             {
-                LogCloseError("Hard Protocol Exception occured "
-                              + "while closing the connection", hpe);
+                LogCloseError("Hard Protocol Exception occured while closing the connection", hpe);
             }
 
             return false;
@@ -1117,8 +1112,7 @@ void StartAndTune()
                 IAuthMechanismFactory mechanismFactory = _factory.AuthMechanismFactory(mechanisms);
                 if (mechanismFactory == null)
                 {
-                    throw new IOException("No compatible authentication mechanism found - " +
-                                          "server offered [" + mechanismsString + "]");
+                    throw new IOException($"No compatible authentication mechanism found - server offered [{mechanismsString}]");
                 }
                 IAuthMechanism mechanism = mechanismFactory.GetInstance();
                 byte[] challenge = null;
diff --git a/projects/RabbitMQ.Client/client/impl/Frame.cs b/projects/RabbitMQ.Client/client/impl/Frame.cs
@@ -276,7 +276,7 @@ internal static InboundFrame ReadFrom(Stream reader)
             if (frameEndMarker != Constants.FrameEnd)
             {
                 ArrayPool<byte>.Shared.Return(payloadBytes);
-                throw new MalformedFrameException("Bad frame end marker: " + frameEndMarker);
+                throw new MalformedFrameException($"Bad frame end marker: {frameEndMarker}");
             }
 
             return new InboundFrame((FrameType)type, channel, payload);
diff --git a/projects/RabbitMQ.Client/client/impl/ModelBase.cs b/projects/RabbitMQ.Client/client/impl/ModelBase.cs
@@ -640,9 +640,7 @@ public virtual void HandleBasicDeliver(string consumerTag,
             {
                 if (DefaultConsumer == null)
                 {
-                    throw new InvalidOperationException("Unsolicited delivery -" +
-                                                        " see IModel.DefaultConsumer to handle this" +
-                                                        " case.");
+                    throw new InvalidOperationException("Unsolicited delivery - see IModel.DefaultConsumer to handle this case.");
                 }
                 else
                 {
diff --git a/projects/RabbitMQ.Client/client/impl/RecordedBinding.cs b/projects/RabbitMQ.Client/client/impl/RecordedBinding.cs
@@ -93,8 +93,7 @@ public virtual void Recover()
 
         public override string ToString()
         {
-            return string.Format("{0}: source = '{1}', destination = '{2}', routingKey = '{3}', arguments = '{4}'",
-                GetType().Name, Source, Destination, RoutingKey, Arguments);
+            return $"{GetType().Name}: source = '{Source}', destination = '{Destination}', routingKey = '{RoutingKey}', arguments = '{Arguments}'";
         }
 
         public RecordedBinding WithArguments(IDictionary<string, object> value)
diff --git a/projects/RabbitMQ.Client/client/impl/RecordedExchange.cs b/projects/RabbitMQ.Client/client/impl/RecordedExchange.cs
@@ -61,8 +61,7 @@ public void Recover()
 
         public override string ToString()
         {
-            return string.Format("{0}: name = '{1}', type = '{2}', durable = {3}, autoDelete = {4}, arguments = '{5}'",
-                GetType().Name, Name, Type, Durable, IsAutoDelete, Arguments);
+            return $"{GetType().Name}: name = '{Name}', type = '{Type}', durable = {Durable}, autoDelete = {IsAutoDelete}, arguments = '{Arguments}'";
         }
 
         public RecordedExchange WithArguments(IDictionary<string, object> value)
diff --git a/projects/RabbitMQ.Client/client/impl/RecordedQueue.cs b/projects/RabbitMQ.Client/client/impl/RecordedQueue.cs
@@ -110,8 +110,7 @@ public RecordedQueue ServerNamed(bool value)
 
         public override string ToString()
         {
-            return string.Format("{0}: name = '{1}', durable = {2}, exlusive = {3}, autoDelete = {4}, arguments = '{5}'",
-                GetType().Name, Name, _durable, _exclusive, IsAutoDelete, _arguments);
+            return $"{GetType().Name}: name = '{Name}', durable = {_durable}, exlusive = {_exclusive}, autoDelete = {IsAutoDelete}, arguments = '{_arguments}'";
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/impl/SessionBase.cs b/projects/RabbitMQ.Client/client/impl/SessionBase.cs
@@ -127,7 +127,7 @@ public virtual void OnSessionShutdown(ShutdownEventArgs reason)
 
         public override string ToString()
         {
-            return GetType().Name + "#" + ChannelNumber + ":" + Connection;
+            return $"{GetType().Name}#{ChannelNumber}:{Connection}";
         }
 
         public void Close(ShutdownEventArgs reason)
diff --git a/projects/RabbitMQ.Client/client/impl/TcpClientAdapter.cs b/projects/RabbitMQ.Client/client/impl/TcpClientAdapter.cs
@@ -24,7 +24,7 @@ public virtual async Task ConnectAsync(string host, int port)
             IPAddress ep = TcpClientAdapterHelper.GetMatchingHost(adds, _sock.AddressFamily);
             if (ep == default(IPAddress))
             {
-                throw new ArgumentException("No ip address could be resolved for " + host);
+                throw new ArgumentException($"No ip address could be resolved for {host}");
             }
 
 #if NET461
diff --git a/projects/RabbitMQ.Client/client/logging/RabbitMqExceptionDetail.cs b/projects/RabbitMQ.Client/client/logging/RabbitMqExceptionDetail.cs
@@ -79,7 +79,7 @@ public RabbitMqExceptionDetail(IDictionary<string, object> ex)
 
         public override string ToString()
         {
-            return string.Format("Exception: {0}\r\n{1}\r\n\r\n{2}\r\nInnerException:\r\n{3}", Type, Message, StackTrace, InnerException);
+            return $"Exception: {Type}\r\n{Message}\r\n\r\n{StackTrace}\r\nInnerException:\r\n{InnerException}";
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/util/DebugUtil.cs b/projects/RabbitMQ.Client/util/DebugUtil.cs
diff --git a/projects/RabbitMQ.Client/util/IntAllocator.cs b/projects/RabbitMQ.Client/util/IntAllocator.cs
diff --git a/projects/Unit/Fixtures.cs b/projects/Unit/Fixtures.cs
diff --git a/projects/Unit/TestConnectionRecovery.cs b/projects/Unit/TestConnectionRecovery.cs
diff --git a/projects/Unit/TestHeartbeats.cs b/projects/Unit/TestHeartbeats.cs
diff --git a/projects/Unit/TestSsl.cs b/projects/Unit/TestSsl.cs

Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,10 @@ public string DocumentationComment(string prefixSpaces, string docXpath) {`
`82`	`82`	`public string DocumentationComment(string prefixSpaces, string docXpath, string tagname) {`
`83`	`83`	`string docStr = GetString(docXpath, "").Trim();`
`84`	`84`	`if (docStr.Length > 0) {`
`85`		`- return (prefixSpaces + "/// <"+tagname+">\n" +`
`86`		`- GetString(docXpath, "") + "\n</"+tagname+">")`
`87`		`- .Replace("\n", "\n" + prefixSpaces + "/// ");`
	`85`	`+ return $"{prefixSpaces}/// <{tagname}>\n{GetString(docXpath, "")}\n</{tagname}>"`
	`86`	`+ .Replace("\n", $"\n{prefixSpaces}/// ");`
`88`	`87`	`} else {`
`89`		`- return prefixSpaces + "// (no documentation)";`
	`88`	`+ return $"{prefixSpaces}// (no documentation)";`
`90`	`89`	`}`
`91`	`90`	`}`
`92`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public static string GetString(XmlNode n0, string path)`
`99`	`99`	`string s = GetString(n0, path, null);`
`100`	`100`	`if (s == null)`
`101`	`101`	`{`
`102`		`- throw new Exception("Missing spec XML node: " + path);`
	`102`	`+ throw new Exception($"Missing spec XML node: {path}");`
`103`	`103`	`}`
`104`	`104`	`return s;`
`105`	`105`	`}`
`@@ -248,7 +248,7 @@ public void HandleOption(string opt)`
`248`	`248`	`}`
`249`	`249`	`else`
`250`	`250`	`{`
`251`		`- Console.Error.WriteLine("Unsupported command-line option: " + opt);`
	`251`	`+ Console.Error.WriteLine($"Unsupported command-line option: {opt}");`
`252`	`252`	`Usage();`
`253`	`253`	`}`
`254`	`254`	`}`
`@@ -294,7 +294,7 @@ public void Generate()`
`294`	`294`
`295`	`295`	`public void LoadSpec()`
`296`	`296`	`{`
`297`		`- Console.WriteLine("* Loading spec from '" + m_inputXmlFilename + "'");`
	`297`	`+ Console.WriteLine($"* Loading spec from '{m_inputXmlFilename}'");`
`298`	`298`	`m_spec = new XmlDocument();`
`299`	`299`
`300`	`300`	`using (var stream = new FileStream(m_inputXmlFilename, FileMode.Open, FileAccess.Read))`
`@@ -358,12 +358,12 @@ public string MapDomain(string d)`
`358`	`358`
`359`	`359`	`public string VersionToken()`
`360`	`360`	`{`
`361`		`- return "v" + m_majorVersion + "_" + m_minorVersion;`
	`361`	`+ return $"v{m_majorVersion}_{m_minorVersion}";`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`public void GenerateOutput()`
`365`	`365`	`{`
`366`		`- Console.WriteLine("* Generating code into '" + m_outputFilename + "'");`
	`366`	`+ Console.WriteLine($"* Generating code into '{m_outputFilename}'");`
`367`	`367`
`368`	`368`	`string directory = Path.GetDirectoryName(m_outputFilename);`
`369`	`369`
`@@ -1069,11 +1069,11 @@ public void EmitContentHeaderFactory(MethodInfo method)`
`1069`	`1069`	`EmitLine(" {");`
`1070`	`1070`	`if (Attribute(method, typeof(AmqpUnsupportedAttribute)) != null)`
`1071`	`1071`	`{`
`1072`		`- EmitLine(string.Format(" throw new UnsupportedMethodException(\"" + method.Name + "\");"));`
	`1072`	`+ EmitLine($" throw new UnsupportedMethodException(\"{method.Name}\");");`
`1073`	`1073`	`}`
`1074`	`1074`	`else`
`1075`	`1075`	`{`
`1076`		`- EmitLine(" return new " + MangleClass(contentClass) + "Properties();");`
	`1076`	`+ EmitLine($" return new {MangleClass(contentClass)}Properties();");`
`1077`	`1077`	`}`
`1078`	`1078`	`EmitLine(" }");`
`1079`	`1079`	`}`
`@@ -1101,7 +1101,7 @@ public void MaybeEmitModelMethod(MethodInfo method)`
`1101`	`1101`	`{`
`1102`	`1102`	`EmitModelMethodPreamble(method);`
`1103`	`1103`	`EmitLine(" {");`
`1104`		`- EmitLine(" throw new UnsupportedMethodException(\"" + method.Name + "\");");`
	`1104`	`+ EmitLine($" throw new UnsupportedMethodException(\"{method.Name}\");");`
`1105`	`1105`	`EmitLine(" }");`
`1106`	`1106`	`}`
`1107`	`1107`	`else`
`@@ -1198,7 +1198,7 @@ public void LookupAmqpMethod(MethodInfo method,`
`1198`	`1198`
`1199`	`1199`	`if (amqpClass == null \|\| amqpMethod == null)`
`1200`	`1200`	`{`
`1201`		`- throw new Exception("Could not find AMQP class or method for IModel method " + method.Name);`
	`1201`	`+ throw new Exception($"Could not find AMQP class or method for IModel method {method.Name}");`
`1202`	`1202`	`}`
`1203`	`1203`	`}`
`1204`	`1204`
`@@ -1227,7 +1227,7 @@ public void EmitModelMethod(MethodInfo method)`
`1227`	`1227`	`: replyMapping.m_methodName);`
`1228`	`1228`	`if (amqpReplyMethod == null)`
`1229`	`1229`	`{`
`1230`		`- throw new Exception("Could not find AMQP reply method for IModel method " + method.Name);`
	`1230`	`+ throw new Exception($"Could not find AMQP reply method for IModel method {method.Name}");`
`1231`	`1231`	`}`
`1232`	`1232`	`}`
`1233`	`1233`
`@@ -1269,7 +1269,7 @@ public void EmitModelMethod(MethodInfo method)`
`1269`	`1269`	`string contentHeaderExpr =`
`1270`	`1270`	`contentHeaderParameter == null`
`1271`	`1271`	`? "null"`
`1272`		`- : " (" + MangleClass(amqpClass.Name) + "Properties) " + contentHeaderParameter.Name;`
	`1272`	`+ : $" ({MangleClass(amqpClass.Name)}Properties) {contentHeaderParameter.Name}";`
`1273`	`1273`	`string contentBodyExpr =`
`1274`	`1274`	`contentBodyParameter == null ? "null" : contentBodyParameter.Name;`
`1275`	`1275`
`@@ -1316,15 +1316,15 @@ public void EmitModelMethod(MethodInfo method)`
`1316`	`1316`
`1317`	`1317`	`if (nowaitParameter != null)`
`1318`	`1318`	`{`
`1319`		`- EmitLine(" if (" + nowaitParameter.Name + ") {");`
`1320`		`- EmitLine(" ModelSend(__req," + contentHeaderExpr + "," + contentBodyExpr + ");");`
	`1319`	`+ EmitLine($" if ({nowaitParameter.Name}) {{");`
	`1320`	`+ EmitLine($" ModelSend(__req,{contentHeaderExpr},{contentBodyExpr});");`
`1321`	`1321`	`if (method.ReturnType == typeof(void))`
`1322`	`1322`	`{`
`1323`	`1323`	`EmitLine(" return;");`
`1324`	`1324`	`}`
`1325`	`1325`	`else`
`1326`	`1326`	`{`
`1327`		`- EmitLine(" return " + nowaitExpression + ";");`
	`1327`	`+ EmitLine($" return {nowaitExpression};");`
`1328`	`1328`	`}`
`1329`	`1329`	`EmitLine(" }");`
`1330`	`1330`	`}`
`@@ -1334,7 +1334,7 @@ public void EmitModelMethod(MethodInfo method)`
`1334`	`1334`
`1335`	`1335`	`if (amqpReplyMethod == null)`
`1336`	`1336`	`{`
`1337`		`- EmitLine(" ModelSend(__req," + contentHeaderExpr + "," + contentBodyExpr + ");");`
	`1337`	`+ EmitLine($" ModelSend(__req,{contentHeaderExpr},{contentBodyExpr});");`
`1338`	`1338`	`}`
`1339`	`1339`	`else`
`1340`	`1340`	`{`
`@@ -1358,24 +1358,24 @@ public void EmitModelMethod(MethodInfo method)`
`1358`	`1358`	`string fieldPrefix = IsAmqpClass(method.ReturnType) ? "_" : "";`
`1359`	`1359`
`1360`	`1360`	`// No field mapping --> it's assumed to be a struct to fill in.`
`1361`		`- EmitLine(" " + method.ReturnType + " __result = new " + method.ReturnType + "();");`
	`1361`	`+ EmitLine($" {method.ReturnType} __result = new {method.ReturnType}();");`
`1362`	`1362`	`foreach (FieldInfo fi in method.ReturnType.GetFields())`
`1363`	`1363`	`{`
`1364`	`1364`	`if (Attribute(fi, typeof(AmqpFieldMappingAttribute)) is AmqpFieldMappingAttribute returnFieldMapping)`
`1365`	`1365`	`{`
`1366`		`- EmitLine(" __result." + fi.Name + " = __rep." + fieldPrefix + returnFieldMapping.m_fieldName + ";");`
	`1366`	`+ EmitLine($" __result.{fi.Name} = __rep.{fieldPrefix}{returnFieldMapping.m_fieldName};");`
`1367`	`1367`	`}`
`1368`	`1368`	`else`
`1369`	`1369`	`{`
`1370`		`- EmitLine(" __result." + fi.Name + " = __rep." + fieldPrefix + fi.Name + ";");`
	`1370`	`+ EmitLine($" __result.{fi.Name} = __rep.{fieldPrefix}{fi.Name};");`
`1371`	`1371`	`}`
`1372`	`1372`	`}`
`1373`	`1373`	`EmitLine(" return __result;");`
`1374`	`1374`	`}`
`1375`	`1375`	`else`
`1376`	`1376`	`{`
`1377`	`1377`	`// Field mapping --> return just the field we're interested in.`
`1378`		`- EmitLine(" return __rep._" + returnMapping.m_fieldName + ";");`
	`1378`	`+ EmitLine($" return __rep._{returnMapping.m_fieldName};");`
`1379`	`1379`	`}`
`1380`	`1380`	`}`
`1381`	`1381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ public override int GetHashCode()`
`281`	`281`	`/// </remarks>`
`282`	`282`	`public override string ToString()`
`283`	`283`	`{`
`284`		`- return "amqp://" + HostName + ":" + Port;`
	`284`	`+ return $"amqp://{HostName}:{Port}";`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public AmqpTimestamp(long unixTime) : this()`
`79`	`79`	`/// </summary>`
`80`	`80`	`public override string ToString()`
`81`	`81`	`{`
`82`		`- return "((time_t)" + UnixTime + ")";`
	`82`	`+ return $"((time_t){UnixTime})";`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ private void SetUri(Uri uri)`
`548`	`548`	`}`
`549`	`549`	`else`
`550`	`550`	`{`
`551`		`- throw new ArgumentException("Wrong scheme in AMQP URI: " + uri.Scheme);`
	`551`	`+ throw new ArgumentException($"Wrong scheme in AMQP URI: {uri.Scheme}");`
`552`	`552`	`}`
`553`	`553`	`string host = uri.Host;`
`554`	`554`	`if (!string.IsNullOrEmpty(host))`
`@@ -569,7 +569,7 @@ private void SetUri(Uri uri)`
`569`	`569`	`string[] userPass = userInfo.Split(':');`
`570`	`570`	`if (userPass.Length > 2)`
`571`	`571`	`{`
`572`		`- throw new ArgumentException("Bad user info in AMQP " + "URI: " + userInfo);`
	`572`	`+ throw new ArgumentException($"Bad user info in AMQP URI: {userInfo}");`
`573`	`573`	`}`
`574`	`574`	`UserName = UriDecode(userPass[0]);`
`575`	`575`	`if (userPass.Length == 2)`
`@@ -582,9 +582,7 @@ private void SetUri(Uri uri)`
`582`	`582`	`that has at least the path segment "/". */`
`583`	`583`	`if (uri.Segments.Length > 2)`
`584`	`584`	`{`
`585`		`- throw new ArgumentException("Multiple segments in " +`
`586`		`- "path of AMQP URI: " +`
`587`		`- string.Join(", ", uri.Segments));`
	`585`	`+ throw new ArgumentException($"Multiple segments in path of AMQP URI: {string.Join(", ", uri.Segments)}");`
`588`	`586`	`}`
`589`	`587`	`if (uri.Segments.Length == 2)`
`590`	`588`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public class PlainMechanism : IAuthMechanism`
`46`	`46`	`{`
`47`	`47`	`public byte[] handleChallenge(byte[] challenge, IConnectionFactory factory)`
`48`	`48`	`{`
`49`		`- return Encoding.UTF8.GetBytes("\0" + factory.UserName + "\0" + factory.Password);`
	`49`	`+ return Encoding.UTF8.GetBytes($"\0{factory.UserName}\0{factory.Password}");`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public static bool TryParse(string uriLikeString, out PublicationAddress result)`
`147`	`147`	`/// </summary>`
`148`	`148`	`public override string ToString()`
`149`	`149`	`{`
`150`		`- return ExchangeType + "://" + ExchangeName + "/" + RoutingKey;`
	`150`	`+ return $"{ExchangeType}://{ExchangeName}/{RoutingKey}";`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ public ShutdownReportEntry(string description, Exception exception)`
`66`	`66`
`67`	`67`	`public override string ToString()`
`68`	`68`	`{`
`69`		`- string output = "Message: " + Description;`
`70`		`- return (Exception != null) ? output + " Exception: " + Exception : output;`
	`69`	`+ string description = $"Message: {Description}";`
	`70`	`+ return (Exception != null) ? $"{description} Exception: {Exception}" : description;`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public override int GetHashCode()`
`110`	`110`	`/// </remarks>`
`111`	`111`	`public override string ToString()`
`112`	`112`	`{`
`113`		`- return Major + "-" + Minor;`
	`113`	`+ return $"{Major}-{Minor}";`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,8 +260,7 @@ public static IDictionary<string, object> DefaultClientProperties()`
`260`	`260`	`["version"] = Encoding.UTF8.GetBytes(s_version),`
`261`	`261`	`["platform"] = Encoding.UTF8.GetBytes(".NET"),`
`262`	`262`	`["copyright"] = Encoding.UTF8.GetBytes("Copyright (c) 2007-2020 VMware, Inc."),`
`263`		`- ["information"] = Encoding.UTF8.GetBytes("Licensed under the MPL. " +`
`264`		`- "See https://www.rabbitmq.com/")`
	`263`	`+ ["information"] = Encoding.UTF8.GetBytes("Licensed under the MPL. See https://www.rabbitmq.com/")`
`265`	`264`	`};`
`266`	`265`	`return table;`
`267`	`266`	`}`
`@@ -335,8 +334,7 @@ public void Close(ShutdownEventArgs reason, bool abort, TimeSpan timeout)`
`335`	`334`	`}`
`336`	`335`	`else`
`337`	`336`	`{`
`338`		`- LogCloseError("Couldn't close connection cleanly. "`
`339`		`- + "Socket closed unexpectedly", ioe);`
	`337`	`+ LogCloseError("Couldn't close connection cleanly. Socket closed unexpectedly", ioe);`
`340`	`338`	`}`
`341`	`339`	`}`
`342`	`340`	`}`
`@@ -378,14 +376,12 @@ public void ClosingLoop()`
`378`	`376`	`{`
`379`	`377`	`if (_model0.CloseReason == null)`
`380`	`378`	`{`
`381`		`- LogCloseError("Connection didn't close cleanly. "`
`382`		`- + "Socket closed unexpectedly", eose);`
	`379`	`+ LogCloseError("Connection didn't close cleanly. Socket closed unexpectedly", eose);`
`383`	`380`	`}`
`384`	`381`	`}`
`385`	`382`	`catch (IOException ioe)`
`386`	`383`	`{`
`387`		`- LogCloseError("Connection didn't close cleanly. "`
`388`		`- + "Socket closed unexpectedly", ioe);`
	`384`	`+ LogCloseError("Connection didn't close cleanly. Socket closed unexpectedly", ioe);`
`389`	`385`	`}`
`390`	`386`	`catch (Exception e)`
`391`	`387`	`{`
`@@ -447,7 +443,7 @@ public void HandleMainLoopException(ShutdownEventArgs reason)`
`447`	`443`	`}`
`448`	`444`
`449`	`445`	`OnShutdown();`
`450`		`- LogCloseError("Unexpected connection closure: " + reason, new Exception(reason.ToString()));`
	`446`	`+ LogCloseError($"Unexpected connection closure: {reason}", new Exception(reason.ToString()));`
`451`	`447`	`}`
`452`	`448`
`453`	`449`	`public bool HardProtocolExceptionHandler(HardProtocolException hpe)`
`@@ -470,8 +466,7 @@ public bool HardProtocolExceptionHandler(HardProtocolException hpe)`
`470`	`466`	`}`
`471`	`467`	`else`
`472`	`468`	`{`
`473`		`- LogCloseError("Hard Protocol Exception occured "`
`474`		`- + "while closing the connection", hpe);`
	`469`	`+ LogCloseError("Hard Protocol Exception occured while closing the connection", hpe);`
`475`	`470`	`}`
`476`	`471`
`477`	`472`	`return false;`
`@@ -1117,8 +1112,7 @@ void StartAndTune()`
`1117`	`1112`	`IAuthMechanismFactory mechanismFactory = _factory.AuthMechanismFactory(mechanisms);`
`1118`	`1113`	`if (mechanismFactory == null)`
`1119`	`1114`	`{`
`1120`		`- throw new IOException("No compatible authentication mechanism found - " +`
`1121`		`- "server offered [" + mechanismsString + "]");`
	`1115`	`+ throw new IOException($"No compatible authentication mechanism found - server offered [{mechanismsString}]");`
`1122`	`1116`	`}`
`1123`	`1117`	`IAuthMechanism mechanism = mechanismFactory.GetInstance();`
`1124`	`1118`	`byte[] challenge = null;`