allow multiple proto services per Twinagle Server #132
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ccmtaylor
commented
Jun 3, 2020
runtime/src/main/scala/com/soundcloud/twinagle/ServerBuilder.scala
Outdated
Show resolved
Hide resolved
| ) { | ||
| def register[ |
There was a problem hiding this comment.
Since ServerBuilder is public, I considered keeping this method around, or marking it deprecated for backwards compat. However, it should previously only have been used from generated code, so I went ahead and deleted it.
codegen/src/sbt-test/generator/e2e/src/test/scala/proto/test/MultiServiceSpec.scala
Outdated
Show resolved
Hide resolved
runtime/src/main/scala/com/soundcloud/twinagle/ProtoService.scala
Outdated
Show resolved
Hide resolved
runtime/src/test/scala/com/soundcloud/twinagle/ServerSpec.scala
Outdated
Show resolved
Hide resolved
ccmtaylor
force-pushed
the
multiple-services
branch
from
748acb5 to
8d6e2e8
Compare
This change makes `ServerBuilder` more "officially" part of Twinagle's API. runtime: - introduce `ProtoService`/`ProtoRpc` model to represent protobuf services and their RPC methods - modify ServerBuilder to register `ProtoService`s instead of individual metadata/method pairs - make all `ServerBuilder` parameters optional codegen: - introduce `MyService.protoService(impl)` factory to create `ProtoService` representation of `MyService`. - modify `MyService.server()` to use `protoService` under the hood.
ccmtaylor
force-pushed
the
multiple-services
branch
from
8d6e2e8 to
20a49b3
Compare
ccmtaylor
force-pushed
the
multiple-services
branch
from
64c62f1 to
96d1383
Compare
Comment on lines
+21
to
+24
| val httpService = ServerBuilder() | ||
| .register(svc1) | ||
| .register(svc2) | ||
| .build |
There was a problem hiding this comment.
This "ship has probably sailed", but it wouldn't bother me if this were the only way of building a server (i.e. no convenience .server factory method).
Comment on lines
+9
to
+10
| assert(rpcs.map(_.metadata.service).toSet.size == 1, "inconsistent services in metadata") | ||
| assert(rpcs.map(_.metadata.prefix).toSet.size == 1, "inconsistent prefixes in metadata") |
There was a problem hiding this comment.
(note to self: in-person follow up so I fully understand the possible circumstances here)
| def build: Service[Request, Response] = | ||
| new Server(endpoints.map(instrument)) | ||
|
|
||
| private def instrument(rpc: ProtoRpc): ProtoRpc = |
There was a problem hiding this comment.
+1 to the method extraction, definitely reads better
| | $ServerBuilder(extension) | ||
| |${m.methods.map(registerEndpoint).mkString("\n")} | ||
| | .build | ||
| | $ServerBuilder(extension).register(service).build |
stevesoundcloud
approved these changes
Jun 22, 2020
ccmtaylor
added a commit
that referenced
this pull request
Sep 29, 2020
#132 introduced a bug that caused the code generator to emit bad code for services that expose multiple RPCs. This change fixes the error and adds a test case to avoid future regressions.
ccmtaylor
added a commit
that referenced
this pull request
Sep 29, 2020
#132 introduced a bug that caused the code generator to emit bad code for services that expose multiple RPCs. This change fixes the error and adds a test case to avoid future regressions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change makes
ServerBuildermore "officially" part of Twinagle's API.runtime:
ProtoService/ProtoRpcmodel to represent protobuf services and their RPC methodsProtoServices instead of individual metadata/method pairsServerBuilderparameters optionalcodegen:
MyService.protoService(impl)factory to createProtoServicerepresentation ofMyService.MyService.server()to useprotoServiceunder the hood.Fixes #123