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

Add support for gRPC reflection #2822

Merged
merged 4 commits into from
Mar 30, 2021
Merged

Add support for gRPC reflection #2822

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d420a4
Publish snapshots to Synoki Nexus
aseovic May 20, 2020
8fab4d1
gRPC reflection support
aseovic Mar 2, 2021
ee59e3c
gRPC reflection support
aseovic Mar 2, 2021
9fef66c
Copyright fixes
aseovic Mar 5, 2021
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
11 changes: 9 additions & 2 deletions grpc/server/src/main/java/io/helidon/grpc/server/BindableServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

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

This is wrong copyright format. Please use 2019, 2021.

*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -33,6 +33,7 @@
import io.grpc.ServerCallHandler;
import io.grpc.ServerInterceptor;
import io.grpc.ServerServiceDefinition;
import io.grpc.protobuf.ProtoFileDescriptorSupplier;
import io.grpc.stub.StreamObserver;

/**
Expand Down Expand Up @@ -72,8 +73,14 @@ static BindableServiceImpl create(ServiceDescriptor descriptor, PriorityBag<Serv
@SuppressWarnings("unchecked")
@Override
public ServerServiceDefinition bindService() {
ServerServiceDefinition.Builder builder = ServerServiceDefinition.builder(descriptor.name());
io.grpc.ServiceDescriptor.Builder serviceDescriptorBuilder = io.grpc.ServiceDescriptor.newBuilder(descriptor.name());
if (descriptor.proto() != null) {
serviceDescriptorBuilder.setSchemaDescriptor((ProtoFileDescriptorSupplier) descriptor::proto);
}
descriptor.methods()
.forEach(method -> serviceDescriptorBuilder.addMethod(method.descriptor()));

ServerServiceDefinition.Builder builder = ServerServiceDefinition.builder(serviceDescriptorBuilder.build());
descriptor.methods()
.forEach(method -> builder.addMethod(method.descriptor(), wrapCallHandler(method)));

Expand Down
3 changes: 2 additions & 1 deletion grpc/server/src/main/java/io/helidon/grpc/server/GrpcServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2021, Oracle and/or its affiliates.
aseovic marked this conversation as resolved.
Show resolved Hide resolved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -182,6 +182,7 @@ public CompletionStage<GrpcServer> start() {
server = configureNetty(builder)
.directExecutor()
.addService(healthService)
.addService(ProtoReflectionService.newInstance())
.fallbackHandlerRegistry(handlerRegistry)
.build()
.start();
Expand Down
Loading