Skip to content

JAVA-1980: Use covariant return types in RemoteEndpointAwareJdkSSLOptions.Builder methods #1139

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
adutra merged 1 commit into from
Dec 14, 2018
Merged

JAVA-1980: Use covariant return types in RemoteEndpointAwareJdkSSLOptions.Builder methods #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions changelog/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### 3.7.0 (In progress)

- [improvement] JAVA-2025: Include exception message in Abstract*Codec.accepts(null).
- [improvement] JAVA-1980: Use covariant return types in RemoteEndpointAwareJdkSSLOptions.Builder methods.


### 3.6.0
Expand Down
19 changes: 13 additions & 6 deletions driver-core/src/main/java/com/datastax/driver/core/RemoteEndpointAwareJdkSSLOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,21 @@ protected SSLEngine newSSLEngine(
return engine;
}

/** Helper class to build JDK-based SSL options. */
/** Helper class to build {@link RemoteEndpointAwareJdkSSLOptions} instances. */
public static class Builder extends JdkSSLOptions.Builder {

/**
* Builds a new instance based on the parameters provided to this builder.
*
* @return the new instance.
*/
@Override
public RemoteEndpointAwareJdkSSLOptions.Builder withSSLContext(SSLContext context) {
super.withSSLContext(context);
return this;
}

@Override
public RemoteEndpointAwareJdkSSLOptions.Builder withCipherSuites(String[] cipherSuites) {
super.withCipherSuites(cipherSuites);
return this;
}

@Override
public RemoteEndpointAwareJdkSSLOptions build() {
return new RemoteEndpointAwareJdkSSLOptions(context, cipherSuites);
Expand Down