Skip to content

Refactored HandshakeProtocol class #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotJustAnna merged 4 commits into from
Mar 7, 2020
Merged

Refactored HandshakeProtocol class #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b902aff
Refactored HandshakeProtocol class, turned Crypto class into inner cl…
Mar 7, 2020
bb9ca0f
Inlined the entire Crypto class in the Handshake inner classes
Mar 7, 2020
3598a43
Fixed compile error
Mar 7, 2020
1ba081a
Made certFile parameter not-null
Mar 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/com/rethinkdb/net/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,9 +540,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) {
Expand Down
161 changes: 0 additions & 161 deletions src/main/java/com/rethinkdb/net/Crypto.java
View file
Open in desktop

This file was deleted.

Loading