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

core: clean up code deprecated in 1.1 (#2678)

This commit is contained in:
Łukasz Strzałkowski 2017-02-21 14:20:26 -08:00 committed by Kun Zhang
parent 63a77658fb
commit 70b482afad
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/main/java/io/grpc/ServerCall.java
View File

@ -32,8 +32,6 @@
package io.grpc; package io.grpc;
import com.google.errorprone.annotations.DoNotMock; import com.google.errorprone.annotations.DoNotMock;
import java.net.SocketAddress;
import javax.net.ssl.SSLSession;
/** /**
* Encapsulates a single call received from a remote client. Calls may not simply be unary * Encapsulates a single call received from a remote client. Calls may not simply be unary
@ -54,27 +52,6 @@ import javax.net.ssl.SSLSession;
*/ */
@DoNotMock("Use InProcessTransport and make a fake server instead") @DoNotMock("Use InProcessTransport and make a fake server instead")
public abstract class ServerCall<ReqT, RespT> { public abstract class ServerCall<ReqT, RespT> {
/**
* {@link Attributes.Key} for the remote address of server call attributes
* {@link ServerCall#getAttributes()}
*
* @deprecated use the equivalent {@link io.grpc.Grpc#TRANSPORT_ATTR_REMOTE_ADDR} instead
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1710")
@Deprecated
public static final Attributes.Key<SocketAddress> REMOTE_ADDR_KEY =
Grpc.TRANSPORT_ATTR_REMOTE_ADDR;
/**
* {@link Attributes.Key} for the SSL session of server call attributes
* {@link ServerCall#getAttributes()}
*
* @deprecated use the equivalent {@link io.grpc.Grpc#TRANSPORT_ATTR_SSL_SESSION} instead
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1710")
@Deprecated
public static final Attributes.Key<SSLSession> SSL_SESSION_KEY =
Grpc.TRANSPORT_ATTR_SSL_SESSION;
/** /**
* Callbacks for consuming incoming RPC messages. * Callbacks for consuming incoming RPC messages.
@ -238,15 +215,6 @@ public abstract class ServerCall<ReqT, RespT> {
return Attributes.EMPTY; return Attributes.EMPTY;
} }
/**
* @deprecated use {@link #getAttributes()} instead.
*/
@Deprecated
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1779")
public Attributes attributes() {
return getAttributes();
}
/** /**
* The {@link MethodDescriptor} for the call. * The {@link MethodDescriptor} for the call.
*/ */

4
testing/src/main/java/io/grpc/testing/DeadlineSubject.java
View File

@ -110,6 +110,8 @@ public final class DeadlineSubject extends ComparableSubject<DeadlineSubject, De
* @deprecated {@link Object#equals(Object)} is not supported on TolerantDeadlineComparison * @deprecated {@link Object#equals(Object)} is not supported on TolerantDeadlineComparison
* If you meant to compare deadlines, use {@link #of(Deadline)} instead. * If you meant to compare deadlines, use {@link #of(Deadline)} instead.
*/ */
// Deprecation used to signal visual warning in IDE for the unaware users.
// This method is created as a precaution and won't be removed as part of deprecation policy.
@Deprecated @Deprecated
@Override @Override
public boolean equals(@Nullable Object o) { public boolean equals(@Nullable Object o) {
@ -123,6 +125,8 @@ public final class DeadlineSubject extends ComparableSubject<DeadlineSubject, De
* @throws UnsupportedOperationException always * @throws UnsupportedOperationException always
* @deprecated {@link Object#hashCode()} is not supported on TolerantDeadlineComparison * @deprecated {@link Object#hashCode()} is not supported on TolerantDeadlineComparison
*/ */
// Deprecation used to signal visual warning in IDE for the unaware users.
// This method is created as a precaution and won't be removed as part of deprecation policy.
@Deprecated @Deprecated
@Override @Override
public int hashCode() { public int hashCode() {