grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: clarify security methods on channel and server

This commit is contained in:
Carl Mastrangelo 2017-07-07 10:56:54 -07:00 committed by GitHub
parent cbad906c0e
commit 3a5f115dbc
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/io/grpc/ManagedChannelBuilder.java
View File

@ -152,6 +152,8 @@ public abstract class ManagedChannelBuilder<T extends ManagedChannelBuilder<T>>
* *
* @param skipNegotiation @{code true} if there is a priori knowledge that the endpoint supports * @param skipNegotiation @{code true} if there is a priori knowledge that the endpoint supports
* plaintext, {@code false} if plaintext use must be negotiated. * plaintext, {@code false} if plaintext use must be negotiated.
*
* @throws UnsupportedOperationException if plaintext mode is not supported.
* @return this * @return this
* @since 1.0.0 * @since 1.0.0
*/ */

1
core/src/main/java/io/grpc/ServerBuilder.java
View File

@ -145,6 +145,7 @@ public abstract class ServerBuilder<T extends ServerBuilder<T>> {
* @param privateKey file containing the private key * @param privateKey file containing the private key
* *
* @return this * @return this
* @throws UnsupportedOperationException if the server does not support TLS.
* @since 1.0.0 * @since 1.0.0
*/ */
public abstract T useTransportSecurity(File certChain, File privateKey); public abstract T useTransportSecurity(File certChain, File privateKey);