Fix for endpoint format string regression (#42)

* Fix for endpoint format string regression

And additional unit test to catch it

* Fix && which should have been || .. thanks @alienzach!

Author: njhill

src/main/java/com/ibm/etcd/client/config/EtcdClusterConfig.java

@@ -103,11 +103,10 @@ private EtcdClient newClient() throws IOException, CertificateException {
         TlsMode ssl = tlsMode;
         if (ssl == TlsMode.AUTO || ssl == null) {
             String ep = endpointList.get(0);
-            if (ep.startsWith("http://")) ssl = TlsMode.PLAINTEXT;
-            else if (certificate != null || clientCertificate != null
-                    || ep.startsWith("https://")) {
-                ssl = TlsMode.TLS;
-            }
+            ssl = ep.startsWith("https://")
+                    || (!ep.startsWith("http://")
+                            && (certificate != null || clientCertificate != null))
+                    ? TlsMode.TLS : TlsMode.PLAINTEXT;
         }
         if (ssl == TlsMode.PLAINTEXT) {
             builder.withPlainText();

src/test/java/com/ibm/etcd/client/JsonConfigTest.java

@@ -54,6 +54,12 @@ public void testBasicConfig() throws Exception {
         runBasicTests(EtcdClusterConfig.fromJson(json));
     }
 
+    @Test
+    public void testBasicConfigNoScheme() throws Exception {
+        ByteSource json = makeJson("localhost:2379", null, null, null);
+        runBasicTests(EtcdClusterConfig.fromJson(json));
+    }
+
     @Test
     public void testSslConfig() throws Exception {
         ByteSource json = makeJson("https://localhost:2360", EtcdTestSuite.serverCert, null, null);