Skip to content
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

Jump to bottom

api, core, services: make ProtoReflectionService interceptor compatible #6967

Merged
merged 16 commits into from May 1, 2020
Merged

api, core, services: make ProtoReflectionService interceptor compatible #6967

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4f7462d
Eliminate InternalNotifyOnServerBuilder interface.
voidzcy Apr 23, 2020
7d8547a
Expose server reference on ServerCall interface.
voidzcy Apr 23, 2020
1952927
Add getServer() API implementation to subclasses.
voidzcy Apr 23, 2020
5b51f87
Obtain server via a server interceptor.
voidzcy Apr 23, 2020
9273cdd
Eliminate callback for server build.
voidzcy Apr 23, 2020
d268012
Add default implementation for ServerCall.getServer().
voidzcy Apr 29, 2020
933d099
Add ExperimentalApi annotation.
voidzcy Apr 29, 2020
130adde
Remove comment requirement for using one reflection service instance …
voidzcy Apr 29, 2020
f50789b
Add a simple test case covering a single reflection service instance …
voidzcy Apr 30, 2020
acb2a44
Use explicit lock
voidzcy Apr 30, 2020
19fd730
Put server into Context.
voidzcy Apr 30, 2020
b0d15a6
Add an internal accessor for accessing the Context key.
voidzcy Apr 30, 2020
d3935fa
Change ProtoReflectionService to obtain Server from Context.
voidzcy Apr 30, 2020
e4a6b9b
Revert changes for exposing Server via ServerCall.
voidzcy Apr 30, 2020
9a979c5
Move the Context key definition and accessor to io.grpc.
voidzcy Apr 30, 2020
6277cac
Makee context key package private.
voidzcy Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion alts/src/test/java/io/grpc/alts/AuthorizationUtilTest.java
View file
Open in desktop
Expand Up @@ -22,7 +22,6 @@
import io.grpc.Attributes;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.Server;
import io.grpc.ServerCall;
import io.grpc.Status;
import io.grpc.alts.internal.AltsAuthContext;
Expand Down
3 changes: 1 addition & 2 deletions services/src/main/java/io/grpc/protobuf/services/ProtoReflectionService.java
View file
Open in desktop
Expand Up @@ -77,8 +77,7 @@ public final class ProtoReflectionService extends ServerReflectionGrpc.ServerRef
private ProtoReflectionService() {}

/**
* Creates a instance of {@link ProtoReflectionService}. Intended usage is one instance per
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh. I missed this before. Of course it was already limited to one server. Sorry for asking for the WeakHashMap, although it is nicer that way. I guess previously we'd have just returned wrong data? Yeah, using the WeakHashMap is much nicer for users.

* {@link Server}.
* Creates a instance of {@link ProtoReflectionService}.
*/
public static ServerServiceDefinition newInstance() {
AtomicReference<Server> serverCaptor = new AtomicReference<>();
Expand Down
1 change: 0 additions & 1 deletion stub/src/test/java/io/grpc/stub/ServerCallsTest.java
View file
Open in desktop
Expand Up @@ -28,7 +28,6 @@
import io.grpc.ManagedChannel;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.Server;
import io.grpc.ServerCall;
import io.grpc.ServerCallHandler;
import io.grpc.ServerServiceDefinition;
Expand Down