Moved DefaultAmqpSslProtocols from AmqpTcpEndpoint to ConnectionFactory as DefaultAmqpUriSslProtocols

Added per-instance AmqpUriSslProtocols to ConnectionFactory.

Author: paulomorgado

projects/client/RabbitMQ.Client/src/client/api/AmqpTcpEndpoint.cs

@@ -40,7 +40,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Security.Authentication;
 using System.Text.RegularExpressions;
 
 namespace RabbitMQ.Client
@@ -63,7 +62,6 @@ public class AmqpTcpEndpoint// : ICloneable
         /// </summary>
         public const int DefaultAmqpSslPort = 5671;
 
-
         /// <summary>
         /// Indicates that the default port for the protocol should be used.
         /// </summary>
@@ -140,11 +138,6 @@ public AmqpTcpEndpoint CloneWithHostname(string hostname)
             return new AmqpTcpEndpoint(hostname, _port, Ssl);
         }
 
-        /// <summary>
-        /// The default Amqp SSL protocols.
-        /// </summary>
-        public static SslProtocols DefaultAmqpSslProtocols { get; set; } = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12;
-
         /// <summary>
         /// Retrieve or set the hostname of this <see cref="AmqpTcpEndpoint"/>.
         /// </summary>
@@ -181,7 +174,7 @@ public IProtocol Protocol
         /// <summary>
         /// Used to force the address family of the endpoint
         /// </summary>
-        public System.Net.Sockets.AddressFamily AddressFamily { get; set; }
+        public System.Net.Sockets.AddressFamily AddressFamily {get; set;}
 
         /// <summary>
         /// Retrieve the SSL options for this AmqpTcpEndpoint. If not set, null is returned.
@@ -235,7 +228,7 @@ public static AmqpTcpEndpoint Parse(string address)
         /// </remarks>
         public static AmqpTcpEndpoint[] ParseMultiple(string addresses)
         {
-            string[] partsArr = addresses.Split(new[] { ',' });
+            string[] partsArr = addresses.Split(new[] {','});
             var results = new List<AmqpTcpEndpoint>();
             foreach (string partRaw in partsArr)
             {

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs

@@ -45,6 +45,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Linq;
+using System.Security.Authentication;
 
 #if !NETFX_CORE
 
@@ -141,6 +142,18 @@ public class ConnectionFactory : ConnectionFactoryBase, IAsyncConnectionFactory
         /// <remarks> PLEASE KEEP THIS MATCHING THE DOC ABOVE.</remarks>
         public const string DefaultVHost = "/";
 
+        /// <summary>
+        /// The default AMQP URI SSL protocols.
+        /// </summary>
+        public static SslProtocols DefaultAmqpUriSslProtocols { get; set; } =
+            SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12;
+
+        /// <summary>
+        /// The AMQP URI SSL protocols.
+        /// </summary>
+        public SslProtocols AmqpUriSslProtocols { get; set; } =
+            DefaultAmqpUriSslProtocols;
+
         /// <summary>
         ///  Default SASL auth mechanisms to use.
         /// </summary>
@@ -517,7 +530,7 @@ private void SetUri(Uri uri)
             else if (string.Equals("amqps", uri.Scheme, StringComparison.OrdinalIgnoreCase))
             {
                 Ssl.Enabled = true;
-                Ssl.Version = AmqpTcpEndpoint.DefaultAmqpSslProtocols;
+                Ssl.Version = AmqpUriSslProtocols;
 #if !(NETFX_CORE)
                 Ssl.AcceptablePolicyErrors = SslPolicyErrors.RemoteCertificateNameMismatch;
 #endif