Merge pull request #32 from rethinkdb/refactor/handshakes

Refactored HandshakeProtocol class

Author: AdrianTodt

src/main/java/com/rethinkdb/net/Connection.java

@@ -542,9 +542,8 @@ public Builder(@NotNull URI uri) {
             return this;
         }
 
-        public @NotNull Builder certFile(@Nullable InputStream val) {
-            sslContext = Crypto.readCertFile(val);
-            return this;
+        public @NotNull Builder certFile(@NotNull InputStream val) {
+            return sslContext(Internals.readCertFile(val));
         }
 
         public @NotNull Builder sslContext(@Nullable SSLContext val) {