Skip to content

core: delete deprecated affinity API. #3026

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
zhangkun83 merged 1 commit into from
May 19, 2017
Merged

core: delete deprecated affinity API. #3026

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
28 changes: 0 additions & 28 deletions core/src/main/java/io/grpc/CallOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ public final class CallOptions {
@Nullable
private CallCredentials credentials;

private Attributes affinity = Attributes.EMPTY;

@Nullable
private String compressorName;

Expand Down Expand Up @@ -156,19 +154,6 @@ public Deadline getDeadline() {
return deadline;
}

/**
* Returns a new {@code CallOptions} with attributes for affinity-based routing.
*
* @deprecated use {@link #withOption(Key, Object)}.
*/
@Deprecated
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1766")
public CallOptions withAffinity(Attributes affinity) {
CallOptions newOptions = new CallOptions(this);
newOptions.affinity = Preconditions.checkNotNull(affinity, "affinity");
return newOptions;
}

/**
* Enables <a href="https://github.com/grpc/grpc/blob/master/doc/wait-for-ready.md">
* 'wait for ready'</a> feature for the call. 'Fail fast' is the default option for gRPC calls
Expand All @@ -190,17 +175,6 @@ public CallOptions withoutWaitForReady() {
return newOptions;
}

/**
* Returns the attributes for affinity-based routing.
*
* @deprecated use {@link #getOption(Key)}.
*/
@Deprecated
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1766")
public Attributes getAffinity() {
return affinity;
}

/**
* Returns the compressor's name.
*/
Expand Down Expand Up @@ -423,7 +397,6 @@ private CallOptions(CallOptions other) {
deadline = other.deadline;
authority = other.authority;
credentials = other.credentials;
affinity = other.affinity;
executor = other.executor;
compressorName = other.compressorName;
customOptions = other.customOptions;
Expand All @@ -439,7 +412,6 @@ public String toString() {
.add("deadline", deadline)
.add("authority", authority)
.add("callCredentials", credentials)
.add("affinity", affinity)
.add("executor", executor != null ? executor.getClass() : null)
.add("compressorName", compressorName)
.add("customOptions", Arrays.deepToString(customOptions))
Expand Down