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

netty: Allow specifying ProtocolNegotatiorFactory directly to Channels 

This will be the replacement for TransportCreationParamsFilterFactory
and matches somewhat what used to be done and what is done on
server-side.
This commit is contained in:
Eric Anderson 2018-09-24 16:09:36 -07:00 committed by GitHub
parent 70b1b1696a
commit acf80d63b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netty/src/main/java/io/grpc/netty/InternalNettyChannelBuilder.java
View File

@ -63,6 +63,19 @@ public final class InternalNettyChannelBuilder {
builder.setDynamicParamsFactory(factory); builder.setDynamicParamsFactory(factory);
} }
/** A class that provides a Netty handler to control protocol negotiation. */
public interface ProtocolNegotiatorFactory
extends NettyChannelBuilder.ProtocolNegotiatorFactory {}
/**
* Sets the {@link ProtocolNegotiatorFactory} to be used. Overrides any specified negotiation type
* and {@code SslContext}.
*/
public static void setProtocolNegotiatorFactory(
NettyChannelBuilder builder, ProtocolNegotiatorFactory protocolNegotiator) {
builder.protocolNegotiatorFactory(protocolNegotiator);
}
public static void setStatsEnabled(NettyChannelBuilder builder, boolean value) { public static void setStatsEnabled(NettyChannelBuilder builder, boolean value) {
builder.setStatsEnabled(value); builder.setStatsEnabled(value);
} }

34
netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java
View File

@ -81,6 +81,7 @@ public final class NettyChannelBuilder
private long keepAliveTimeoutNanos = DEFAULT_KEEPALIVE_TIMEOUT_NANOS; private long keepAliveTimeoutNanos = DEFAULT_KEEPALIVE_TIMEOUT_NANOS;
private boolean keepAliveWithoutCalls; private boolean keepAliveWithoutCalls;
private TransportCreationParamsFilterFactory dynamicParamsFactory; private TransportCreationParamsFilterFactory dynamicParamsFactory;
private ProtocolNegotiatorFactory protocolNegotiatorFactory;
/** /**
* Creates a new builder with the given server address. This factory method is primarily intended * Creates a new builder with the given server address. This factory method is primarily intended
@ -334,16 +335,20 @@ public final class NettyChannelBuilder
TransportCreationParamsFilterFactory transportCreationParamsFilterFactory = TransportCreationParamsFilterFactory transportCreationParamsFilterFactory =
dynamicParamsFactory; dynamicParamsFactory;
if (transportCreationParamsFilterFactory == null) { if (transportCreationParamsFilterFactory == null) {
SslContext localSslContext = sslContext; ProtocolNegotiator negotiator;
if (negotiationType == NegotiationType.TLS && localSslContext == null) { if (protocolNegotiatorFactory != null) {
try { negotiator = protocolNegotiatorFactory.buildProtocolNegotiator();
localSslContext = GrpcSslContexts.forClient().build(); } else {
} catch (SSLException ex) { SslContext localSslContext = sslContext;
throw new RuntimeException(ex); if (negotiationType == NegotiationType.TLS && localSslContext == null) {
try {
localSslContext = GrpcSslContexts.forClient().build();
} catch (SSLException ex) {
throw new RuntimeException(ex);
}
} }
negotiator = createProtocolNegotiatorByType(negotiationType, localSslContext);
} }
ProtocolNegotiator negotiator =
createProtocolNegotiatorByType(negotiationType, localSslContext);
transportCreationParamsFilterFactory = transportCreationParamsFilterFactory =
new DefaultNettyTransportCreationParamsFilterFactory(negotiator); new DefaultNettyTransportCreationParamsFilterFactory(negotiator);
} }
@ -413,6 +418,11 @@ public final class NettyChannelBuilder
this.dynamicParamsFactory = checkNotNull(factory, "factory"); this.dynamicParamsFactory = checkNotNull(factory, "factory");
} }
void protocolNegotiatorFactory(ProtocolNegotiatorFactory protocolNegotiatorFactory) {
this.protocolNegotiatorFactory
= Preconditions.checkNotNull(protocolNegotiatorFactory, "protocolNegotiatorFactory");
}
@Override @Override
protected void setTracingEnabled(boolean value) { protected void setTracingEnabled(boolean value) {
super.setTracingEnabled(value); super.setTracingEnabled(value);
@ -454,6 +464,14 @@ public final class NettyChannelBuilder
ProtocolNegotiator getProtocolNegotiator(); ProtocolNegotiator getProtocolNegotiator();
} }
interface ProtocolNegotiatorFactory {
/**
* Returns a ProtocolNegotatior instance configured for this Builder. This method is called
* during {@code ManagedChannelBuilder#build()}.
*/
ProtocolNegotiator buildProtocolNegotiator();
}
/** /**
* Creates Netty transports. Exposed for internal use, as it should be private. * Creates Netty transports. Exposed for internal use, as it should be private.
*/ */