Skip to content

Revert "Revert "all: remove deprecated usePlaintext(boolean)"" #6440

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
Nov 19, 2019
Merged

Revert "Revert "all: remove deprecated usePlaintext(boolean)"" #6440

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
10 changes: 0 additions & 10 deletions api/src/main/java/io/grpc/ForwardingChannelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,6 @@ public T overrideAuthority(String authority) {
return thisT();
}

/**
* @deprecated use {@link #usePlaintext()} instead.
*/
@Override
@Deprecated
public T usePlaintext(boolean skipNegotiation) {
delegate().usePlaintext(skipNegotiation);
return thisT();
}

@Override
public T usePlaintext() {
delegate().usePlaintext();
Expand Down
21 changes: 0 additions & 21 deletions api/src/main/java/io/grpc/ManagedChannelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,27 +174,6 @@ public T blockingExecutor(Executor executor) {
*/
public abstract T overrideAuthority(String authority);

/**
* Use of a plaintext connection to the server. By default a secure connection mechanism
* such as TLS will be used.
*
* <p>Should only be used for testing or for APIs where the use of such API or the data
* exchanged is not sensitive.
*
* @param skipNegotiation @{code true} if there is a priori knowledge that the endpoint supports
* plaintext, {@code false} if plaintext use must be negotiated.
* @deprecated Use {@link #usePlaintext()} instead.
*
* @throws UnsupportedOperationException if plaintext mode is not supported.
* @return this
* @since 1.0.0
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1772")
@Deprecated
public T usePlaintext(boolean skipNegotiation) {
throw new UnsupportedOperationException();
}

/**
* Use of a plaintext connection to the server. By default a secure connection mechanism
* such as TLS will be used.
Expand Down
11 changes: 0 additions & 11 deletions core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,6 @@ public InProcessChannelBuilder useTransportSecurity() {
return this;
}

/**
* Does nothing.
*
* @deprecated use {@link #usePlaintext()} instead.
*/
@Override
@Deprecated
public InProcessChannelBuilder usePlaintext(boolean skipNegotiation) {
return this;
}

/**
* Does nothing.
*/
Expand Down
8 changes: 0 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 @@ -127,14 +127,6 @@ public final CronetChannelBuilder alwaysUsePut(boolean enable) {
return this;
}

/**
* Not supported for building cronet channel.
*/
@Override
public final CronetChannelBuilder usePlaintext(boolean skipNegotiation) {
throw new IllegalArgumentException("Plaintext not currently supported");
}

/**
* Sets {@link android.net.TrafficStats} tag to use when accounting socket traffic caused by this
* channel. See {@link android.net.TrafficStats} for more information. If no tag is set (e.g. this
Expand Down
17 changes: 0 additions & 17 deletions netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,23 +289,6 @@ public NettyChannelBuilder maxInboundMetadataSize(int bytes) {
return this;
}

/**
* Equivalent to using {@link #negotiationType(NegotiationType)} with {@code PLAINTEXT} or
* {@code PLAINTEXT_UPGRADE}.
*
* @deprecated use {@link #usePlaintext()} instead.
*/
@Override
@Deprecated
public NettyChannelBuilder usePlaintext(boolean skipNegotiation) {
if (skipNegotiation) {
negotiationType(NegotiationType.PLAINTEXT);
} else {
negotiationType(NegotiationType.PLAINTEXT_UPGRADE);
}
return this;
}

/**
* Equivalent to using {@link #negotiationType(NegotiationType)} with {@code PLAINTEXT}.
*/
Expand Down
16 changes: 0 additions & 16 deletions okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,22 +305,6 @@ public final OkHttpChannelBuilder connectionSpec(
return this;
}

/**
* Equivalent to using {@link #negotiationType} with {@code PLAINTEXT}.
*
* @deprecated use {@link #usePlaintext()} instead.
*/
@Override
@Deprecated
public final OkHttpChannelBuilder usePlaintext(boolean skipNegotiation) {
if (skipNegotiation) {
negotiationType(io.grpc.okhttp.NegotiationType.PLAINTEXT);
} else {
throw new IllegalArgumentException("Plaintext negotiation not currently supported");
}
return this;
}

/** Sets the negotiation type for the HTTP/2 connection to plaintext. */
@Override
public final OkHttpChannelBuilder usePlaintext() {
Expand Down