Skip to content

cronet: delay cast to ExperimentalCronetEngine #4230

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
merged 1 commit into from
Mar 16, 2018
Merged

cronet: delay cast to ExperimentalCronetEngine #4230

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
21 changes: 13 additions & 8 deletions cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public abstract BidirectionalStream.Builder newBidirectionalStreamBuilder(
/** Creates a new builder for the given server host, port and CronetEngine. */
public static CronetChannelBuilder forAddress(String host, int port, CronetEngine cronetEngine) {
Preconditions.checkNotNull(cronetEngine, "cronetEngine");
return new CronetChannelBuilder(host, port, (ExperimentalCronetEngine) cronetEngine);
return new CronetChannelBuilder(host, port, cronetEngine);
}

/**
Expand All @@ -73,7 +73,7 @@ public static CronetChannelBuilder forAddress(String name, int port) {
throw new UnsupportedOperationException("call forAddress(String, int, CronetEngine) instead");
}

private final ExperimentalCronetEngine cronetEngine;
private final CronetEngine cronetEngine;

private boolean alwaysUsePut = false;

Expand All @@ -84,7 +84,7 @@ public static CronetChannelBuilder forAddress(String name, int port) {
private boolean trafficStatsUidSet;
private int trafficStatsUid;

private CronetChannelBuilder(String host, int port, ExperimentalCronetEngine cronetEngine) {
private CronetChannelBuilder(String host, int port, CronetEngine cronetEngine) {
super(
InetSocketAddress.createUnresolved(host, port),
GrpcUtil.authorityFromHostAndPort(host, port));
Expand Down Expand Up @@ -224,14 +224,14 @@ public void close() {
* StreamBuilderFactory impl that applies TrafficStats tags to stream builders that are produced.
*/
private static class TaggingStreamFactory extends StreamBuilderFactory {
private final ExperimentalCronetEngine cronetEngine;
private final CronetEngine cronetEngine;
private final boolean trafficStatsTagSet;
private final int trafficStatsTag;
private final boolean trafficStatsUidSet;
private final int trafficStatsUid;

TaggingStreamFactory(
ExperimentalCronetEngine cronetEngine,
CronetEngine cronetEngine,
boolean trafficStatsTagSet,
int trafficStatsTag,
boolean trafficStatsUidSet,
Expand All @@ -247,9 +247,14 @@ private static class TaggingStreamFactory extends StreamBuilderFactory {
public BidirectionalStream.Builder newBidirectionalStreamBuilder(
String url, BidirectionalStream.Callback callback, Executor executor) {
ExperimentalBidirectionalStream.Builder builder =
cronetEngine.newBidirectionalStreamBuilder(url, callback, executor);
if (trafficStatsTagSet) builder.setTrafficStatsTag(trafficStatsTag);
if (trafficStatsUidSet) builder.setTrafficStatsUid(trafficStatsUid);
((ExperimentalCronetEngine) cronetEngine)
.newBidirectionalStreamBuilder(url, callback, executor);
if (trafficStatsTagSet) {
builder.setTrafficStatsTag(trafficStatsTag);
}
if (trafficStatsUidSet) {
builder.setTrafficStatsUid(trafficStatsUid);
}
return builder;
}
}
Expand Down