Commit dd2dc21
authored
api: Stabilize io.grpc.CallCredentials (grpc#10208)
1 parent 478f30e commit dd2dc21
5 files changed
Lines changed: 6 additions & 16 deletions
File tree
- api/src
- main/java/io/grpc
- test/java/io/grpc
- auth/src/main/java/io/grpc/auth
- core/src/test/java/io/grpc/internal
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -56,18 +56,19 @@ public abstract void applyRequestMetadata( | |||
| 56 | 56 | RequestInfo requestInfo, Executor appExecutor, CallCredentials.MetadataApplier applier); | |
| 57 | 57 | ||
| 58 | 58 | /** | |
| 59 | - * Should be a noop but never called; tries to make it clearer to implementors that they may break | ||
| 60 | - * in the future. | ||
| 59 | + * With this class now being stable this method moves from an abstract one to a normal one with | ||
| 60 | + * a no-op implementation. This method is marked deprecated to allow extenders time to remove the | ||
| 61 | + * method before it is removed here. | ||
| 61 | 62 | */ | |
| 62 | - @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1914") | ||
| 63 | - public abstract void thisUsesUnstableApi(); | ||
| 63 | + @Deprecated | ||
| 64 | + public void thisUsesUnstableApi() { | ||
| 65 | + } | ||
| 64 | 66 | ||
| 65 | 67 | /** | |
| 66 | 68 | * The outlet of the produced headers. Not thread-safe. | |
| 67 | 69 | * | |
| 68 | 70 | * <p>Exactly one of its methods must be called to make the RPC proceed. | |
| 69 | 71 | */ | |
| 70 | - @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1914") | ||
| 71 | 72 | public abstract static class MetadataApplier { | |
| 72 | 73 | /** | |
| 73 | 74 | * Called when headers are successfully generated. They will be merged into the original | |
@@ -84,7 +85,6 @@ public abstract static class MetadataApplier { | |||
| 84 | 85 | /** | |
| 85 | 86 | * The request-related information passed to {@code CallCredentials.applyRequestMetadata()}. | |
| 86 | 87 | */ | |
| 87 | - @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1914") | ||
| 88 | 88 | public abstract static class RequestInfo { | |
| 89 | 89 | /** | |
| 90 | 90 | * The method descriptor of this RPC. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,9 +40,6 @@ public void applyRequestMetadata( | |||
| 40 | 40 | new WrappingMetadataApplier(requestInfo, appExecutor, applier, Context.current())); | |
| 41 | 41 | } | |
| 42 | 42 | ||
| 43 | - @Override | ||
| 44 | - public void thisUsesUnstableApi() {} | ||
| 45 | - | ||
| 46 | 43 | private final class WrappingMetadataApplier extends MetadataApplier { | |
| 47 | 44 | private final RequestInfo requestInfo; | |
| 48 | 45 | private final Executor appExecutor; | |
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -109,7 +109,5 @@ public FakeCallCredentials(Status status) { | |||
| 109 | 109 | applier.fail(status); | |
| 110 | 110 | } | |
| 111 | 111 | } | |
| 112 | - | ||
| 113 | - @Override public void thisUsesUnstableApi() {} | ||
| 114 | 112 | } | |
| 115 | 113 | } | |
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -94,9 +94,6 @@ public GoogleAuthLibraryCallCredentials(Credentials creds) { | |||
| 94 | 94 | } | |
| 95 | 95 | } | |
| 96 | 96 | ||
| 97 | - @Override | ||
| 98 | - public void thisUsesUnstableApi() {} | ||
| 99 | - | ||
| 100 | 97 | @Override | |
| 101 | 98 | public void applyRequestMetadata( | |
| 102 | 99 | RequestInfo info, Executor appExecutor, final MetadataApplier applier) { | |
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,6 +38,4 @@ public void applyRequestMetadata( | |||
| 38 | 38 | CallCredentials.MetadataApplier applier) { | |
| 39 | 39 | applier.apply(headers); | |
| 40 | 40 | } | |
| 41 | - | ||
| 42 | - @Override public void thisUsesUnstableApi() {} | ||
| 43 | 41 | } | |
0 commit comments