This method is a pure function => make it static

michaelklishin · michaelklishin · commit bd70ec9784b1 · 2016-04-15T21:12:57.000+03:00
diff --git a/src/main/java/com/rabbitmq/client/ConnectionFactory.java b/src/main/java/com/rabbitmq/client/ConnectionFactory.java
@@ -590,7 +590,7 @@ public void useSslProtocol(SSLContext context) {
         setSocketFactory(context.getSocketFactory());
     }
 
-    public String computeDefaultTlsProcotol(String [] supportedProtocols) {
+    public static String computeDefaultTlsProcotol(String[] supportedProtocols) {
         if(supportedProtocols != null) {
             for (String supportedProtocol : supportedProtocols) {
                 if(PREFERED_TLS_PROTOCOL.equalsIgnoreCase(supportedProtocol)) {
diff --git a/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java b/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java
@@ -10,19 +10,19 @@ public class ConnectionFactoryDefaultTlsVersion extends TestCase {
 
     public void testDefaultTlsVersionJdk16ShouldTakeFallback() {
         String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1"};
-        String tlsProtocol = connectionFactory.computeDefaultTlsProcotol(supportedProtocols);
+        String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols);
         Assert.assertEquals("TLSv1",tlsProtocol);
     }
 
     public void testDefaultTlsVersionJdk17ShouldTakePrefered() {
         String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"};
-        String tlsProtocol = connectionFactory.computeDefaultTlsProcotol(supportedProtocols);
+        String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols);
         Assert.assertEquals("TLSv1.2",tlsProtocol);
     }
 
     public void testDefaultTlsVersionJdk18ShouldTakePrefered() {
         String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"};
-        String tlsProtocol = connectionFactory.computeDefaultTlsProcotol(supportedProtocols);
+        String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols);
         Assert.assertEquals("TLSv1.2",tlsProtocol);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ public void useSslProtocol(SSLContext context) {`
`590`	`590`	`setSocketFactory(context.getSocketFactory());`
`591`	`591`	`}`
`592`	`592`
`593`		`- public String computeDefaultTlsProcotol(String [] supportedProtocols) {`
	`593`	`+ public static String computeDefaultTlsProcotol(String[] supportedProtocols) {`
`594`	`594`	`if(supportedProtocols != null) {`
`595`	`595`	`for (String supportedProtocol : supportedProtocols) {`
`596`	`596`	`if(PREFERED_TLS_PROTOCOL.equalsIgnoreCase(supportedProtocol)) {`
Original file line number	Diff line number	Diff line change
`@@ -10,19 +10,19 @@ public class ConnectionFactoryDefaultTlsVersion extends TestCase {`
`10`	`10`
`11`	`11`	`public void testDefaultTlsVersionJdk16ShouldTakeFallback() {`
`12`	`12`	`String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1"};`
`13`		`- String tlsProtocol = connectionFactory.computeDefaultTlsProcotol(supportedProtocols);`
	`13`	`+ String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols);`
`14`	`14`	`Assert.assertEquals("TLSv1",tlsProtocol);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public void testDefaultTlsVersionJdk17ShouldTakePrefered() {`
`18`	`18`	`String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"};`
`19`		`- String tlsProtocol = connectionFactory.computeDefaultTlsProcotol(supportedProtocols);`
	`19`	`+ String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols);`
`20`	`20`	`Assert.assertEquals("TLSv1.2",tlsProtocol);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public void testDefaultTlsVersionJdk18ShouldTakePrefered() {`
`24`	`24`	`String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"};`
`25`		`- String tlsProtocol = connectionFactory.computeDefaultTlsProcotol(supportedProtocols);`
	`25`	`+ String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols);`
`26`	`26`	`Assert.assertEquals("TLSv1.2",tlsProtocol);`
`27`	`27`	`}`
`28`	`28`