Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions api/src/main/java/io/grpc/CallCredentials.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,19 @@ public abstract void applyRequestMetadata(
RequestInfo requestInfo, Executor appExecutor, CallCredentials.MetadataApplier applier);

/**
* Should be a noop but never called; tries to make it clearer to implementors that they may break
* in the future.
* With this class now being stable this method moves from an abstract one to a normal one with
* a no-op implementation. This method is marked deprecated to allow extenders time to remove the
* method before it is removed here.
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1914")
public abstract void thisUsesUnstableApi();
@Deprecated
public void thisUsesUnstableApi() {
}

/**
* The outlet of the produced headers. Not thread-safe.
*
* <p>Exactly one of its methods must be called to make the RPC proceed.
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1914")
public abstract static class MetadataApplier {
/**
* Called when headers are successfully generated. They will be merged into the original
Expand All @@ -84,7 +85,6 @@ public abstract static class MetadataApplier {
/**
* The request-related information passed to {@code CallCredentials.applyRequestMetadata()}.
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1914")
public abstract static class RequestInfo {
/**
* The method descriptor of this RPC.
Expand Down
3 changes: 0 additions & 3 deletions api/src/main/java/io/grpc/CompositeCallCredentials.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ public void applyRequestMetadata(
new WrappingMetadataApplier(requestInfo, appExecutor, applier, Context.current()));
}

@Override
public void thisUsesUnstableApi() {}

private final class WrappingMetadataApplier extends MetadataApplier {
private final RequestInfo requestInfo;
private final Executor appExecutor;
Expand Down
2 changes: 0 additions & 2 deletions api/src/test/java/io/grpc/CompositeCallCredentialsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,5 @@ public FakeCallCredentials(Status status) {
applier.fail(status);
}
}

@Override public void thisUsesUnstableApi() {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ public GoogleAuthLibraryCallCredentials(Credentials creds) {
}
}

@Override
public void thisUsesUnstableApi() {}

@Override
public void applyRequestMetadata(
RequestInfo info, Executor appExecutor, final MetadataApplier applier) {
Expand Down
2 changes: 0 additions & 2 deletions core/src/test/java/io/grpc/internal/FakeCallCredentials.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,4 @@ public void applyRequestMetadata(
CallCredentials.MetadataApplier applier) {
applier.apply(headers);
}

@Override public void thisUsesUnstableApi() {}
}