You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/02/27 23:45:40 UTC
[incubator-pekko-grpc] branch main updated: Uptake pekko jars, use pekko names in packages and configs (#23)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new 7ad0b5d6 Uptake pekko jars, use pekko names in packages and configs (#23)
7ad0b5d6 is described below
commit 7ad0b5d6240023e1778fe35f90bbf5ce973bda04
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Tue Feb 28 00:45:34 2023 +0100
Uptake pekko jars, use pekko names in packages and configs (#23)
* uptake pekko jars, use pekko names in packages and configs
scalafmt and disable header check
sbt-pekko-grpc
doc build
rename more classes
proto package names
pekko configs
Update VersionGenerator.scala
pekko-http config
pekko-http config
benchmark-java compile
Delete release-drafter.yml
doc issues
fix doc build
temporarily remove `@apidoc` refs that are broken
try to fix build resolve issue
try to fix build
try to fix plugin tests
more akka refs
try to fix sbt tests
more sbt plugin test changes
test issue
try again to fix sbt tests
try to fix more tests
scalafmt
more akka refs
more akka refs
Update PekkoGrpcPlugin.scala
Update PekkoGrpcPlugin.groovy
Update PekkoGrpcPlugin.groovy
Update PekkoGrpcPlugin.groovy
fix names of artifacts
add scala-library
revert speculative change
name issue
Update build.gradle
Update build.gradle
revert unwanted changes
* fix up formerly broken apidocs refs
* disable cors support for grpc-web for now (#1)
Update deploy.md
* more Akka refs
scalafmt
---------
Co-authored-by: Johannes Rudolph <jo...@gmail.com>
---
.github/release-drafter.yml | 24 ------
.github/workflows/build-test.yml | 17 +++--
.github/workflows/format.yml | 2 +-
.github/workflows/link-validator.yml | 2 +-
.github/workflows/publish.yml | 4 +-
.github/workflows/release-drafter.yml | 19 -----
.scalafmt.conf | 2 +-
CONTRIBUTING.md | 4 +-
README.md | 4 +-
benchmark-java/README.md | 8 +-
benchmark-java/build.sbt | 10 +--
benchmark-java/project/plugins.sbt | 4 +-
.../grpc/benchmarks/SocketAddressValidator.java | 2 +-
.../apache/pekko}/grpc/benchmarks/Transport.java | 2 +-
.../apache/pekko}/grpc/benchmarks/Utils.java | 22 +++---
.../pekko}/grpc/benchmarks/driver/LoadClient.java | 30 ++++----
.../pekko}/grpc/benchmarks/driver/LoadServer.java | 10 +--
.../pekko}/grpc/benchmarks/driver/LoadWorker.java | 34 ++++-----
.../qps/AbstractConfigurationBuilder.java | 2 +-
.../pekko}/grpc/benchmarks/qps/AsyncClient.java | 40 +++++-----
.../pekko}/grpc/benchmarks/qps/AsyncServer.java | 34 ++++-----
.../grpc/benchmarks/qps/ClientConfiguration.java | 14 ++--
.../pekko}/grpc/benchmarks/qps/Configuration.java | 2 +-
.../grpc/benchmarks/qps/ServerConfiguration.java | 8 +-
benchmark-java/src/main/protobuf/control.proto | 2 +-
benchmark-java/src/main/protobuf/messages.proto | 2 +-
benchmark-java/src/main/protobuf/payloads.proto | 2 +-
benchmark-java/src/main/protobuf/services.proto | 2 +-
benchmark-java/src/main/protobuf/stats.proto | 2 +-
benchmark-java/src/main/resources/application.conf | 4 +-
.../grpc/benchmarks/driver/LoadClientTest.java | 6 +-
.../grpc/benchmarks/driver/LoadWorkerTest.java | 34 ++++-----
benchmarks/README.md | 4 +-
.../apache/pekko}/grpc/BenchRunner.scala | 2 +-
.../apache/pekko}/grpc/CommonBenchmark.scala | 2 +-
.../pekko}/grpc/GrpcMarshallingBenchmark.scala | 12 +--
.../pekko}/grpc/HandlerProcessingBenchmark.scala | 24 +++---
build.sbt | 70 ++++++++---------
.../src/main/scala/akka/grpc/gen/Constants.scala | 9 ---
.../apache/pekko}/grpc/gen/CodeGenerator.scala | 4 +-
.../org/apache/pekko/grpc/gen/Constants.scala | 9 +++
.../apache/pekko}/grpc/gen/Logging.scala | 2 +-
.../{akka => org/apache/pekko}/grpc/gen/Main.scala | 14 +++-
.../apache/pekko}/grpc/gen/MethodType.scala | 2 +-
.../apache/pekko}/grpc/gen/ProtocSettings.scala | 2 +-
.../grpc/gen/javadsl/JavaClientCodeGenerator.scala | 10 +--
.../grpc/gen/javadsl/JavaCodeGenerator.scala | 4 +-
.../gen/javadsl/JavaInterfaceCodeGenerator.scala | 8 +-
.../grpc/gen/javadsl/JavaServerCodeGenerator.scala | 13 ++--
.../apache/pekko}/grpc/gen/javadsl/Method.scala | 10 ++-
.../pekko}/grpc/gen/javadsl/Serializer.scala | 2 +-
.../apache/pekko}/grpc/gen/javadsl/Service.scala | 2 +-
.../apache/pekko}/grpc/gen/scaladsl/Method.scala | 9 ++-
.../gen/scaladsl/ScalaClientCodeGenerator.scala | 8 +-
.../grpc/gen/scaladsl/ScalaCodeGenerator.scala | 8 +-
.../scaladsl/ScalaMarshallersCodeGenerator.scala | 8 +-
.../gen/scaladsl/ScalaServerCodeGenerator.scala | 13 ++--
.../gen/scaladsl/ScalaTraitCodeGenerator.scala | 8 +-
.../pekko}/grpc/gen/scaladsl/Serializer.scala | 2 +-
.../apache/pekko}/grpc/gen/scaladsl/Service.scala | 2 +-
.../twirl/templates/JavaClient/Client.scala.txt | 72 +++++++++---------
.../templates/JavaClient/ClientPowerApi.scala.txt | 20 ++---
.../JavaClient/GenMethodImports.scala.txt | 14 ++--
.../templates/JavaCommon/ApiInterface.scala.txt | 14 ++--
.../twirl/templates/JavaServer/Handler.scala.txt | 82 ++++++++++----------
.../JavaServer/PowerApiInterface.scala.txt | 16 ++--
.../twirl/templates/ScalaClient/Client.scala.txt | 58 +++++++--------
.../twirl/templates/ScalaCommon/ApiTrait.scala.txt | 30 ++++----
.../templates/ScalaCommon/Marshallers.scala.txt | 34 ++++-----
.../twirl/templates/ScalaServer/Handler.scala.txt | 46 ++++++------
.../templates/ScalaServer/PowerApiTrait.scala.txt | 12 +--
.../pekko}/grpc/gen/javadsl/ServiceSpec.scala | 2 +-
docs/src/main/paradox/apidesign.md | 2 +-
docs/src/main/paradox/binary-compatibility.md | 2 +-
docs/src/main/paradox/buildtools/gradle.md | 6 +-
docs/src/main/paradox/buildtools/maven.md | 6 +-
docs/src/main/paradox/buildtools/sbt.md | 6 +-
docs/src/main/paradox/client/configuration.md | 28 +++----
docs/src/main/paradox/client/details.md | 2 +-
docs/src/main/paradox/client/walkthrough.md | 18 ++---
docs/src/main/paradox/deploy.md | 2 +-
docs/src/main/paradox/overview.md | 2 +-
docs/src/main/paradox/server/details.md | 10 +--
docs/src/main/paradox/server/walkthrough.md | 24 +++---
docs/src/main/paradox/troubleshooting.md | 2 +-
gradle-plugin/README.md | 6 +-
gradle-plugin/build.gradle | 20 ++---
gradle-plugin/settings.gradle | 2 +-
.../pekko/grpc/gradle/PekkoGrpcPlugin.groovy} | 60 ++++++++-------
.../grpc/gradle/PekkoGrpcPluginExtension.groovy} | 10 +--
.../src/test/groovy/helper/BaseSpec.groovy | 14 ++--
.../src/test/groovy/unit/ApplySpec.groovy | 18 ++---
.../src/test/groovy/unit/DependenciesSpec.groovy | 38 +++++-----
interop-tests/README.md | 12 +--
.../io/grpc/testing/integration2/ClientTester.java | 2 +-
.../pekko/grpc/interop/PekkoGrpcClientJava.java} | 10 +--
.../pekko/grpc/interop/PekkoGrpcServerJava.java} | 38 +++++-----
.../grpc/testing/integration2/ChannelBuilder.scala | 2 +-
.../io/grpc/testing/integration2/Settings.scala | 8 +-
.../apache/pekko}/grpc/interop/GrpcClient.scala | 4 +-
.../pekko}/grpc/interop/GrpcInteropTests.scala | 6 +-
.../apache/pekko}/grpc/interop/GrpcServer.scala | 4 +-
.../apache/pekko}/grpc/interop/IoGrpcClient.scala | 2 +-
.../apache/pekko}/grpc/interop/IoGrpcServer.scala | 2 +-
.../pekko/grpc/interop/PekkoGrpcClientScala.scala} | 6 +-
.../pekko/grpc/interop/PekkoGrpcServerScala.scala} | 16 ++--
.../grpc/ExceptionGreeterServiceImpl.java | 6 +-
.../myapp/helloworld/grpc/RichErrorImpl.java | 4 +-
.../myapp/helloworld/grpc/RichErrorModelTest.java | 14 ++--
.../myapp/helloworld/grpc/RichErrorNativeImpl.java | 6 +-
.../pekko}/grpc/interop/JavaTestServiceImpl.java | 14 ++--
.../grpc/interop/PekkoGrpcJavaClientTester.java} | 38 +++++-----
interop-tests/src/test/resources/application.conf | 2 +-
.../scala/akka/grpc/interop/GrpcInteropSpec.scala | 73 ------------------
.../pekko/grpc/interop/GrpcInteropSpec.scala | 74 ++++++++++++++++++
.../grpc/interop/PekkoGrpcScalaClientTester.scala} | 20 ++---
.../interop/PekkoHttpServerProviderScala.scala} | 26 +++----
.../pekko}/grpc/interop/TestServiceImpl.scala | 14 ++--
.../interop/app/PekkoHttpServerAppScala.scala} | 10 +--
.../grpc/scaladsl/CountingGreeterServiceImpl.scala | 16 ++--
.../pekko}/grpc/scaladsl/GrpcChannelSpec.scala | 16 ++--
.../grpc/scaladsl/GrpcExceptionHandlerSpec.scala | 36 ++++-----
.../pekko}/grpc/scaladsl/GrpcMarshallingSpec.scala | 22 +++---
.../scaladsl/LoadBalancingIntegrationSpec.scala | 20 ++---
.../scaladsl/NonBalancingIntegrationSpec.scala | 22 +++---
.../apache/pekko}/grpc/scaladsl/PowerApiSpec.scala | 38 +++++-----
.../grpc/scaladsl/PowerGreeterServiceImpl.scala | 10 +--
.../pekko}/grpc/scaladsl/RichErrorModelSpec.scala | 18 ++---
.../pekko}/grpc/scaladsl/TelemetrySpec.scala | 20 +++--
.../scaladsl/tools/MutableServiceDiscovery.scala | 12 +--
maven-plugin/src/main/maven/plugin.xml | 38 +++++-----
.../pekko}/grpc/maven/AbstractGenerateMojo.scala | 22 ++++--
.../apache/pekko}/grpc/maven/GenerateMojo.scala | 2 +-
.../grpc/maven/ProtocBridgeCodeGenerator.scala | 10 +--
.../pekko}/grpc/maven/TestGenerateMojo.scala | 2 +-
.../apache/pekko}/grpc/maven/ProtocSpec.scala | 2 +-
plugin-tester-java/README.md | 4 +-
plugin-tester-java/build.gradle | 15 ++--
plugin-tester-java/pom.xml | 26 +++++--
plugin-tester-java/settings.gradle | 6 +-
.../main/java/example/myapp/CombinedServer.java | 20 ++---
.../helloworld/AuthenticatedGreeterServer.java | 26 +++----
.../example/myapp/helloworld/GreeterClient.java | 14 ++--
.../example/myapp/helloworld/GreeterServer.java | 16 ++--
.../myapp/helloworld/GreeterServiceImpl.java | 8 +-
.../helloworld/GreeterServicePowerApiImpl.java | 10 +--
.../myapp/helloworld/LiftedGreeterClient.java | 14 ++--
.../LoggingErrorHandlingGreeterServer.java | 34 ++++-----
.../myapp/helloworld/PowerGreeterServer.java | 16 ++--
.../myapp/statefulhelloworld/GreeterActor.java | 4 +-
.../statefulhelloworld/GreeterServiceImpl.java | 6 +-
.../src/main/resources/application.conf | 4 +-
.../myapp/helloworld/ErrorReportingSpec.scala | 25 ++++---
.../myapp/helloworld/JGreeterServiceSpec.scala | 6 +-
plugin-tester-scala/README.md | 4 +-
plugin-tester-scala/build.gradle | 13 ++--
plugin-tester-scala/pom.xml | 34 ++++++---
plugin-tester-scala/settings.gradle | 6 +-
.../src/main/resources/application.conf | 4 +-
.../main/scala/example/myapp/CombinedServer.scala | 16 ++--
.../helloworld/AuthenticatedGreeterClient.scala | 4 +-
.../helloworld/AuthenticatedGreeterServer.scala | 14 ++--
.../example/myapp/helloworld/GreeterClient.scala | 8 +-
.../example/myapp/helloworld/GreeterServer.scala | 10 +--
.../myapp/helloworld/GreeterServiceImpl.scala | 8 +-
.../myapp/helloworld/LiftedGreeterClient.scala | 10 +--
.../LoggingErrorHandlingGreeterClient.scala | 4 +-
.../LoggingErrorHandlingGreeterServer.scala | 22 +++---
.../myapp/helloworld/PowerGreeterServer.scala | 8 +-
.../myapp/helloworld/PowerGreeterServiceImpl.scala | 8 +-
.../myapp/statefulhelloworld/GreeterActor.scala | 4 +-
.../statefulhelloworld/GreeterServiceImpl.scala | 6 +-
.../myapp/helloworld/ErrorReportingSpec.scala | 14 ++--
.../myapp/helloworld/GreeterServiceSpec.scala | 6 +-
project/Assemblies.scala | 2 +-
project/Common.scala | 4 +-
project/CopyrightHeader.scala | 2 +-
project/Dependencies.scala | 50 ++++++-------
project/ProjectExtensions.scala | 5 +-
project/ReflectiveCodeGen.scala | 36 ++++-----
project/SbtMavenPlugin.scala | 2 +-
project/VersionGenerator.scala | 3 +-
project/VersionSyncCheckPlugin.scala | 6 +-
project/project-info.conf | 6 +-
.../apache/pekko/grpc/PekkoGrpcGenerated.java} | 4 +-
runtime/src/main/resources/reference.conf | 4 +-
.../apache/pekko}/grpc/GrpcChannel.scala | 18 ++---
.../pekko}/grpc/GrpcClientCloseException.scala | 2 +-
.../apache/pekko}/grpc/GrpcClientResponse.scala | 12 +--
.../apache/pekko}/grpc/GrpcClientSettings.scala | 30 ++++----
.../apache/pekko}/grpc/GrpcProtocol.scala | 24 +++---
.../apache/pekko}/grpc/GrpcServiceException.scala | 8 +-
.../apache/pekko}/grpc/ProtobufSerializer.scala | 6 +-
.../apache/pekko}/grpc/SSLContextUtils.scala | 2 +-
.../apache/pekko}/grpc/ServiceDescription.scala | 4 +-
.../{akka => org/apache/pekko}/grpc/Trailers.scala | 10 +--
.../grpc/internal/AbstractGrpcProtocol.scala | 28 +++----
.../pekko}/grpc/internal/ByteStringUtils.scala | 12 +--
.../internal/CancellationBarrierGraphStage.scala | 6 +-
.../apache/pekko}/grpc/internal/ChannelUtils.scala | 20 ++---
.../apache/pekko}/grpc/internal/ClientState.scala | 12 +--
.../apache/pekko}/grpc/internal/Codec.scala | 4 +-
.../apache/pekko}/grpc/internal/Codecs.scala | 10 +--
.../apache/pekko}/grpc/internal/DecodeBase64.scala | 18 ++---
.../pekko}/grpc/internal/GrpcEntityHelpers.scala | 26 +++----
.../pekko}/grpc/internal/GrpcProtocolNative.scala | 10 +--
.../pekko}/grpc/internal/GrpcProtocolWeb.scala | 16 ++--
.../pekko}/grpc/internal/GrpcRequestHelpers.scala | 26 +++----
.../pekko}/grpc/internal/GrpcResponseHelpers.scala | 24 +++---
.../apache/pekko}/grpc/internal/Gzip.scala | 4 +-
.../grpc/internal/HardcodedServiceDiscovery.scala | 6 +-
.../apache/pekko}/grpc/internal/Identity.scala | 4 +-
.../pekko}/grpc/internal/InternalChannel.scala | 10 +--
.../apache/pekko}/grpc/internal/Marshallers.scala | 6 +-
.../apache/pekko}/grpc/internal/MetadataImpl.scala | 20 ++---
.../grpc/internal/MissingParameterException.scala | 2 +-
.../pekko}/grpc/internal/NettyClientUtils.scala | 18 ++---
.../internal/PekkoDiscoveryNameResolver.scala} | 16 ++--
.../PekkoDiscoveryNameResolverProvider.scala} | 10 +--
.../grpc/internal/PekkoHttpClientUtils.scala} | 50 +++++++------
.../internal/PekkoNettyGrpcClientGraphStage.scala} | 22 +++---
.../pekko}/grpc/internal/RequestBuilderImpl.scala | 36 ++++-----
.../grpc/internal/ServerReflectionImpl.scala | 8 +-
.../grpc/internal/ServiceDescriptionImpl.scala | 6 +-
.../pekko}/grpc/internal/SingleParameterSink.scala | 10 +--
.../apache/pekko}/grpc/internal/TelemetrySpi.scala | 10 +--
.../pekko}/grpc/internal/UnaryCallAdapter.scala | 18 ++---
.../grpc/internal/WithProtobufSerializer.scala | 4 +-
.../grpc/javadsl/GoogleProtobufSerializer.scala | 8 +-
.../pekko}/grpc/javadsl/GrpcExceptionHandler.scala | 24 +++---
.../pekko}/grpc/javadsl/GrpcMarshalling.scala | 24 +++---
.../apache/pekko}/grpc/javadsl/Metadata.scala | 10 +--
.../pekko}/grpc/javadsl/MetadataBuilder.scala | 16 ++--
.../apache/pekko}/grpc/javadsl/MetadataEntry.scala | 6 +-
.../pekko/grpc/javadsl/PekkoGrpcClient.scala} | 12 +--
.../pekko}/grpc/javadsl/RequestBuilder.scala | 12 +--
.../pekko}/grpc/javadsl/ServerReflection.scala | 17 +++--
.../pekko}/grpc/javadsl/ServiceHandler.scala | 10 +--
.../apache/pekko}/grpc/javadsl/WebHandler.scala | 49 ++++++------
.../apache/pekko}/grpc/javadsl/package.scala | 16 ++--
.../apache/pekko}/grpc/scaladsl/Grpc.scala | 12 +--
.../grpc/scaladsl/GrpcExceptionHandler.scala | 22 +++---
.../pekko}/grpc/scaladsl/GrpcMarshalling.scala | 24 +++---
.../apache/pekko}/grpc/scaladsl/Metadata.scala | 6 +-
.../pekko}/grpc/scaladsl/MetadataBuilder.scala | 10 +--
.../pekko}/grpc/scaladsl/MetadataEntry.scala | 8 +-
.../pekko/grpc/scaladsl/PekkoGrpcClient.scala} | 12 +--
.../pekko}/grpc/scaladsl/RequestBuilder.scala | 12 +--
.../grpc/scaladsl/ScalapbProtobufSerializer.scala | 8 +-
.../pekko}/grpc/scaladsl/ServerReflection.scala | 12 +--
.../pekko}/grpc/scaladsl/ServiceHandler.scala | 12 +--
.../apache/pekko}/grpc/scaladsl/WebHandler.scala | 36 ++++-----
.../grpc/scaladsl/headers/PercentEncoding.scala | 2 +-
.../pekko}/grpc/scaladsl/headers/headers.scala | 10 +--
.../grpc/client/GrpcClientSettingsCompileOnly.java | 10 +--
.../pekko}/grpc/javadsl/ConcatOrNotFoundTest.java | 8 +-
.../client/GrpcClientSettingsCompileOnly.scala | 8 +-
.../apache/pekko}/grpc/CodecsSpec.scala | 8 +-
.../pekko}/grpc/GrpcClientSettingsSpec.scala | 24 +++---
.../grpc/internal/AlwaysTimingOutDiscovery.scala | 10 +--
.../pekko}/grpc/internal/ChannelUtilsSpec.scala | 8 +-
.../pekko}/grpc/internal/DecodeBase64Spec.scala | 12 +--
.../grpc/internal/GrpcProtocolWebTextSpec.scala | 14 ++--
.../pekko}/grpc/internal/MetadataImplSpec.scala | 8 +-
.../grpc/internal/NameResolverListenerProbe.scala | 4 +-
.../grpc/internal/NettyClientUtilsSpec.scala | 8 +-
.../PekkoDiscoveryNameResolverProviderSpec.scala} | 18 ++---
.../internal/PekkoDiscoveryNameResolverSpec.scala} | 14 ++--
.../grpc/internal/PekkoHttpClientUtilsSpec.scala} | 22 +++---
.../grpc/internal/ServerReflectionImplSpec.scala | 8 +-
.../javadsl/GoogleProtobufSerializerSpec.scala | 2 +-
.../grpc/scaladsl/GrpcExceptionHandlerSpec.scala | 14 ++--
.../pekko}/grpc/scaladsl/MetadataBuilderSpec.scala | 6 +-
.../scaladsl/ScalapbProtobufSerializerSpec.scala | 2 +-
.../pekko}/grpc/scaladsl/headers/HeadersSpec.scala | 2 +-
.../apache/pekko}/grpc/sbt/GeneratorBridge.scala | 24 +++---
.../apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala} | 87 ++++++++++++----------
.../sbt-test/gen-java/01-gen-basic-java/build.sbt | 8 +-
.../gen-java/01-gen-basic-java/project/plugins.sbt | 2 +-
.../myapp/helloworld/GreeterServiceImpl.java | 4 +-
.../src/sbt-test/gen-java/01-gen-basic-java/test | 10 +--
.../gen-java/02-server-reflection/build.sbt | 6 +-
.../02-server-reflection/project/plugins.sbt | 2 +-
.../myapp/helloworld/GreeterServiceImpl.java | 4 +-
.../main/java/example/myapp/helloworld/Main.java | 20 ++---
.../sbt-test/gen-java/02-server-reflection/test | 10 +--
.../sbt-test/gen-java/03-no-java-package/build.sbt | 6 +-
.../03-no-java-package/project/plugins.sbt | 2 +-
.../main/java/helloworld/GreeterServiceImpl.java | 4 +-
.../src/sbt-test/gen-java/03-no-java-package/test | 2 +-
.../gen-java/04-crash-on-keywords/build.sbt | 8 +-
.../04-crash-on-keywords/project/plugins.sbt | 2 +-
.../build.sbt | 6 +-
.../project/plugins.sbt | 2 +-
.../main/java/helloworld/GreeterServiceImpl.java | 4 +-
.../05-duplicate-messages-different-packages/test | 2 +-
.../sbt-test/gen-scala-server/00-interop/build.sbt | 20 ++---
.../00-interop/project/plugins.sbt | 2 +-
.../apache/pekko}/grpc/JavaTestServiceImpl.java | 14 ++--
.../00-interop/src/main/resources/application.conf | 2 +-
.../apache/pekko}/grpc/TestServiceImpl.scala | 16 ++--
.../apache/pekko}/grpc/GrpcInteropSpec.scala | 43 +++++------
.../apache/pekko/grpc/PekkoGrpcClientTester.scala} | 20 ++---
.../gen-scala-server/01-gen-basic-server/build.sbt | 6 +-
.../01-gen-basic-server/project/plugins.sbt | 2 +-
.../myapp/helloworld/GreeterServiceImpl.scala | 4 +-
.../gen-scala-server/01-gen-basic-server/test | 8 +-
.../02-multiple-services/build.sbt | 4 +-
.../02-multiple-services/project/plugins.sbt | 2 +-
.../src/main/scala/example/myapp/Main.scala | 8 +-
.../myapp/helloworld/GreeterServiceImpl.scala | 4 +-
.../gen-scala-server/03-test-config/build.sbt | 12 +--
.../03-test-config/project/plugins.sbt | 2 +-
.../sbt-test/gen-scala-server/03-test-config/test | 12 +--
.../04-server-reflection/build.sbt | 4 +-
.../04-server-reflection/project/plugins.sbt | 2 +-
.../myapp/helloworld/GreeterServiceImpl.scala | 4 +-
.../main/scala/example/myapp/helloworld/Main.scala | 14 ++--
.../gen-scala-server/04-server-reflection/test | 8 +-
.../gen-scala-server/05-no-java-package/build.sbt | 4 +-
.../05-no-java-package/project/plugins.sbt | 2 +-
.../main/scala/helloworld/GreeterServiceImpl.scala | 4 +-
.../gen-scala-server/05-no-java-package/test | 8 +-
.../06-compatibility-plugins/build.sbt | 4 +-
.../06-compatibility-plugins/project/plugins.sbt | 2 +-
.../gen-scala-server/06-compatibility-plugins/test | 4 +-
.../project/plugins.sbt | 3 -
.../build.sbt | 4 +-
.../project/plugins.sbt | 3 +
.../src/main/protobuf/helloworld.proto | 0
.../myapp/helloworld/GreeterServiceImpl.scala | 4 +-
.../test | 0
.../09-scalapb-customizations/build.sbt | 6 +-
.../09-scalapb-customizations/project/plugins.sbt | 2 +-
.../myapp/helloworld/GreeterServiceImpl.scala | 4 +-
.../09-scalapb-customizations/test | 6 +-
.../gen-scala-server/10-scalapb-validate/build.sbt | 6 +-
.../10-scalapb-validate/project/plugins.sbt | 2 +-
.../myapp/helloworld/GreeterServiceImpl.scala | 4 +-
.../build.sbt | 4 +-
.../project/plugins.sbt | 2 +-
.../main/scala/helloworld/GreeterServiceImpl.scala | 4 +-
.../11-duplicate-messages-different-packages/test | 8 +-
.../scala3/01-basic-client-server/build.sbt | 4 +-
.../01-basic-client-server/project/plugins.sbt | 2 +-
.../src/main/resources/application.conf | 6 +-
.../myapp/helloworld/GreeterServiceImpl.scala | 4 +-
.../myapp/helloworld/GreeterServiceSpec.scala | 6 +-
.../apache/pekko}/grpc/scalapb/Main.scala | 2 +-
349 files changed, 2184 insertions(+), 2141 deletions(-)
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
deleted file mode 100644
index 5f39f3bb..00000000
--- a/.github/release-drafter.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Config for https://github.com/toolmantim/release-drafter
-name-template: 'Akka gRPC $NEXT_PATCH_VERSION'
-tag-template: 'v$NEXT_PATCH_VERSION'
-categories:
- - title: 'Client side'
- label: 'client'
- - title: 'Server side'
- label: 'server'
- - title: 'Internal changes'
- label: 'development'
- - title: 'Gradle'
- label: 'gradle'
- - title: 'Maven'
- label: 'maven'
- - title: 'sbt'
- label: 'sbt'
- - title: 'Updates'
- label: 'update'
-
-change-template: '- $TITLE [#$NUMBER](https://github.com/apache/incubator-pekko-grpc/issues/$NUMBER) by [@$AUTHOR](https://github.com/$AUTHOR)'
-template: |
- ## Changes
-
- $CHANGES
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 38e52251..2b94aa3d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -39,10 +39,11 @@ jobs:
# env:
# FOSSA_API_KEY: "${{secrets.FOSSA_API_KEY}}"
+ # TODO add back headerCheckAll
- name: Binary-compatibility check
run: |-
cp .jvmopts-ghactions .jvmopts
- sbt headerCheckAll grpcVersionSyncCheck googleProtobufVersionSyncCheck +mimaReportBinaryIssues
+ sbt grpcVersionSyncCheck googleProtobufVersionSyncCheck +mimaReportBinaryIssues
compile-benchmarks:
name: Compile Benchmarks
@@ -123,7 +124,7 @@ jobs:
uses: coursier/cache-action@v6
- name: Scripted ${{ matrix.test-set }}
- run: cp .jvmopts-ghactions .jvmopts && sbt ++${{ matrix.scala-version }}.* "sbt-akka-grpc/scripted ${{ matrix.test-set }}/*"
+ run: cp .jvmopts-ghactions .jvmopts && sbt ++${{ matrix.scala-version }}.* "sbt-pekko-grpc/scripted ${{ matrix.test-set }}/*"
test-gradle:
name: Gradle tests
@@ -161,7 +162,7 @@ jobs:
- name: Publish artifacts locally
run: |-
cp .jvmopts-ghactions .jvmopts
- sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 +akka-grpc-runtime/publishM2
+ sbt pekko-grpc-codegen/publishM2 pekko-grpc-scalapb-protoc-plugin/publishM2 +pekko-grpc-runtime/publishM2
cd gradle-plugin
./gradlew clean publishToMavenLocal --console=plain --info --stacktrace
find ~/.m2 | grep gradle
@@ -169,12 +170,12 @@ jobs:
- name: Test Gradle Java ${{ matrix.SCALA_VERSION }}
run: |-
cd plugin-tester-java
- ./gradlew clean test --console=plain --info --stacktrace -Dakka.grpc.project.version=$(cat ~/.version | sed -e s/-SNAPSHOT//)
+ ./gradlew clean test --console=plain --info --stacktrace -Dpekko.grpc.project.version=$(cat ~/.version | sed -e s/-SNAPSHOT//)
- name: Test Gradle Scala ${{ matrix.SCALA_VERSION }}
run: |-
cd plugin-tester-scala
- ./gradlew clean test --console=plain --info --stacktrace -Dakka.grpc.project.version=$(cat ~/.version | sed -e s/-SNAPSHOT//)
+ ./gradlew clean test --console=plain --info --stacktrace -Dpekko.grpc.project.version=$(cat ~/.version | sed -e s/-SNAPSHOT//)
- name: Stop Gradle Daemon
# as suggested in https://github.com/actions/cache/blob/main/examples.md#java---gradle
@@ -215,17 +216,17 @@ jobs:
- name: Publish artifacts locally
run: |-
cp .jvmopts-ghactions .jvmopts
- sbt akka-grpc-codegen/publishM2 akka-grpc-scalapb-protoc-plugin/publishM2 +akka-grpc-runtime/publishM2 akka-grpc-maven-plugin/publishM2
+ sbt pekko-grpc-codegen/publishM2 pekko-grpc-scalapb-protoc-plugin/publishM2 +pekko-grpc-runtime/publishM2 pekko-grpc-maven-plugin/publishM2
- name: Test Maven Java
run: |-
cd plugin-tester-java
- mvn -Dakka.grpc.project.version=`cat ~/.version` akka-grpc:generate compile
+ mvn -Dpekko.grpc.project.version=`cat ~/.version` pekko-grpc:generate compile
- name: Test Maven Scala
run: |-
cd plugin-tester-scala
- mvn -Dakka.grpc.project.version=`cat ~/.version` akka-grpc:generate scala:compile
+ mvn -Dpekko.grpc.project.version=`cat ~/.version` pekko-grpc:generate scala:compile
test-docs:
name: Docs
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 502401a8..9d330b61 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -20,5 +20,5 @@ jobs:
- name: Check project is formatted
uses: jrouly/scalafmt-native-action@v2
with:
- version: '3.6.1'
+ version: '3.7.1'
arguments: '--list --mode diff-ref=origin/main'
diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml
index efc52cfd..c00340c5 100644
--- a/.github/workflows/link-validator.yml
+++ b/.github/workflows/link-validator.yml
@@ -27,7 +27,7 @@ jobs:
uses: coursier/cache-action@v6
- name: sbt site
- run: sbt akka-grpc-docs/makeSite
+ run: sbt pekko-grpc-docs/makeSite
- name: Install Coursier command line tool
run: curl -fLo cs https://git.io/coursier-cli-linux && chmod +x cs && ./cs
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 90befbee..4c3ecc29 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -28,7 +28,7 @@ jobs:
run: |-
cp .jvmopts-ghactions .jvmopts
sbt ci-release
- CI_RELEASE=akka-grpc-codegen/publishSigned CI_SNAPSHOT_RELEASE=akka-grpc-codegen/publish sbt ++2.13.8\! ci-release
+ CI_RELEASE=pekko-grpc-codegen/publishSigned CI_SNAPSHOT_RELEASE=pekko-grpc-codegen/publish sbt ++2.13.8\! ci-release
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
@@ -82,6 +82,6 @@ jobs:
chmod 600 /tmp/id_rsa
ssh-add /tmp/id_rsa
cp .jvmopts-ghactions .jvmopts
- sbt akka-grpc-docs/publishRsync
+ sbt pekko-grpc-docs/publishRsync
env:
SCP_SECRET: ${{ secrets.SCP_SECRET }}
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
deleted file mode 100644
index b71b828e..00000000
--- a/.github/workflows/release-drafter.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Release Drafter
-
-on:
- push:
- # branches to consider in the event; optional, defaults to all
- branches: [ main ]
-
-jobs:
- update_release_draft:
- runs-on: ubuntu-latest
- steps:
- # Drafts your next Release notes as Pull Requests are merged into "main"
- - uses: release-drafter/release-drafter@v5
- # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
- # with:
- # config-name: my-config.yml
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
diff --git a/.scalafmt.conf b/.scalafmt.conf
index bdc4aca9..ee293d62 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.7.1
runner.dialect = scala213
project.git = true
style = defaultWithAlign
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e93e9681..12ba08fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -175,7 +175,7 @@ Refer to its documentation to learn about the more advanced features it provides
To generate documentation you can:
```
-> project akka-grpc-docs
+> project pekko-grpc-docs
> paradox
```
@@ -189,7 +189,7 @@ Generating JavaDoc is not enabled by default, as it's not needed on day-to-day d
If you'd like to check if you links and formatting looks good in JavaDoc (and not only in ScalaDoc), you can generate it by running:
```
-sbt -Dakka.genjavadoc.enabled=true javaunidoc:doc
+sbt -Dpekko.genjavadoc.enabled=true javaunidoc:doc
```
Which will generate JavaDoc style docs in `./target/javaunidoc/index.html`
diff --git a/README.md b/README.md
index 9bec6105..d449f8bc 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Apache Pekko gRPC
Support for building streaming gRPC servers and clients on top
-of Pekko Streams.
+of Apache Pekko Streams.
This library is meant to be used as a building block in projects using the Pekko
toolkit.
@@ -34,7 +34,7 @@ Based on a protobuf service definition, pekko-grpc can generate:
* Model classes (using plain protoc for Java or scalapb for Scala)
* The API (as an interface for Java or a trait for Scala), expressed in Pekko Streams `Source`s
-* On the server side, code to create an Pekko HTTP route based on your implementation of the API
+* On the server side, code to create a Pekko HTTP route based on your implementation of the API
* On the client side, a client for the API.
## Project structure
diff --git a/benchmark-java/README.md b/benchmark-java/README.md
index adb5dc2a..44767528 100644
--- a/benchmark-java/README.md
+++ b/benchmark-java/README.md
@@ -11,24 +11,24 @@ grpc-java and akka-grpc.
Server:
```
-sbt "runMain akka.grpc.benchmarks.qps.AsyncServer --tls --address=localhost:50051"
+sbt "runMain org.apache.pekko.grpc.benchmarks.qps.AsyncServer --tls --address=localhost:50051"
```
Client with unary calls:
```
-sbt "runMain akka.grpc.benchmarks.qps.AsyncClient --tls --address=localhost:50051 --warmup_duration=15 --duration=30 --channels=1 --outstanding_rpcs=16"
+sbt "runMain org.apache.pekko.grpc.benchmarks.qps.AsyncClient --tls --address=localhost:50051 --warmup_duration=15 --duration=30 --channels=1 --outstanding_rpcs=16"
```
Client with streaming calls:
```
-sbt "runMain akka.grpc.benchmarks.qps.AsyncClient --tls --address=localhost:50051 --warmup_duration=15 --duration=30 --channels=1 --outstanding_rpcs=16 --streaming_rpcs"
+sbt "runMain org.apache.pekko.grpc.benchmarks.qps.AsyncClient --tls --address=localhost:50051 --warmup_duration=15 --duration=30 --channels=1 --outstanding_rpcs=16 --streaming_rpcs"
```
Use `--help` to show description of all options.
-More scenarios can be tested with the `akka.grpc.benchmarks.driver.LoadWorker`. See `LoadWorkerTest`.
+More scenarios can be tested with the `org.apache.pekko.grpc.benchmarks.driver.LoadWorker`. See `LoadWorkerTest`.
## Visualizing the Latency Distribution
diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt
index abf3b817..4decdf72 100644
--- a/benchmark-java/build.sbt
+++ b/benchmark-java/build.sbt
@@ -1,15 +1,15 @@
-enablePlugins(AkkaGrpcPlugin)
+enablePlugins(PekkoGrpcPlugin)
run / javaOptions ++= List("-Xms1g", "-Xmx1g", "-XX:+PrintGCDetails", "-XX:+PrintGCTimeStamps")
// generate both client and server (default) in Java
-akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Java)
+pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
val grpcVersion = "1.48.1" // checked synced by VersionSyncCheckPlugin
-val runtimeProject = ProjectRef(file("../"), "akka-grpc-runtime")
+val runtimeProject = ProjectRef(file("../"), "pekko-grpc-runtime")
-val codeGenProject = ProjectRef(file("../"), "akka-grpc-codegen")
+val codeGenProject = ProjectRef(file("../"), "pekko-grpc-codegen")
val root = project
.in(file("."))
@@ -17,7 +17,7 @@ val root = project
// Use this instead of above when importing to IDEA, after publishLocal and replacing the version here
/*
.settings(libraryDependencies ++= Seq(
- "com.lightbend.akka.grpc" %% "akka-grpc-runtime" % "0.1+32-fd597fcb+20180618-1248"
+ "com.lightbend.akka.grpc" %% "pekko-grpc-runtime" % "0.1+32-fd597fcb+20180618-1248"
))
*/
.settings(
diff --git a/benchmark-java/project/plugins.sbt b/benchmark-java/project/plugins.sbt
index 6fd699f6..25dff29e 100644
--- a/benchmark-java/project/plugins.sbt
+++ b/benchmark-java/project/plugins.sbt
@@ -1,3 +1,3 @@
-lazy val plugins = (project in file(".")).dependsOn(ProjectRef(file("../../"), "sbt-akka-grpc"))
+lazy val plugins = (project in file(".")).dependsOn(ProjectRef(file("../../"), "sbt-pekko-grpc"))
// Use this instead of above when importing to IDEA, after publishLocal and replacing the version here
-//addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "0.1+32-fd597fcb+20180618-1248")
+//addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % "0.1+32-fd597fcb+20180618-1248")
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/SocketAddressValidator.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/SocketAddressValidator.java
similarity index 97%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/SocketAddressValidator.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/SocketAddressValidator.java
index d3439039..79f074af 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/SocketAddressValidator.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/SocketAddressValidator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks;
+package org.apache.pekko.grpc.benchmarks;
import com.google.errorprone.annotations.Immutable;
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/Transport.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/Transport.java
similarity index 98%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/Transport.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/Transport.java
index 8b72d350..237f457e 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/Transport.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/Transport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks;
+package org.apache.pekko.grpc.benchmarks;
import java.net.SocketAddress;
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/Utils.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/Utils.java
similarity index 92%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/Utils.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/Utils.java
index 14187620..0c79a763 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/Utils.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/Utils.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks;
-
-import akka.actor.ActorSystem;
-import akka.grpc.GrpcClientSettings;
-import akka.grpc.SSLContextUtils;
-import akka.grpc.benchmarks.proto.Messages;
-import akka.grpc.benchmarks.proto.Messages.Payload;
-import akka.grpc.benchmarks.proto.Messages.SimpleRequest;
-import akka.grpc.benchmarks.proto.Messages.SimpleResponse;
-import akka.http.javadsl.ConnectionContext;
-import akka.http.javadsl.HttpsConnectionContext;
+package org.apache.pekko.grpc.benchmarks;
+
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.grpc.GrpcClientSettings;
+import org.apache.pekko.grpc.SSLContextUtils;
+import org.apache.pekko.grpc.benchmarks.proto.Messages;
+import org.apache.pekko.grpc.benchmarks.proto.Messages.Payload;
+import org.apache.pekko.grpc.benchmarks.proto.Messages.SimpleRequest;
+import org.apache.pekko.grpc.benchmarks.proto.Messages.SimpleResponse;
+import org.apache.pekko.http.javadsl.ConnectionContext;
+import org.apache.pekko.http.javadsl.HttpsConnectionContext;
import com.google.protobuf.ByteString;
import io.grpc.Status;
import io.grpc.internal.testing.TestUtils;
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/driver/LoadClient.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadClient.java
similarity index 94%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/driver/LoadClient.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadClient.java
index b15c28eb..cae17a7a 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/driver/LoadClient.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadClient.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.driver;
-
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.grpc.GrpcClientSettings;
-import akka.grpc.benchmarks.Utils;
-import akka.grpc.benchmarks.proto.*;
-import akka.stream.Materializer;
-import akka.stream.SystemMaterializer;
-import akka.stream.OverflowStrategy;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+package org.apache.pekko.grpc.benchmarks.driver;
+
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.grpc.GrpcClientSettings;
+import org.apache.pekko.grpc.benchmarks.Utils;
+import org.apache.pekko.grpc.benchmarks.proto.*;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.OverflowStrategy;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
import com.sun.management.OperatingSystemMXBean;
import io.grpc.Status;
import io.grpc.netty.shaded.io.netty.util.concurrent.DefaultThreadFactory;
@@ -317,7 +317,7 @@ class LoadClient {
.runWith(Sink.foreach(rsp -> {
delay(System.nanoTime() - lastCall.get());
if (shutdown) {
- requestIngress.get().tell(new akka.actor.Status.Success("done"), ActorRef.noSender());
+ requestIngress.get().tell(new org.apache.pekko.actor.Status.Success("done"), ActorRef.noSender());
// Must not send another request.
return;
}
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/driver/LoadServer.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadServer.java
similarity index 92%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/driver/LoadServer.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadServer.java
index 43940b5f..43193ddf 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/driver/LoadServer.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadServer.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.driver;
+package org.apache.pekko.grpc.benchmarks.driver;
-import akka.grpc.benchmarks.Utils;
-import akka.grpc.benchmarks.proto.Control;
-import akka.grpc.benchmarks.proto.Stats;
-import akka.grpc.benchmarks.qps.AsyncServer;
+import org.apache.pekko.grpc.benchmarks.Utils;
+import org.apache.pekko.grpc.benchmarks.proto.Control;
+import org.apache.pekko.grpc.benchmarks.proto.Stats;
+import org.apache.pekko.grpc.benchmarks.qps.AsyncServer;
import com.sun.management.OperatingSystemMXBean;
import java.lang.management.ManagementFactory;
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/driver/LoadWorker.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadWorker.java
similarity index 89%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/driver/LoadWorker.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadWorker.java
index ee0cc718..37145946 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/driver/LoadWorker.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadWorker.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.driver;
-
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.grpc.benchmarks.Utils;
-import akka.grpc.benchmarks.proto.Control;
-import akka.grpc.benchmarks.proto.Control.ClientArgs;
-import akka.grpc.benchmarks.proto.Control.ServerArgs;
-import akka.grpc.benchmarks.proto.Control.ServerArgs.ArgtypeCase;
-import akka.grpc.benchmarks.proto.WorkerService;
-import akka.grpc.benchmarks.proto.WorkerServiceHandlerFactory;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.stream.SystemMaterializer;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Source;
+package org.apache.pekko.grpc.benchmarks.driver;
+
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.grpc.benchmarks.Utils;
+import org.apache.pekko.grpc.benchmarks.proto.Control;
+import org.apache.pekko.grpc.benchmarks.proto.Control.ClientArgs;
+import org.apache.pekko.grpc.benchmarks.proto.Control.ServerArgs;
+import org.apache.pekko.grpc.benchmarks.proto.Control.ServerArgs.ArgtypeCase;
+import org.apache.pekko.grpc.benchmarks.proto.WorkerService;
+import org.apache.pekko.grpc.benchmarks.proto.WorkerServiceHandlerFactory;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Source;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import io.grpc.Status;
@@ -128,7 +128,7 @@ public class LoadWorker {
// important to enable HTTP/2 in ActorSystem's config
- Config conf = ConfigFactory.parseString("akka.http.server.preview.enable-http2 = on")
+ Config conf = ConfigFactory.parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication());
ActorSystem system = ActorSystem.create("LoadWorker", conf);
new LoadWorker(system, driverPort, serverPort).start();
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/AbstractConfigurationBuilder.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AbstractConfigurationBuilder.java
similarity index 99%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/qps/AbstractConfigurationBuilder.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AbstractConfigurationBuilder.java
index 4accc5dd..6da15262 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/AbstractConfigurationBuilder.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AbstractConfigurationBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.qps;
+package org.apache.pekko.grpc.benchmarks.qps;
import com.google.common.base.Strings;
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/AsyncClient.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncClient.java
similarity index 91%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/qps/AsyncClient.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncClient.java
index b3cec6da..c5c7295c 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/AsyncClient.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncClient.java
@@ -15,23 +15,23 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.qps;
-
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.grpc.GrpcClientSettings;
-import akka.grpc.benchmarks.Utils;
-import akka.grpc.benchmarks.proto.BenchmarkServiceClient;
-import akka.grpc.benchmarks.proto.Messages.Payload;
-import akka.grpc.benchmarks.proto.Messages.SimpleRequest;
-import akka.grpc.benchmarks.proto.Messages.SimpleResponse;
-import akka.stream.SystemMaterializer;
-import akka.stream.Materializer;
-import akka.stream.OverflowStrategy;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+package org.apache.pekko.grpc.benchmarks.qps;
+
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.grpc.GrpcClientSettings;
+import org.apache.pekko.grpc.benchmarks.Utils;
+import org.apache.pekko.grpc.benchmarks.proto.BenchmarkServiceClient;
+import org.apache.pekko.grpc.benchmarks.proto.Messages.Payload;
+import org.apache.pekko.grpc.benchmarks.proto.Messages.SimpleRequest;
+import org.apache.pekko.grpc.benchmarks.proto.Messages.SimpleResponse;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.OverflowStrategy;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
import com.google.common.base.Preconditions;
import com.google.protobuf.ByteString;
import io.grpc.Status;
@@ -46,8 +46,8 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
-import static akka.grpc.benchmarks.Utils.*;
-import static akka.grpc.benchmarks.qps.ClientConfiguration.ClientParam.*;
+import static org.apache.pekko.grpc.benchmarks.Utils.*;
+import static org.apache.pekko.grpc.benchmarks.qps.ClientConfiguration.ClientParam.*;
/**
* QPS Client using the non-blocking API.
@@ -224,7 +224,7 @@ public class AsyncClient {
if (endTime > now) {
requestIngress.get().tell(request, ActorRef.noSender());
} else {
- requestIngress.get().tell(new akka.actor.Status.Success("done"), ActorRef.noSender());
+ requestIngress.get().tell(new org.apache.pekko.actor.Status.Success("done"), ActorRef.noSender());
}
}), mat);
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/AsyncServer.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncServer.java
similarity index 85%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/qps/AsyncServer.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncServer.java
index 4f6411f2..b35d18dd 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/AsyncServer.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncServer.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.qps;
-
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.grpc.benchmarks.Utils;
-import akka.grpc.benchmarks.proto.BenchmarkService;
-import akka.grpc.benchmarks.proto.BenchmarkServiceHandlerFactory;
-import akka.grpc.benchmarks.proto.Messages;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBuilder;
-import akka.stream.SystemMaterializer;
-import akka.stream.KillSwitches;
-import akka.stream.Materializer;
-import akka.stream.SharedKillSwitch;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+package org.apache.pekko.grpc.benchmarks.qps;
+
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.grpc.benchmarks.Utils;
+import org.apache.pekko.grpc.benchmarks.proto.BenchmarkService;
+import org.apache.pekko.grpc.benchmarks.proto.BenchmarkServiceHandlerFactory;
+import org.apache.pekko.grpc.benchmarks.proto.Messages;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBuilder;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.KillSwitches;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.SharedKillSwitch;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
import com.google.protobuf.ByteString;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
@@ -67,7 +67,7 @@ public class AsyncServer {
public void run(InetSocketAddress address, boolean useTls) throws Exception {
// important to enable HTTP/2 in ActorSystem's config
- Config conf = ConfigFactory.parseString("akka.http.server.preview.enable-http2 = on")
+ Config conf = ConfigFactory.parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication());
system = ActorSystem.create("AsyncServer", conf);
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/ClientConfiguration.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/ClientConfiguration.java
similarity index 95%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/qps/ClientConfiguration.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/ClientConfiguration.java
index 85c9f68d..79e10ee7 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/ClientConfiguration.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/ClientConfiguration.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.qps;
+package org.apache.pekko.grpc.benchmarks.qps;
-import akka.grpc.benchmarks.Transport;
-import akka.grpc.benchmarks.Utils;
-import akka.grpc.benchmarks.proto.Control.RpcType;
-import akka.grpc.benchmarks.proto.Messages;
-import akka.grpc.benchmarks.proto.Messages.PayloadType;
+import org.apache.pekko.grpc.benchmarks.Transport;
+import org.apache.pekko.grpc.benchmarks.Utils;
+import org.apache.pekko.grpc.benchmarks.proto.Control.RpcType;
+import org.apache.pekko.grpc.benchmarks.proto.Messages;
+import org.apache.pekko.grpc.benchmarks.proto.Messages.PayloadType;
import io.grpc.internal.testing.TestUtils;
import java.net.InetSocketAddress;
@@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
-import static akka.grpc.benchmarks.Utils.parseBoolean;
+import static org.apache.pekko.grpc.benchmarks.Utils.parseBoolean;
import static java.lang.Integer.parseInt;
import static java.util.Arrays.asList;
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/Configuration.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/Configuration.java
similarity index 96%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/qps/Configuration.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/Configuration.java
index fe1db477..060f52e0 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/Configuration.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/Configuration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.qps;
+package org.apache.pekko.grpc.benchmarks.qps;
/**
* Configuration for a benchmark application.
diff --git a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/ServerConfiguration.java b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/ServerConfiguration.java
similarity index 96%
rename from benchmark-java/src/main/java/akka/grpc/benchmarks/qps/ServerConfiguration.java
rename to benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/ServerConfiguration.java
index ae0fcaf5..0c038432 100644
--- a/benchmark-java/src/main/java/akka/grpc/benchmarks/qps/ServerConfiguration.java
+++ b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/ServerConfiguration.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.qps;
+package org.apache.pekko.grpc.benchmarks.qps;
-import akka.grpc.benchmarks.SocketAddressValidator;
-import akka.grpc.benchmarks.Utils;
+import org.apache.pekko.grpc.benchmarks.SocketAddressValidator;
+import org.apache.pekko.grpc.benchmarks.Utils;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.*;
-import static akka.grpc.benchmarks.Utils.parseBoolean;
+import static org.apache.pekko.grpc.benchmarks.Utils.parseBoolean;
import static java.lang.Integer.parseInt;
/**
diff --git a/benchmark-java/src/main/protobuf/control.proto b/benchmark-java/src/main/protobuf/control.proto
index 1f354655..beb86419 100644
--- a/benchmark-java/src/main/protobuf/control.proto
+++ b/benchmark-java/src/main/protobuf/control.proto
@@ -20,7 +20,7 @@ import "stats.proto";
package grpc.testing;
-option java_package = "akka.grpc.benchmarks.proto";
+option java_package = "org.apache.pekko.grpc.benchmarks.proto";
option java_outer_classname = "Control";
enum ClientType {
diff --git a/benchmark-java/src/main/protobuf/messages.proto b/benchmark-java/src/main/protobuf/messages.proto
index 363781b5..3d63bd58 100644
--- a/benchmark-java/src/main/protobuf/messages.proto
+++ b/benchmark-java/src/main/protobuf/messages.proto
@@ -19,7 +19,7 @@ syntax = "proto3";
package grpc.testing;
-option java_package = "akka.grpc.benchmarks.proto";
+option java_package = "org.apache.pekko.grpc.benchmarks.proto";
option java_outer_classname = "Messages";
// TODO(dgq): Go back to using well-known types once
diff --git a/benchmark-java/src/main/protobuf/payloads.proto b/benchmark-java/src/main/protobuf/payloads.proto
index b4226a2d..0bfd935c 100644
--- a/benchmark-java/src/main/protobuf/payloads.proto
+++ b/benchmark-java/src/main/protobuf/payloads.proto
@@ -17,7 +17,7 @@ syntax = "proto3";
package grpc.testing;
-option java_package = "akka.grpc.benchmarks.proto";
+option java_package = "org.apache.pekko.grpc.benchmarks.proto";
option java_outer_classname = "Payloads";
message ByteBufferParams {
diff --git a/benchmark-java/src/main/protobuf/services.proto b/benchmark-java/src/main/protobuf/services.proto
index 58ff1ff8..78d17393 100644
--- a/benchmark-java/src/main/protobuf/services.proto
+++ b/benchmark-java/src/main/protobuf/services.proto
@@ -23,7 +23,7 @@ import "stats.proto";
package grpc.testing;
-option java_package = "akka.grpc.benchmarks.proto";
+option java_package = "org.apache.pekko.grpc.benchmarks.proto";
option java_outer_classname = "Services";
service BenchmarkService {
diff --git a/benchmark-java/src/main/protobuf/stats.proto b/benchmark-java/src/main/protobuf/stats.proto
index ea9835fb..8389bfe3 100644
--- a/benchmark-java/src/main/protobuf/stats.proto
+++ b/benchmark-java/src/main/protobuf/stats.proto
@@ -17,7 +17,7 @@ syntax = "proto3";
package grpc.testing;
-option java_package = "akka.grpc.benchmarks.proto";
+option java_package = "org.apache.pekko.grpc.benchmarks.proto";
option java_outer_classname = "Stats";
message ServerStats {
diff --git a/benchmark-java/src/main/resources/application.conf b/benchmark-java/src/main/resources/application.conf
index 7fe0ff8a..1fafded5 100644
--- a/benchmark-java/src/main/resources/application.conf
+++ b/benchmark-java/src/main/resources/application.conf
@@ -1,6 +1,6 @@
-akka.loglevel = INFO
+pekko.loglevel = INFO
-akka.actor.default-dispatcher {
+pekko.actor.default-dispatcher {
executor = "fork-join-executor"
fork-join-executor {
parallelism-factor = 1
diff --git a/benchmark-java/src/test/java/akka/grpc/benchmarks/driver/LoadClientTest.java b/benchmark-java/src/test/java/org/apache/pekko/grpc/benchmarks/driver/LoadClientTest.java
similarity index 95%
rename from benchmark-java/src/test/java/akka/grpc/benchmarks/driver/LoadClientTest.java
rename to benchmark-java/src/test/java/org/apache/pekko/grpc/benchmarks/driver/LoadClientTest.java
index 5128aaa4..481f00f8 100644
--- a/benchmark-java/src/test/java/akka/grpc/benchmarks/driver/LoadClientTest.java
+++ b/benchmark-java/src/test/java/org/apache/pekko/grpc/benchmarks/driver/LoadClientTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.driver;
+package org.apache.pekko.grpc.benchmarks.driver;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertTrue;
-import akka.grpc.benchmarks.proto.Control;
-import akka.grpc.benchmarks.proto.Stats;
+import org.apache.pekko.grpc.benchmarks.proto.Control;
+import org.apache.pekko.grpc.benchmarks.proto.Stats;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/benchmark-java/src/test/java/akka/grpc/benchmarks/driver/LoadWorkerTest.java b/benchmark-java/src/test/java/org/apache/pekko/grpc/benchmarks/driver/LoadWorkerTest.java
similarity index 91%
rename from benchmark-java/src/test/java/akka/grpc/benchmarks/driver/LoadWorkerTest.java
rename to benchmark-java/src/test/java/org/apache/pekko/grpc/benchmarks/driver/LoadWorkerTest.java
index 25a27d7d..f13915c6 100644
--- a/benchmark-java/src/test/java/akka/grpc/benchmarks/driver/LoadWorkerTest.java
+++ b/benchmark-java/src/test/java/org/apache/pekko/grpc/benchmarks/driver/LoadWorkerTest.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package akka.grpc.benchmarks.driver;
-
-import akka.actor.ActorSystem;
-import akka.actor.Cancellable;
-import akka.grpc.GrpcClientSettings;
-import akka.grpc.benchmarks.Utils;
-import akka.grpc.benchmarks.proto.Control;
-import akka.grpc.benchmarks.proto.Stats;
-import akka.grpc.benchmarks.proto.WorkerServiceClient;
-import akka.stream.SystemMaterializer;
-import akka.stream.KillSwitches;
-import akka.stream.Materializer;
-import akka.stream.SharedKillSwitch;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+package org.apache.pekko.grpc.benchmarks.driver;
+
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Cancellable;
+import org.apache.pekko.grpc.GrpcClientSettings;
+import org.apache.pekko.grpc.benchmarks.Utils;
+import org.apache.pekko.grpc.benchmarks.proto.Control;
+import org.apache.pekko.grpc.benchmarks.proto.Stats;
+import org.apache.pekko.grpc.benchmarks.proto.WorkerServiceClient;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.KillSwitches;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.SharedKillSwitch;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import org.junit.After;
@@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertTrue;
/**
- * Basic tests for {@link akka.grpc.benchmarks.driver.LoadWorker}
+ * Basic tests for {@link org.apache.pekko.grpc.benchmarks.driver.LoadWorker}
*/
@RunWith(JUnit4.class)
public class LoadWorkerTest extends JUnitSuite {
@@ -69,7 +69,7 @@ public class LoadWorkerTest extends JUnitSuite {
@Before
public void setup() throws Exception {
// important to enable HTTP/2 in ActorSystem's config
- Config conf = ConfigFactory.parseString("akka.http.server.preview.enable-http2 = on")
+ Config conf = ConfigFactory.parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication());
system = ActorSystem.create("LoadWorkerTest", conf);
mat = SystemMaterializer.get(system).materializer();
diff --git a/benchmarks/README.md b/benchmarks/README.md
index f9b7079a..968a0410 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -1,6 +1,6 @@
-# Akka gRPC Microbenchmarks
+# Apache Pekko gRPC Microbenchmarks
-This subproject contains some microbenchmarks parts of Akka gRPC.
+This subproject contains some microbenchmarks parts of Apache Pekko gRPC.
You can run them on the `sbt` prompt like:
diff --git a/benchmarks/src/main/scala/akka/grpc/BenchRunner.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala
similarity index 97%
rename from benchmarks/src/main/scala/akka/grpc/BenchRunner.scala
rename to benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala
index 53f929d5..28bd1e32 100644
--- a/benchmarks/src/main/scala/akka/grpc/BenchRunner.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
import org.openjdk.jmh.results.RunResult
import org.openjdk.jmh.runner.Runner
diff --git a/benchmarks/src/main/scala/akka/grpc/CommonBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala
similarity index 97%
rename from benchmarks/src/main/scala/akka/grpc/CommonBenchmark.scala
rename to benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala
index f7171589..4d5747e9 100644
--- a/benchmarks/src/main/scala/akka/grpc/CommonBenchmark.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
import java.util.concurrent.TimeUnit
diff --git a/benchmarks/src/main/scala/akka/grpc/GrpcMarshallingBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala
similarity index 75%
rename from benchmarks/src/main/scala/akka/grpc/GrpcMarshallingBenchmark.scala
rename to benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala
index 79f340c7..69bd3fc3 100644
--- a/benchmarks/src/main/scala/akka/grpc/GrpcMarshallingBenchmark.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
-import akka.actor.ActorSystem
-import akka.grpc.internal.{ GrpcProtocolNative, Identity }
-import akka.grpc.scaladsl.GrpcMarshalling
-import akka.http.scaladsl.model.HttpResponse
-import akka.stream.scaladsl.Source
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.internal.{ GrpcProtocolNative, Identity }
+import org.apache.pekko.grpc.scaladsl.GrpcMarshalling
+import org.apache.pekko.http.scaladsl.model.HttpResponse
+import org.apache.pekko.stream.scaladsl.Source
import grpc.reflection.v1alpha.reflection._
import org.openjdk.jmh.annotations._
diff --git a/benchmarks/src/main/scala/akka/grpc/HandlerProcessingBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala
similarity index 71%
rename from benchmarks/src/main/scala/akka/grpc/HandlerProcessingBenchmark.scala
rename to benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala
index 370ca79f..ddb774e6 100644
--- a/benchmarks/src/main/scala/akka/grpc/HandlerProcessingBenchmark.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala
@@ -2,26 +2,26 @@
* Copyright (C) 2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
import scala.concurrent.Await
import scala.concurrent.Future
import scala.concurrent.duration.Duration
-import akka.NotUsed
-import akka.actor.ActorSystem
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
-import akka.grpc.internal.Identity
-import akka.grpc.internal.GrpcRequestHelpers
-import akka.grpc.internal.GrpcProtocolNative
+import org.apache.pekko.grpc.internal.Identity
+import org.apache.pekko.grpc.internal.GrpcRequestHelpers
+import org.apache.pekko.grpc.internal.GrpcProtocolNative
-import akka.http.scaladsl.model.HttpRequest
-import akka.http.scaladsl.model.HttpResponse
-import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.model.Uri
+import org.apache.pekko.http.scaladsl.model.HttpRequest
+import org.apache.pekko.http.scaladsl.model.HttpResponse
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.model.Uri
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
import org.openjdk.jmh.annotations._
diff --git a/build.sbt b/build.sbt
index 218b10d3..e83cc5e6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,19 +1,21 @@
-import akka.grpc.Dependencies
-import akka.grpc.Dependencies.Versions.{ scala212, scala213 }
-import akka.grpc.ProjectExtensions._
-import akka.grpc.build.ReflectiveCodeGen
+import org.apache.pekko.grpc.Dependencies
+import org.apache.pekko.grpc.Dependencies.Versions.{ scala212, scala213 }
+import org.apache.pekko.grpc.ProjectExtensions._
+import org.apache.pekko.grpc.build.ReflectiveCodeGen
import com.typesafe.tools.mima.core._
import sbt.Keys.scalaVersion
-val akkaGrpcRuntimeName = "akka-grpc-runtime"
+val pekkoGrpcRuntimeName = "pekko-grpc-runtime"
lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly")
// gradle plugin compatibility (avoid `+` in snapshot versions)
(ThisBuild / dynverSeparator) := "-"
-val akkaGrpcCodegenId = "akka-grpc-codegen"
-lazy val codegen = Project(id = akkaGrpcCodegenId, base = file("codegen"))
+ThisBuild / resolvers += "Apache Snapshots".at("https://repository.apache.org/content/repositories/snapshots/")
+
+val pekkoGrpcCodegenId = "pekko-grpc-codegen"
+lazy val codegen = Project(id = pekkoGrpcCodegenId, base = file("codegen"))
.enablePlugins(SbtTwirl, BuildInfoPlugin)
.enablePlugins(ReproducibleBuildsPlugin)
.disablePlugins(MimaPlugin)
@@ -25,25 +27,25 @@ lazy val codegen = Project(id = akkaGrpcCodegenId, base = file("codegen"))
Assemblies.mkBatAssembly(file)
},
buildInfoKeys ++= Seq[BuildInfoKey](organization, name, version, scalaVersion, sbtVersion),
- buildInfoKeys += "runtimeArtifactName" -> akkaGrpcRuntimeName,
- buildInfoKeys += "akkaVersion" -> Dependencies.Versions.akka,
- buildInfoKeys += "akkaHttpVersion" -> Dependencies.Versions.akkaHttp,
+ buildInfoKeys += "runtimeArtifactName" -> pekkoGrpcRuntimeName,
+ buildInfoKeys += "pekkoVersion" -> Dependencies.Versions.pekko,
+ buildInfoKeys += "pekkoHttpVersion" -> Dependencies.Versions.pekkoHttp,
buildInfoKeys += "grpcVersion" -> Dependencies.Versions.grpc,
buildInfoKeys += "googleProtobufVersion" -> Dependencies.Versions.googleProtobuf,
- buildInfoPackage := "akka.grpc.gen",
+ buildInfoPackage := "org.apache.pekko.grpc.gen",
(Compile / assembly / artifact) := {
val art = (Compile / assembly / artifact).value
art.withClassifier(Some("assembly"))
},
- (assembly / mainClass) := Some("akka.grpc.gen.Main"),
+ (assembly / mainClass) := Some("org.apache.pekko.grpc.gen.Main"),
(assembly / assemblyOption) := (assembly / assemblyOption).value.withPrependShellScript(
Some(sbtassembly.AssemblyPlugin.defaultUniversalScript(shebang = true))),
crossScalaVersions := Dependencies.Versions.CrossScalaForPlugin,
scalaVersion := scala212)
.settings(addArtifact(Compile / assembly / artifact, assembly))
- .settings(addArtifact(Artifact(akkaGrpcCodegenId, "bat", "bat", "bat"), mkBatAssemblyTask))
+ .settings(addArtifact(Artifact(pekkoGrpcCodegenId, "bat", "bat", "bat"), mkBatAssemblyTask))
-lazy val runtime = Project(id = akkaGrpcRuntimeName, base = file("runtime"))
+lazy val runtime = Project(id = pekkoGrpcRuntimeName, base = file("runtime"))
.settings(Dependencies.runtime)
.settings(VersionGenerator.settings)
.settings(
@@ -52,17 +54,17 @@ lazy val runtime = Project(id = akkaGrpcRuntimeName, base = file("runtime"))
.settings(
mimaFailOnNoPrevious := true,
mimaPreviousArtifacts := Set.empty, // temporarily disable mima checks
- AutomaticModuleName.settings("akka.grpc.runtime"),
+ AutomaticModuleName.settings("pekko.grpc.runtime"),
MetaInfLicenseNoticeCopy.settings,
ReflectiveCodeGen.generatedLanguages := Seq("Scala"),
ReflectiveCodeGen.extraGenerators := Seq("ScalaMarshallersCodeGenerator"),
PB.protocVersion := Dependencies.Versions.googleProtobuf)
- .enablePlugins(akka.grpc.build.ReflectiveCodeGen)
+ .enablePlugins(org.apache.pekko.grpc.build.ReflectiveCodeGen)
.enablePlugins(ReproducibleBuildsPlugin)
/** This could be an independent project - or does upstream provide this already? didn't find it.. */
-val akkaGrpcProtocPluginId = "akka-grpc-scalapb-protoc-plugin"
-lazy val scalapbProtocPlugin = Project(id = akkaGrpcProtocPluginId, base = file("scalapb-protoc-plugin"))
+val pekkoGrpcProtocPluginId = "pekko-grpc-scalapb-protoc-plugin"
+lazy val scalapbProtocPlugin = Project(id = pekkoGrpcProtocPluginId, base = file("scalapb-protoc-plugin"))
.disablePlugins(MimaPlugin)
/** TODO we only really need to depend on scalapb */
.dependsOn(codegen)
@@ -75,7 +77,7 @@ lazy val scalapbProtocPlugin = Project(id = akkaGrpcProtocPluginId, base = file(
val art = (Compile / assembly / artifact).value
art.withClassifier(Some("assembly"))
},
- (assembly / mainClass) := Some("akka.grpc.scalapb.Main"),
+ (assembly / mainClass) := Some("org.apache.pekko.grpc.scalapb.Main"),
(assembly / assemblyOption) := (assembly / assemblyOption).value.withPrependShellScript(
Some(sbtassembly.AssemblyPlugin.defaultUniversalScript(shebang = true))))
.settings(
@@ -83,11 +85,11 @@ lazy val scalapbProtocPlugin = Project(id = akkaGrpcProtocPluginId, base = file(
scalaVersion := Dependencies.Versions.CrossScalaForPlugin.head)
.settings(MetaInfLicenseNoticeCopy.settings)
.settings(addArtifact(Compile / assembly / artifact, assembly))
- .settings(addArtifact(Artifact(akkaGrpcProtocPluginId, "bat", "bat", "bat"), mkBatAssemblyTask))
+ .settings(addArtifact(Artifact(pekkoGrpcProtocPluginId, "bat", "bat", "bat"), mkBatAssemblyTask))
.enablePlugins(ReproducibleBuildsPlugin)
-lazy val mavenPlugin = Project(id = "akka-grpc-maven-plugin", base = file("maven-plugin"))
- .enablePlugins(akka.grpc.SbtMavenPlugin)
+lazy val mavenPlugin = Project(id = "pekko-grpc-maven-plugin", base = file("maven-plugin"))
+ .enablePlugins(org.apache.pekko.grpc.SbtMavenPlugin)
.enablePlugins(ReproducibleBuildsPlugin)
.disablePlugins(MimaPlugin)
.settings(Dependencies.mavenPlugin)
@@ -99,7 +101,7 @@ lazy val mavenPlugin = Project(id = "akka-grpc-maven-plugin", base = file("maven
.settings(MetaInfLicenseNoticeCopy.settings)
.dependsOn(codegen)
-lazy val sbtPlugin = Project(id = "sbt-akka-grpc", base = file("sbt-plugin"))
+lazy val sbtPlugin = Project(id = "sbt-pekko-grpc", base = file("sbt-plugin"))
.enablePlugins(SbtPlugin)
.enablePlugins(ReproducibleBuildsPlugin)
.disablePlugins(MimaPlugin)
@@ -121,7 +123,7 @@ lazy val sbtPlugin = Project(id = "sbt-akka-grpc", base = file("sbt-plugin"))
.settings(MetaInfLicenseNoticeCopy.settings)
.dependsOn(codegen)
-lazy val interopTests = Project(id = "akka-grpc-interop-tests", base = file("interop-tests"))
+lazy val interopTests = Project(id = "pekko-grpc-interop-tests", base = file("interop-tests"))
.disablePlugins(MimaPlugin)
.settings(Dependencies.interopTests)
.settings(
@@ -169,26 +171,26 @@ lazy val benchmarks = Project(id = "benchmarks", base = file("benchmarks"))
(publish / skip) := true)
.settings(MetaInfLicenseNoticeCopy.settings)
-lazy val docs = Project(id = "akka-grpc-docs", base = file("docs"))
-// Make sure code generation is ran:
+lazy val docs = Project(id = "pekko-grpc-docs", base = file("docs"))
+// Make sure code generation is run:
.dependsOn(pluginTesterScala)
.dependsOn(pluginTesterJava)
.enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
.disablePlugins(MimaPlugin)
.settings(
- name := "Akka gRPC",
+ name := "Apache Pekko gRPC",
publish / skip := true,
makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value,
previewPath := (Paradox / siteSubdirName).value,
Preprocess / siteSubdirName := s"api/akka-grpc/${projectInfoVersion.value}",
Preprocess / sourceDirectory := (LocalRootProject / ScalaUnidoc / unidoc / target).value,
Paradox / siteSubdirName := s"docs/akka-grpc/${projectInfoVersion.value}",
- // Make sure code generation is ran before paradox:
+ // Make sure code generation is run before paradox:
(Compile / paradox) := (Compile / paradox).dependsOn(Compile / compile).value,
paradoxGroups := Map("Language" -> Seq("Java", "Scala"), "Buildtool" -> Seq("sbt", "Gradle", "Maven")),
Compile / paradoxProperties ++= Map(
- "akka.version" -> Dependencies.Versions.akka,
- "akka-http.version" -> Dependencies.Versions.akkaHttp,
+ "pekko.version" -> Dependencies.Versions.pekko,
+ "pekko-http.version" -> Dependencies.Versions.pekkoHttp,
"grpc.version" -> Dependencies.Versions.grpc,
"project.url" -> "https://doc.akka.io/docs/akka-grpc/current/",
"canonical.base_url" -> "https://doc.akka.io/docs/akka-grpc/current",
@@ -201,11 +203,11 @@ lazy val docs = Project(id = "akka-grpc-docs", base = file("docs"))
"extref.akka-http.base_url" -> s"https://doc.akka.io/docs/akka-http/${Dependencies.Versions.akkaHttpBinary}/%s",
"scaladoc.akka.http.base_url" -> s"https://doc.akka.io/api/akka-http/${Dependencies.Versions.akkaHttpBinary}/",
"javadoc.akka.http.base_url" -> s"https://doc.akka.io/japi/akka-http/${Dependencies.Versions.akkaHttpBinary}/",
- // Akka gRPC
+ // Apache Pekko gRPC
"scaladoc.akka.grpc.base_url" -> s"/${(Preprocess / siteSubdirName).value}/",
"javadoc.akka.grpc.base_url" -> "" // @apidoc links to Scaladoc
),
- apidocRootPackage := "akka",
+ apidocRootPackage := "org.apache.pekko",
resolvers += Resolver.jcenterRepo,
publishRsyncArtifacts += makeSite.value -> "www/",
publishRsyncHost := "akkarepo@gustav.akka.io")
@@ -213,7 +215,7 @@ lazy val docs = Project(id = "akka-grpc-docs", base = file("docs"))
crossScalaVersions := Dependencies.Versions.CrossScalaForLib,
scalaVersion := Dependencies.Versions.CrossScalaForLib.head)
-lazy val pluginTesterScala = Project(id = "akka-grpc-plugin-tester-scala", base = file("plugin-tester-scala"))
+lazy val pluginTesterScala = Project(id = "pekko-grpc-plugin-tester-scala", base = file("plugin-tester-scala"))
.disablePlugins(MimaPlugin)
.settings(Dependencies.pluginTester)
.settings(
@@ -225,7 +227,7 @@ lazy val pluginTesterScala = Project(id = "akka-grpc-plugin-tester-scala", base
.settings(MetaInfLicenseNoticeCopy.settings)
.pluginTestingSettings
-lazy val pluginTesterJava = Project(id = "akka-grpc-plugin-tester-java", base = file("plugin-tester-java"))
+lazy val pluginTesterJava = Project(id = "pekko-grpc-plugin-tester-java", base = file("plugin-tester-java"))
.disablePlugins(MimaPlugin)
.settings(Dependencies.pluginTester)
.settings(
diff --git a/codegen/src/main/scala/akka/grpc/gen/Constants.scala b/codegen/src/main/scala/akka/grpc/gen/Constants.scala
deleted file mode 100644
index be84a0e2..00000000
--- a/codegen/src/main/scala/akka/grpc/gen/Constants.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
- */
-
-package akka.grpc.gen
-
-object Constants {
- val DoNotEditComment = "// Generated by Akka gRPC. DO NOT EDIT."
-}
diff --git a/codegen/src/main/scala/akka/grpc/gen/CodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
similarity index 93%
rename from codegen/src/main/scala/akka/grpc/gen/CodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
index 97592be3..fed4f384 100644
--- a/codegen/src/main/scala/akka/grpc/gen/CodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen
+package org.apache.pekko.grpc.gen
import scala.annotation.nowarn
import com.google.protobuf.ExtensionRegistry
@@ -16,7 +16,7 @@ import protocbridge.Artifact
trait CodeGenerator {
import CodeGenerator._
- /** Generator name; example: `akka-grpc-scala` */
+ /** Generator name; example: `pekko-grpc-scala` */
def name: String
def run(request: CodeGeneratorRequest, logger: Logger): CodeGeneratorResponse
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala
new file mode 100644
index 00000000..56c198f0
--- /dev/null
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala
@@ -0,0 +1,9 @@
+/*
+ * Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+package org.apache.pekko.grpc.gen
+
+object Constants {
+ val DoNotEditComment = "// Generated by Pekko gRPC. DO NOT EDIT."
+}
diff --git a/codegen/src/main/scala/akka/grpc/gen/Logging.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala
similarity index 98%
rename from codegen/src/main/scala/akka/grpc/gen/Logging.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala
index 92394406..7c3ed13f 100644
--- a/codegen/src/main/scala/akka/grpc/gen/Logging.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen
+package org.apache.pekko.grpc.gen
import java.io.PrintWriter
diff --git a/codegen/src/main/scala/akka/grpc/gen/Main.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala
similarity index 91%
rename from codegen/src/main/scala/akka/grpc/gen/Main.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala
index 1d5821ed..35160a82 100644
--- a/codegen/src/main/scala/akka/grpc/gen/Main.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala
@@ -2,14 +2,22 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen
+package org.apache.pekko.grpc.gen
import java.io.ByteArrayOutputStream
import java.net.URLDecoder
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest
-import akka.grpc.gen.javadsl.{ JavaClientCodeGenerator, JavaInterfaceCodeGenerator, JavaServerCodeGenerator }
-import akka.grpc.gen.scaladsl.{ ScalaClientCodeGenerator, ScalaServerCodeGenerator, ScalaTraitCodeGenerator }
+import org.apache.pekko.grpc.gen.javadsl.{
+ JavaClientCodeGenerator,
+ JavaInterfaceCodeGenerator,
+ JavaServerCodeGenerator
+}
+import org.apache.pekko.grpc.gen.scaladsl.{
+ ScalaClientCodeGenerator,
+ ScalaServerCodeGenerator,
+ ScalaTraitCodeGenerator
+}
// This is the protoc plugin that the gradle plugin uses
object Main extends App {
diff --git a/codegen/src/main/scala/akka/grpc/gen/MethodType.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala
similarity index 89%
rename from codegen/src/main/scala/akka/grpc/gen/MethodType.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala
index 4d04da75..423fff51 100644
--- a/codegen/src/main/scala/akka/grpc/gen/MethodType.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen
+package org.apache.pekko.grpc.gen
sealed trait MethodType
case object Unary extends MethodType
diff --git a/codegen/src/main/scala/akka/grpc/gen/ProtocSettings.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala
similarity index 93%
rename from codegen/src/main/scala/akka/grpc/gen/ProtocSettings.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala
index 1bb4fd4b..486dc974 100644
--- a/codegen/src/main/scala/akka/grpc/gen/ProtocSettings.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2019-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen
+package org.apache.pekko.grpc.gen
object ProtocSettings {
diff --git a/codegen/src/main/scala/akka/grpc/gen/javadsl/JavaClientCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala
similarity index 81%
rename from codegen/src/main/scala/akka/grpc/gen/javadsl/JavaClientCodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala
index 59a7c2a8..4a8bea9e 100644
--- a/codegen/src/main/scala/akka/grpc/gen/javadsl/JavaClientCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.javadsl
+package org.apache.pekko.grpc.gen.javadsl
import scala.collection.immutable
-import akka.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
+import org.apache.pekko.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
import protocbridge.Artifact
import templates.JavaClient.txt.{ Client, ClientPowerApi }
trait JavaClientCodeGenerator extends JavaCodeGenerator {
- override def name = "akka-grpc-javadsl-client"
+ override def name = "pekko-grpc-javadsl-client"
override def perServiceContent: Set[(Logger, Service) => immutable.Seq[CodeGeneratorResponse.File]] =
super.perServiceContent +
@@ -23,7 +23,7 @@ trait JavaClientCodeGenerator extends JavaCodeGenerator {
b.setContent(Client(service).body)
val clientPath = s"${service.packageDir}/${service.name}Client.java"
b.setName(clientPath)
- logger.info(s"Generating Akka gRPC Client [${service.packageName}.${service.name}]")
+ logger.info(s"Generating Apache Pekko gRPC Client [${service.packageName}.${service.name}]")
immutable.Seq(b.build)
}
@@ -32,7 +32,7 @@ trait JavaClientCodeGenerator extends JavaCodeGenerator {
b.setContent(ClientPowerApi(service).body)
val clientPath = s"${service.packageDir}/${service.name}ClientPowerApi.java"
b.setName(clientPath)
- logger.info(s"Generating Akka gRPC Lifted Client interface[${service.packageName}.${service.name}]")
+ logger.info(s"Generating Apache Pekko gRPC Lifted Client interface[${service.packageName}.${service.name}]")
immutable.Seq(b.build)
}
diff --git a/codegen/src/main/scala/akka/grpc/gen/javadsl/JavaCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala
similarity index 96%
rename from codegen/src/main/scala/akka/grpc/gen/javadsl/JavaCodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala
index b0146654..b448f108 100644
--- a/codegen/src/main/scala/akka/grpc/gen/javadsl/JavaCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala
@@ -2,9 +2,9 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.javadsl
+package org.apache.pekko.grpc.gen.javadsl
-import akka.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
+import org.apache.pekko.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
import com.google.protobuf.compiler.PluginProtos.{ CodeGeneratorRequest, CodeGeneratorResponse }
import protocbridge.Artifact
import templates.JavaCommon.txt.ApiInterface
diff --git a/codegen/src/main/scala/akka/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
similarity index 75%
rename from codegen/src/main/scala/akka/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
index d6e9eb90..ccffd0fa 100644
--- a/codegen/src/main/scala/akka/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
@@ -2,15 +2,15 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.javadsl
+package org.apache.pekko.grpc.gen.javadsl
import scala.collection.immutable
-import akka.grpc.gen.Logger
+import org.apache.pekko.grpc.gen.Logger
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
import templates.JavaCommon.txt.ApiInterface
object JavaInterfaceCodeGenerator extends JavaCodeGenerator {
- override def name = "akka-grpc-javadsl-interface"
+ override def name = "pekko-grpc-javadsl-interface"
override def perServiceContent: Set[(Logger, Service) => immutable.Seq[CodeGeneratorResponse.File]] =
super.perServiceContent + generateServiceFile
@@ -19,7 +19,7 @@ object JavaInterfaceCodeGenerator extends JavaCodeGenerator {
val b = CodeGeneratorResponse.File.newBuilder()
b.setContent(ApiInterface(service).body)
b.setName(s"${service.packageDir}/${service.name}.java")
- logger.info(s"Generating Akka gRPC service interface for [${service.packageName}.${service.name}]")
+ logger.info(s"Generating Apache Pekko gRPC service interface for [${service.packageName}.${service.name}]")
immutable.Seq(b.build)
}
}
diff --git a/codegen/src/main/scala/akka/grpc/gen/javadsl/JavaServerCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala
similarity index 80%
rename from codegen/src/main/scala/akka/grpc/gen/javadsl/JavaServerCodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala
index 256c24ed..bd3a5a7c 100644
--- a/codegen/src/main/scala/akka/grpc/gen/javadsl/JavaServerCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.javadsl
+package org.apache.pekko.grpc.gen.javadsl
import scala.collection.immutable
-import akka.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
+import org.apache.pekko.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
import protocbridge.Artifact
import templates.JavaServer.txt.{ Handler, PowerApiInterface }
class JavaServerCodeGenerator extends JavaCodeGenerator {
- override def name = "akka-grpc-javadsl-server"
+ override def name = "pekko-grpc-javadsl-server"
override def perServiceContent: Set[(Logger, Service) => immutable.Seq[CodeGeneratorResponse.File]] =
super.perServiceContent + generatePlainHandlerFactory +
@@ -30,7 +30,7 @@ class JavaServerCodeGenerator extends JavaCodeGenerator {
b.setContent(Handler(service, powerApis = false).body)
val serverPath = s"${service.packageDir}/${service.name}HandlerFactory.java"
b.setName(serverPath)
- logger.info(s"Generating Akka gRPC service handler for ${service.packageName}.${service.name}")
+ logger.info(s"Generating Apache Pekko gRPC service handler for ${service.packageName}.${service.name}")
immutable.Seq(b.build)
}
@@ -41,7 +41,8 @@ class JavaServerCodeGenerator extends JavaCodeGenerator {
b.setContent(Handler(service, powerApis = true).body)
val serverPath = s"${service.packageDir}/${service.name}PowerApiHandlerFactory.java"
b.setName(serverPath)
- logger.info(s"Generating Akka gRPC service power API handler for ${service.packageName}.${service.name}")
+ logger.info(
+ s"Generating Apache Pekko gRPC service power API handler for ${service.packageName}.${service.name}")
immutable.Seq(b.build)
} else immutable.Seq.empty
}
@@ -51,7 +52,7 @@ class JavaServerCodeGenerator extends JavaCodeGenerator {
val b = CodeGeneratorResponse.File.newBuilder()
b.setContent(PowerApiInterface(service).body)
b.setName(s"${service.packageDir}/${service.name}PowerApi.java")
- logger.info(s"Generating Akka gRPC service power interface for [${service.packageName}.${service.name}]")
+ logger.info(s"Generating Apache Pekko gRPC service power interface for [${service.packageName}.${service.name}]")
immutable.Seq(b.build)
} else immutable.Seq.empty
}
diff --git a/codegen/src/main/scala/akka/grpc/gen/javadsl/Method.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala
similarity index 91%
rename from codegen/src/main/scala/akka/grpc/gen/javadsl/Method.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala
index b30272f2..fdd3051d 100644
--- a/codegen/src/main/scala/akka/grpc/gen/javadsl/Method.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala
@@ -2,9 +2,9 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.javadsl
+package org.apache.pekko.grpc.gen.javadsl
-import akka.grpc.gen._
+import org.apache.pekko.grpc.gen._
import com.google.protobuf.Descriptors.{ Descriptor, MethodDescriptor }
import protocgen.CodeGenRequest
import scalapb.compiler.{ DescriptorImplicits, GeneratorParams }
@@ -48,11 +48,13 @@ final case class Method(
}
def getParameterType =
- if (inputStreaming) s"akka.stream.javadsl.Source<${getMessageType(inputType)}, akka.NotUsed>"
+ if (inputStreaming)
+ s"org.apache.pekko.stream.javadsl.Source<${getMessageType(inputType)}, org.apache.pekko.NotUsed>"
else getMessageType(inputType)
def getReturnType =
- if (outputStreaming) s"akka.stream.javadsl.Source<${getMessageType(outputType)}, akka.NotUsed>"
+ if (outputStreaming)
+ s"org.apache.pekko.stream.javadsl.Source<${getMessageType(outputType)}, org.apache.pekko.NotUsed>"
else s"java.util.concurrent.CompletionStage<${getMessageType(outputType)}>"
}
diff --git a/codegen/src/main/scala/akka/grpc/gen/javadsl/Serializer.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala
similarity index 94%
rename from codegen/src/main/scala/akka/grpc/gen/javadsl/Serializer.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala
index a695ac59..0fc5cc78 100644
--- a/codegen/src/main/scala/akka/grpc/gen/javadsl/Serializer.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.javadsl
+package org.apache.pekko.grpc.gen.javadsl
import com.google.protobuf.Descriptors.{ Descriptor, MethodDescriptor }
diff --git a/codegen/src/main/scala/akka/grpc/gen/javadsl/Service.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala
similarity index 98%
rename from codegen/src/main/scala/akka/grpc/gen/javadsl/Service.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala
index bc4ba12c..1d8cda6d 100644
--- a/codegen/src/main/scala/akka/grpc/gen/javadsl/Service.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.javadsl
+package org.apache.pekko.grpc.gen.javadsl
import com.google.protobuf.Descriptors.{ FileDescriptor, ServiceDescriptor }
import protocgen.CodeGenRequest
diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/Method.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala
similarity index 91%
rename from codegen/src/main/scala/akka/grpc/gen/scaladsl/Method.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala
index 0b75d915..31320e16 100644
--- a/codegen/src/main/scala/akka/grpc/gen/scaladsl/Method.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.scaladsl
+package org.apache.pekko.grpc.gen.scaladsl
import com.google.protobuf.Descriptors.{ Descriptor, MethodDescriptor }
-import akka.grpc.gen._
+import org.apache.pekko.grpc.gen._
import scalapb.compiler.DescriptorImplicits
case class Method(
@@ -32,14 +32,15 @@ case class Method(
else "GrpcMarshalling.marshal"
def parameterType =
- if (inputStreaming) s"akka.stream.scaladsl.Source[${messageType(inputType)}, akka.NotUsed]"
+ if (inputStreaming) s"org.apache.pekko.stream.scaladsl.Source[${messageType(inputType)}, org.apache.pekko.NotUsed]"
else messageType(inputType)
def inputTypeUnboxed = messageType(inputType)
def outputTypeUnboxed = messageType(outputType)
def returnType =
- if (outputStreaming) s"akka.stream.scaladsl.Source[${messageType(outputType)}, akka.NotUsed]"
+ if (outputStreaming)
+ s"org.apache.pekko.stream.scaladsl.Source[${messageType(outputType)}, org.apache.pekko.NotUsed]"
else s"scala.concurrent.Future[${messageType(outputType)}]"
val methodType: MethodType = {
diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
similarity index 79%
rename from codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
index 72f93905..2ca0c062 100644
--- a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.scaladsl
+package org.apache.pekko.grpc.gen.scaladsl
import scala.collection.immutable
-import akka.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
+import org.apache.pekko.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
import protocbridge.Artifact
import templates.ScalaClient.txt._
trait ScalaClientCodeGenerator extends ScalaCodeGenerator {
- override def name = "akka-grpc-scaladsl-client"
+ override def name = "pekko-grpc-scaladsl-client"
override def perServiceContent = super.perServiceContent + generateStub
@@ -19,7 +19,7 @@ trait ScalaClientCodeGenerator extends ScalaCodeGenerator {
val b = CodeGeneratorResponse.File.newBuilder()
b.setContent(Client(service).body)
b.setName(s"${service.packageDir}/${service.name}Client.scala")
- logger.info(s"Generating Akka gRPC client for ${service.packageName}.${service.name}")
+ logger.info(s"Generating Apache Pekko gRPC client for ${service.packageName}.${service.name}")
immutable.Seq(b.build)
}
diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala
similarity index 94%
rename from codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaCodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala
index ce35e218..3f66bc72 100644
--- a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala
@@ -2,12 +2,12 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.scaladsl
+package org.apache.pekko.grpc.gen.scaladsl
import scala.annotation.nowarn
import scala.collection.JavaConverters._
import scala.collection.immutable
-import akka.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
+import org.apache.pekko.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
import com.google.protobuf.compiler.PluginProtos.{ CodeGeneratorRequest, CodeGeneratorResponse }
import scalapb.compiler.GeneratorParams
import protocbridge.Artifact
@@ -48,7 +48,7 @@ abstract class ScalaCodeGenerator extends CodeGenerator {
// Currently per-invocation options, intended to become per-service options eventually
// https://github.com/akka/akka-grpc/issues/451
val params = request.getParameter.toLowerCase
- // flags listed in akkaGrpcCodeGeneratorSettings's description
+ // flags listed in pekkoGrpcCodeGeneratorSettings's description
val serverPowerApi = params.contains("server_power_apis") && !params.contains("server_power_apis=false")
val usePlayActions = params.contains("use_play_actions") && !params.contains("use_play_actions=false")
@@ -79,7 +79,7 @@ abstract class ScalaCodeGenerator extends CodeGenerator {
b.build()
}
- // flags listed in akkaGrpcCodeGeneratorSettings's description
+ // flags listed in pekkoGrpcCodeGeneratorSettings's description
private def parseParameters(params: String): GeneratorParams =
params.split(",").map(_.trim).filter(_.nonEmpty).foldLeft[GeneratorParams](GeneratorParams()) {
case (p, "java_conversions") => p.copy(javaConversions = true)
diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
similarity index 84%
rename from codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
index ac8fe8f7..0de6cc3b 100644
--- a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
@@ -2,11 +2,11 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.scaladsl
+package org.apache.pekko.grpc.gen.scaladsl
import scala.annotation.nowarn
import scala.collection.immutable
-import akka.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
+import org.apache.pekko.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
import protocbridge.Artifact
import templates.ScalaCommon.txt._
@@ -16,13 +16,13 @@ import templates.ScalaCommon.txt._
* it introduces a suggestedDependency on akka-http.
*/
trait ScalaMarshallersCodeGenerator extends ScalaCodeGenerator {
- def name = "akka-grpc-scaladsl-server-marshallers"
+ def name = "pekko-grpc-scaladsl-server-marshallers"
override def perServiceContent = Set(generateMarshalling)
override def suggestedDependencies =
(scalaBinaryVersion: CodeGenerator.ScalaBinaryVersion) =>
- Artifact("com.typesafe.akka", s"akka-http_${scalaBinaryVersion.prefix}", BuildInfo.akkaHttpVersion) +: super
+ Artifact("com.typesafe.akka", s"akka-http_${scalaBinaryVersion.prefix}", BuildInfo.pekkoHttpVersion) +: super
.suggestedDependencies(scalaBinaryVersion)
def generateMarshalling(
diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
similarity index 76%
rename from codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
index c9db8b0c..7e073a66 100644
--- a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
@@ -2,15 +2,15 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.scaladsl
+package org.apache.pekko.grpc.gen.scaladsl
import scala.collection.immutable
-import akka.grpc.gen.Logger
+import org.apache.pekko.grpc.gen.Logger
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
import templates.ScalaServer.txt.{ Handler, PowerApiTrait }
class ScalaServerCodeGenerator extends ScalaCodeGenerator {
- override def name = "akka-grpc-scaladsl-server"
+ override def name = "pekko-grpc-scaladsl-server"
override def perServiceContent =
super.perServiceContent + generatePlainHandler + generatePowerHandler + generatePowerApiTrait
@@ -19,7 +19,7 @@ class ScalaServerCodeGenerator extends ScalaCodeGenerator {
val b = CodeGeneratorResponse.File.newBuilder()
b.setContent(Handler(service, powerApis = false).body)
b.setName(s"${service.packageDir}/${service.name}Handler.scala")
- logger.info(s"Generating Akka gRPC service handler for ${service.packageName}.${service.name}")
+ logger.info(s"Generating Apache Pekko gRPC service handler for ${service.packageName}.${service.name}")
immutable.Seq(b.build)
}
@@ -28,7 +28,7 @@ class ScalaServerCodeGenerator extends ScalaCodeGenerator {
val b = CodeGeneratorResponse.File.newBuilder()
b.setContent(Handler(service, powerApis = true).body)
b.setName(s"${service.packageDir}/${service.name}PowerApiHandler.scala")
- logger.info(s"Generating Akka gRPC service power API handler for ${service.packageName}.${service.name}")
+ logger.info(s"Generating Apache Pekko gRPC service power API handler for ${service.packageName}.${service.name}")
immutable.Seq(b.build)
} else immutable.Seq.empty
}
@@ -38,7 +38,8 @@ class ScalaServerCodeGenerator extends ScalaCodeGenerator {
val b = CodeGeneratorResponse.File.newBuilder()
b.setContent(PowerApiTrait(service).body)
b.setName(s"${service.packageDir}/${service.name}PowerApi.scala")
- logger.info(s"Generating Akka gRPC service power API interface for ${service.packageName}.${service.name}")
+ logger.info(
+ s"Generating Apache Pekko gRPC service power API interface for ${service.packageName}.${service.name}")
immutable.Seq(b.build)
} else immutable.Seq.empty
}
diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
similarity index 73%
rename from codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
index 2f37981a..ad3d9927 100644
--- a/codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
@@ -2,15 +2,15 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.scaladsl
+package org.apache.pekko.grpc.gen.scaladsl
import scala.collection.immutable
-import akka.grpc.gen.Logger
+import org.apache.pekko.grpc.gen.Logger
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
import templates.ScalaCommon.txt.ApiTrait
object ScalaTraitCodeGenerator extends ScalaCodeGenerator {
- override def name = "akka-grpc-scaladsl-trait"
+ override def name = "pekko-grpc-scaladsl-trait"
override def perServiceContent = super.perServiceContent + generateServiceFile
@@ -18,7 +18,7 @@ object ScalaTraitCodeGenerator extends ScalaCodeGenerator {
val b = CodeGeneratorResponse.File.newBuilder()
b.setContent(ApiTrait(service).body)
b.setName(s"${service.packageDir}/${service.name}.scala")
- logger.info(s"Generating Akka gRPC service interface for ${service.packageName}.${service.name}")
+ logger.info(s"Generating Apache Pekko gRPC service interface for ${service.packageName}.${service.name}")
immutable.Seq(b.build)
}
}
diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/Serializer.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala
similarity index 94%
rename from codegen/src/main/scala/akka/grpc/gen/scaladsl/Serializer.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala
index 7618cd4b..809ef02e 100644
--- a/codegen/src/main/scala/akka/grpc/gen/scaladsl/Serializer.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.scaladsl
+package org.apache.pekko.grpc.gen.scaladsl
import com.google.protobuf.Descriptors.{ Descriptor, MethodDescriptor }
import scalapb.compiler.DescriptorImplicits
diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala
similarity index 97%
rename from codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala
index b08fb88c..38aac0bc 100644
--- a/codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.scaladsl
+package org.apache.pekko.grpc.gen.scaladsl
import scala.collection.immutable
import scala.collection.JavaConverters._
diff --git a/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt b/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt
index 17b62af9..4bdc2558 100644
--- a/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt
@@ -2,20 +2,20 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.javadsl.Service)
+@(service: org.apache.pekko.grpc.gen.javadsl.Service)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName;
-import akka.actor.ClassicActorSystemProvider;
-import akka.stream.Materializer;
-import akka.stream.SystemMaterializer;
+import org.apache.pekko.actor.ClassicActorSystemProvider;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.SystemMaterializer;
-import akka.grpc.internal.*;
-import akka.grpc.GrpcChannel;
-import akka.grpc.GrpcClientCloseException;
-import akka.grpc.GrpcClientSettings;
-import akka.grpc.javadsl.AkkaGrpcClient;
+import org.apache.pekko.grpc.internal.*;
+import org.apache.pekko.grpc.GrpcChannel;
+import org.apache.pekko.grpc.GrpcClientCloseException;
+import org.apache.pekko.grpc.GrpcClientSettings;
+import org.apache.pekko.grpc.javadsl.PekkoGrpcClient;
import io.grpc.MethodDescriptor;
@@ -23,21 +23,21 @@ import static @{service.packageName}.@{service.name}.Serializers.*;
import scala.concurrent.ExecutionContext;
-import akka.grpc.AkkaGrpcGenerated;
+import org.apache.pekko.grpc.PekkoGrpcGenerated;
@GenMethodImports(service)
-@@AkkaGrpcGenerated
-public abstract class @{service.name}Client extends @{service.name}ClientPowerApi implements @{service.name}, AkkaGrpcClient {
+@@PekkoGrpcGenerated
+public abstract class @{service.name}Client extends @{service.name}ClientPowerApi implements @{service.name}, PekkoGrpcClient {
public static final @{service.name}Client create(GrpcClientSettings settings, ClassicActorSystemProvider sys) {
- return new Default@{service.name}Client(akka.grpc.GrpcChannel$.MODULE$.apply(settings, sys), true, sys);
+ return new Default@{service.name}Client(org.apache.pekko.grpc.GrpcChannel$.MODULE$.apply(settings, sys), true, sys);
}
public static final @{service.name}Client create(GrpcChannel channel, ClassicActorSystemProvider sys) {
return new Default@{service.name}Client(channel, false, sys);
}
- @@AkkaGrpcGenerated
+ @@PekkoGrpcGenerated
protected final static class Default@{service.name}Client extends @{service.name}Client {
private final GrpcChannel channel;
@@ -59,23 +59,23 @@ public abstract class @{service.name}Client extends @{service.name}ClientPowerAp
}
@for(method <- service.methods) {
- @if(method.methodType == akka.grpc.gen.Unary) {
- private final SingleResponseRequestBuilder<@method.inputTypeUnboxed, @method.outputTypeUnboxed> @{method.name}RequestBuilder(akka.grpc.internal.InternalChannel channel){
+ @if(method.methodType == org.apache.pekko.grpc.gen.Unary) {
+ private final SingleResponseRequestBuilder<@method.inputTypeUnboxed, @method.outputTypeUnboxed> @{method.name}RequestBuilder(org.apache.pekko.grpc.internal.InternalChannel channel){
return new JavaUnaryRequestBuilder<>(@{method.name}Descriptor, channel, options, settings, ec);
}
} else {
- @if(method.methodType == akka.grpc.gen.ClientStreaming){
- private final SingleResponseRequestBuilder<akka.stream.javadsl.Source<@method.inputTypeUnboxed, akka.NotUsed>, @method.outputTypeUnboxed> @{method.name}RequestBuilder(akka.grpc.internal.InternalChannel channel){
+ @if(method.methodType == org.apache.pekko.grpc.gen.ClientStreaming){
+ private final SingleResponseRequestBuilder<org.apache.pekko.stream.javadsl.Source<@method.inputTypeUnboxed, org.apache.pekko.NotUsed>, @method.outputTypeUnboxed> @{method.name}RequestBuilder(org.apache.pekko.grpc.internal.InternalChannel channel){
return new JavaClientStreamingRequestBuilder<>(
@{method.name}Descriptor, channel, options, settings, mat, ec);
}
- } else if(method.methodType == akka.grpc.gen.ServerStreaming){
- private final StreamResponseRequestBuilder<@method.inputTypeUnboxed, @method.outputTypeUnboxed> @{method.name}RequestBuilder(akka.grpc.internal.InternalChannel channel){
+ } else if(method.methodType == org.apache.pekko.grpc.gen.ServerStreaming){
+ private final StreamResponseRequestBuilder<@method.inputTypeUnboxed, @method.outputTypeUnboxed> @{method.name}RequestBuilder(org.apache.pekko.grpc.internal.InternalChannel channel){
return new JavaServerStreamingRequestBuilder<>(
@{method.name}Descriptor, channel, options, settings, ec);
}
- } else if(method.methodType == akka.grpc.gen.BidiStreaming){
- private final StreamResponseRequestBuilder<akka.stream.javadsl.Source<@method.inputTypeUnboxed, akka.NotUsed>, @method.outputTypeUnboxed> @{method.name}RequestBuilder(akka.grpc.internal.InternalChannel channel){
+ } else if(method.methodType == org.apache.pekko.grpc.gen.BidiStreaming){
+ private final StreamResponseRequestBuilder<org.apache.pekko.stream.javadsl.Source<@method.inputTypeUnboxed, org.apache.pekko.NotUsed>, @method.outputTypeUnboxed> @{method.name}RequestBuilder(org.apache.pekko.grpc.internal.InternalChannel channel){
return new JavaBidirectionalStreamingRequestBuilder<>(
@{method.name}Descriptor, channel, options, settings, ec);
}
@@ -96,14 +96,14 @@ public abstract class @{service.name}Client extends @{service.name}ClientPowerAp
* Lower level "lifted" version of the method, giving access to request metadata etc.
* prefer @{method.name}(@method.inputTypeUnboxed) if possible.
*/
- @if(method.methodType == akka.grpc.gen.Unary) {
+ @if(method.methodType == org.apache.pekko.grpc.gen.Unary) {
public SingleResponseRequestBuilder<@method.inputTypeUnboxed, @method.outputTypeUnboxed> @{method.name}()
- }else if(method.methodType == akka.grpc.gen.ClientStreaming){
- public SingleResponseRequestBuilder<akka.stream.javadsl.Source<@method.inputTypeUnboxed, akka.NotUsed>, @method.outputTypeUnboxed> @{method.name}()
- }else if(method.methodType == akka.grpc.gen.ServerStreaming){
+ }else if(method.methodType == org.apache.pekko.grpc.gen.ClientStreaming){
+ public SingleResponseRequestBuilder<org.apache.pekko.stream.javadsl.Source<@method.inputTypeUnboxed, org.apache.pekko.NotUsed>, @method.outputTypeUnboxed> @{method.name}()
+ }else if(method.methodType == org.apache.pekko.grpc.gen.ServerStreaming){
public StreamResponseRequestBuilder<@method.inputTypeUnboxed, @method.outputTypeUnboxed> @{method.name}()
- }else if(method.methodType == akka.grpc.gen.BidiStreaming){
- public StreamResponseRequestBuilder<akka.stream.javadsl.Source<@method.inputTypeUnboxed, akka.NotUsed>, @method.outputTypeUnboxed> @{method.name}()
+ }else if(method.methodType == org.apache.pekko.grpc.gen.BidiStreaming){
+ public StreamResponseRequestBuilder<org.apache.pekko.stream.javadsl.Source<@method.inputTypeUnboxed, org.apache.pekko.NotUsed>, @method.outputTypeUnboxed> @{method.name}()
}
{
return @{method.name}RequestBuilder(channel.internalChannel());
@@ -124,7 +124,7 @@ public abstract class @{service.name}Client extends @{service.name}ClientPowerAp
/**
* Initiates a shutdown in which preexisting and new calls are cancelled.
*/
- public java.util.concurrent.CompletionStage<akka.Done> close() {
+ public java.util.concurrent.CompletionStage<org.apache.pekko.Done> close() {
if (isChannelOwned) {
return channel.closeCS();
} else {
@@ -136,7 +136,7 @@ public abstract class @{service.name}Client extends @{service.name}ClientPowerAp
* Returns a CompletionState that completes successfully when shutdown via close()
* or exceptionally if a connection can not be established after maxConnectionAttempts.
*/
- public java.util.concurrent.CompletionStage<akka.Done> closed() {
+ public java.util.concurrent.CompletionStage<org.apache.pekko.Done> closed() {
return channel.closedCS();
}
}
@@ -144,9 +144,9 @@ public abstract class @{service.name}Client extends @{service.name}ClientPowerAp
}
-@mapMethodType(methodType: akka.grpc.gen.MethodType) = {
- @if(methodType == akka.grpc.gen.Unary) { MethodDescriptor.MethodType.UNARY }
- @if(methodType == akka.grpc.gen.ClientStreaming) {MethodDescriptor.MethodType.CLIENT_STREAMING }
- @if(methodType == akka.grpc.gen.ServerStreaming) { MethodDescriptor.MethodType.SERVER_STREAMING }
- @if(methodType == akka.grpc.gen.BidiStreaming) {MethodDescriptor.MethodType.BIDI_STREAMING }
+@mapMethodType(methodType: org.apache.pekko.grpc.gen.MethodType) = {
+ @if(methodType == org.apache.pekko.grpc.gen.Unary) { MethodDescriptor.MethodType.UNARY }
+ @if(methodType == org.apache.pekko.grpc.gen.ClientStreaming) {MethodDescriptor.MethodType.CLIENT_STREAMING }
+ @if(methodType == org.apache.pekko.grpc.gen.ServerStreaming) { MethodDescriptor.MethodType.SERVER_STREAMING }
+ @if(methodType == org.apache.pekko.grpc.gen.BidiStreaming) {MethodDescriptor.MethodType.BIDI_STREAMING }
}
diff --git a/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt b/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt
index 41b7863e..ea70adc4 100644
--- a/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt
@@ -2,30 +2,30 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.javadsl.Service)
+@(service: org.apache.pekko.grpc.gen.javadsl.Service)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName;
-import akka.grpc.AkkaGrpcGenerated;
+import org.apache.pekko.grpc.PekkoGrpcGenerated;
@GenMethodImports(service)
-@@AkkaGrpcGenerated
+@@PekkoGrpcGenerated
public abstract class @{service.name}ClientPowerApi {
@for(method <- service.methods) {
/**
* Lower level "lifted" version of the method, giving access to request metadata etc.
* prefer @{method.name}(@method.inputTypeUnboxed) if possible.
*/
- @if(method.methodType == akka.grpc.gen.Unary) {
+ @if(method.methodType == org.apache.pekko.grpc.gen.Unary) {
public SingleResponseRequestBuilder<@method.inputTypeUnboxed, @method.outputTypeUnboxed> @{method.name}()
- } else if(method.methodType == akka.grpc.gen.ClientStreaming){
- public SingleResponseRequestBuilder<akka.stream.javadsl.Source<@method.inputTypeUnboxed, akka.NotUsed>, @method.outputTypeUnboxed> @{method.name}()
- } else if(method.methodType == akka.grpc.gen.ServerStreaming){
+ } else if(method.methodType == org.apache.pekko.grpc.gen.ClientStreaming){
+ public SingleResponseRequestBuilder<org.apache.pekko.stream.javadsl.Source<@method.inputTypeUnboxed, org.apache.pekko.NotUsed>, @method.outputTypeUnboxed> @{method.name}()
+ } else if(method.methodType == org.apache.pekko.grpc.gen.ServerStreaming){
public StreamResponseRequestBuilder<@method.inputTypeUnboxed, @method.outputTypeUnboxed> @{method.name}()
- } else if(method.methodType == akka.grpc.gen.BidiStreaming){
- public StreamResponseRequestBuilder<akka.stream.javadsl.Source<@method.inputTypeUnboxed, akka.NotUsed>, @method.outputTypeUnboxed> @{method.name}()
+ } else if(method.methodType == org.apache.pekko.grpc.gen.BidiStreaming){
+ public StreamResponseRequestBuilder<org.apache.pekko.stream.javadsl.Source<@method.inputTypeUnboxed, org.apache.pekko.NotUsed>, @method.outputTypeUnboxed> @{method.name}()
}
{
throw new java.lang.UnsupportedOperationException();
diff --git a/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt b/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
index 898a97b8..a2248241 100644
--- a/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
@@ -2,15 +2,15 @@
* Copyright (C) 2019-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.javadsl.Service)
+@(service: org.apache.pekko.grpc.gen.javadsl.Service)
@{
- val singleResponse = "import akka.grpc.javadsl.SingleResponseRequestBuilder;"
- val streamResponse = "import akka.grpc.javadsl.StreamResponseRequestBuilder;"
+ val singleResponse = "import org.apache.pekko.grpc.javadsl.SingleResponseRequestBuilder;"
+ val streamResponse = "import org.apache.pekko.grpc.javadsl.StreamResponseRequestBuilder;"
service.methods.map(_.methodType).map {
- case akka.grpc.gen.Unary => singleResponse
- case akka.grpc.gen.ClientStreaming => singleResponse
- case akka.grpc.gen.ServerStreaming => streamResponse
- case akka.grpc.gen.BidiStreaming => streamResponse
+ case org.apache.pekko.grpc.gen.Unary => singleResponse
+ case org.apache.pekko.grpc.gen.ClientStreaming => singleResponse
+ case org.apache.pekko.grpc.gen.ServerStreaming => streamResponse
+ case org.apache.pekko.grpc.gen.BidiStreaming => streamResponse
}.distinct.mkString("\n")
}
diff --git a/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt b/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt
index 5075aa19..47b2e5ed 100644
--- a/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt
@@ -2,15 +2,15 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.javadsl.Service)
+@(service: org.apache.pekko.grpc.gen.javadsl.Service)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName;
-import akka.grpc.ProtobufSerializer;
-import akka.grpc.javadsl.GoogleProtobufSerializer;
+import org.apache.pekko.grpc.ProtobufSerializer;
+import org.apache.pekko.grpc.javadsl.GoogleProtobufSerializer;
-import akka.grpc.AkkaGrpcGenerated;
+import org.apache.pekko.grpc.PekkoGrpcGenerated;
@for(comment <- service.comment) {/**
@{java.util.regex.Pattern.compile("^\\s?(.*)$", java.util.regex.Pattern.MULTILINE).matcher(comment).replaceAll(" * $1")} */}
@@ -22,9 +22,9 @@ public interface @{service.name} {
}
static String name = "@service.grpcName";
- static akka.grpc.ServiceDescription description = new akka.grpc.internal.ServiceDescriptionImpl(name, @service.descriptor);
+ static org.apache.pekko.grpc.ServiceDescription description = new org.apache.pekko.grpc.internal.ServiceDescriptionImpl(name, @service.descriptor);
- @@AkkaGrpcGenerated
+ @@PekkoGrpcGenerated
public static class Serializers {
@for(serializer <- service.serializers) {
public static ProtobufSerializer<@{serializer.messageType}> @serializer.name = @serializer.init;
diff --git a/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt b/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt
index ec1322dc..fbc353f4 100644
--- a/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt
@@ -2,60 +2,60 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.javadsl.Service, powerApis: Boolean)
+@(service: org.apache.pekko.grpc.gen.javadsl.Service, powerApis: Boolean)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName;
import java.util.Iterator;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
-import akka.japi.function.Function;
-import akka.actor.ActorSystem;
-import akka.actor.ClassicActorSystemProvider;
-import akka.annotation.ApiMayChange;
-import akka.stream.Materializer;
-import akka.stream.SystemMaterializer;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.ClassicActorSystemProvider;
+import org.apache.pekko.annotation.ApiMayChange;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.SystemMaterializer;
-import akka.grpc.Trailers;
-import akka.grpc.javadsl.GrpcMarshalling;
-import akka.grpc.javadsl.GrpcExceptionHandler;
-import akka.grpc.internal.TelemetryExtension;
-import akka.grpc.internal.TelemetrySpi;
+import org.apache.pekko.grpc.Trailers;
+import org.apache.pekko.grpc.javadsl.GrpcMarshalling;
+import org.apache.pekko.grpc.javadsl.GrpcExceptionHandler;
+import org.apache.pekko.grpc.internal.TelemetryExtension;
+import org.apache.pekko.grpc.internal.TelemetrySpi;
-import akka.grpc.AkkaGrpcGenerated;
+import org.apache.pekko.grpc.PekkoGrpcGenerated;
-@{if (powerApis) "import akka.grpc.javadsl.Metadata;\nimport akka.grpc.javadsl.MetadataBuilder;" else ""}
+@{if (powerApis) "import org.apache.pekko.grpc.javadsl.Metadata;\nimport org.apache.pekko.grpc.javadsl.MetadataBuilder;" else ""}
import static @{service.packageName}.@{service.name}.Serializers.*;
@defining(if (powerApis) service.name + "PowerApi" else service.name) { serviceName =>
/*
- * Generated by Akka gRPC. DO NOT EDIT.
+ * Generated by Pekko gRPC. DO NOT EDIT.
*
- * The API of this class may still change in future Akka gRPC versions, see for instance
+ * The API of this class may still change in future Apache Pekko gRPC versions, see for instance
* https://github.com/akka/akka-grpc/issues/994
*/
@@ApiMayChange
-@@AkkaGrpcGenerated
+@@PekkoGrpcGenerated
public class @{serviceName}HandlerFactory {
- private static final CompletionStage<akka.http.javadsl.model.HttpResponse> notFound = CompletableFuture.completedFuture(
- akka.http.javadsl.model.HttpResponse.create().withStatus(akka.http.javadsl.model.StatusCodes.NOT_FOUND));
+ private static final CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse> notFound = CompletableFuture.completedFuture(
+ org.apache.pekko.http.javadsl.model.HttpResponse.create().withStatus(org.apache.pekko.http.javadsl.model.StatusCodes.NOT_FOUND));
- private static final CompletionStage<akka.http.javadsl.model.HttpResponse> unsupportedMediaType = CompletableFuture.completedFuture(
- akka.http.javadsl.model.HttpResponse.create().withStatus(akka.http.javadsl.model.StatusCodes.UNSUPPORTED_MEDIA_TYPE));
+ private static final CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse> unsupportedMediaType = CompletableFuture.completedFuture(
+ org.apache.pekko.http.javadsl.model.HttpResponse.create().withStatus(org.apache.pekko.http.javadsl.model.StatusCodes.UNSUPPORTED_MEDIA_TYPE));
/**
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example `Http().bindAndHandleAsync`
* for the generated partial function handler and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use {@@link akka.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
+ * Use {@@link org.apache.pekko.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
* several services.
*/
- public static Function<akka.http.javadsl.model.HttpRequest, CompletionStage<akka.http.javadsl.model.HttpResponse>> create(@serviceName implementation, ClassicActorSystemProvider system) {
+ public static Function<org.apache.pekko.http.javadsl.model.HttpRequest, CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse>> create(@serviceName implementation, ClassicActorSystemProvider system) {
return create(implementation, @{service.name}.name, system);
}
@@ -63,10 +63,10 @@ public class @{serviceName}HandlerFactory {
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example `Http().bindAndHandleAsync`
* for the generated partial function handler and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use {@@link akka.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
+ * Use {@@link org.apache.pekko.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
* several services.
*/
- public static Function<akka.http.javadsl.model.HttpRequest, CompletionStage<akka.http.javadsl.model.HttpResponse>> create(@serviceName implementation, akka.japi.Function<ActorSystem, akka.japi.Function<Throwable, Trailers>> eHandler, ClassicActorSystemProvider system) {
+ public static Function<org.apache.pekko.http.javadsl.model.HttpRequest, CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse>> create(@serviceName implementation, org.apache.pekko.japi.Function<ActorSystem, org.apache.pekko.japi.Function<Throwable, Trailers>> eHandler, ClassicActorSystemProvider system) {
return create(implementation, @{service.name}.name, eHandler, system);
}
@@ -74,12 +74,12 @@ public class @{serviceName}HandlerFactory {
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example `Http().bindAndHandleAsync`
* for the generated partial function handler and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use {@@link akka.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
+ * Use {@@link org.apache.pekko.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
* several services.
*
* Registering a gRPC service under a custom prefix is not widely supported and strongly discouraged by the specification.
*/
- public static Function<akka.http.javadsl.model.HttpRequest, CompletionStage<akka.http.javadsl.model.HttpResponse>> create(@serviceName implementation, String prefix, ClassicActorSystemProvider system) {
+ public static Function<org.apache.pekko.http.javadsl.model.HttpRequest, CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse>> create(@serviceName implementation, String prefix, ClassicActorSystemProvider system) {
return partial(implementation, prefix, SystemMaterializer.get(system).materializer(), GrpcExceptionHandler.defaultMapper(), system);
}
@@ -87,12 +87,12 @@ public class @{serviceName}HandlerFactory {
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example `Http().bindAndHandleAsync`
* for the generated partial function handler and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use {@@link akka.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
+ * Use {@@link org.apache.pekko.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
* several services.
*
* Registering a gRPC service under a custom prefix is not widely supported and strongly discouraged by the specification.
*/
- public static Function<akka.http.javadsl.model.HttpRequest, CompletionStage<akka.http.javadsl.model.HttpResponse>> create(@serviceName implementation, String prefix, akka.japi.Function<ActorSystem, akka.japi.Function<Throwable, Trailers>> eHandler, ClassicActorSystemProvider system) {
+ public static Function<org.apache.pekko.http.javadsl.model.HttpRequest, CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse>> create(@serviceName implementation, String prefix, org.apache.pekko.japi.Function<ActorSystem, org.apache.pekko.japi.Function<Throwable, Trailers>> eHandler, ClassicActorSystemProvider system) {
return partial(implementation, prefix, SystemMaterializer.get(system).materializer(), eHandler, system);
}
@@ -103,14 +103,14 @@ public class @{serviceName}HandlerFactory {
* for the generated partial function handler. The generated handler falls back to a reflection handlers for
* `@{service.name}` and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use {@@link akka.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
+ * Use {@@link org.apache.pekko.grpc.javadsl.ServiceHandler#concatOrNotFound} with {@@link @{service.name}HandlerFactory#partial} when combining
* several services.
*/
@@SuppressWarnings("unchecked")
- public static Function<akka.http.javadsl.model.HttpRequest, CompletionStage<akka.http.javadsl.model.HttpResponse>> createWithServerReflection(@serviceName implementation, ClassicActorSystemProvider system) {
- return akka.grpc.javadsl.ServiceHandler.concatOrNotFound(
+ public static Function<org.apache.pekko.http.javadsl.model.HttpRequest, CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse>> createWithServerReflection(@serviceName implementation, ClassicActorSystemProvider system) {
+ return org.apache.pekko.grpc.javadsl.ServiceHandler.concatOrNotFound(
@{serviceName}HandlerFactory.create(implementation, system),
- akka.grpc.javadsl.ServerReflection.create(
+ org.apache.pekko.grpc.javadsl.ServerReflection.create(
java.util.Collections.singletonList(@{service.name}.description),
system));
}
@@ -121,9 +121,9 @@ public class @{serviceName}HandlerFactory {
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example
* `Http.get(system).bindAndHandleAsync`. It ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use {@@link akka.grpc.javadsl.ServiceHandler#concatOrNotFound} when combining several services.
+ * Use {@@link org.apache.pekko.grpc.javadsl.ServiceHandler#concatOrNotFound} when combining several services.
*/
- public static Function<akka.http.javadsl.model.HttpRequest, CompletionStage<akka.http.javadsl.model.HttpResponse>> partial(@serviceName implementation, String prefix, ClassicActorSystemProvider system) {
+ public static Function<org.apache.pekko.http.javadsl.model.HttpRequest, CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse>> partial(@serviceName implementation, String prefix, ClassicActorSystemProvider system) {
return partial(implementation, prefix, SystemMaterializer.get(system).materializer(), GrpcExceptionHandler.defaultMapper(), system);
}
@@ -131,9 +131,9 @@ public class @{serviceName}HandlerFactory {
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example
* `Http.get(system).bindAndHandleAsync`. It ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use {@@link akka.grpc.javadsl.ServiceHandler#concatOrNotFound} when combining several services.
+ * Use {@@link org.apache.pekko.grpc.javadsl.ServiceHandler#concatOrNotFound} when combining several services.
*/
- public static Function<akka.http.javadsl.model.HttpRequest, CompletionStage<akka.http.javadsl.model.HttpResponse>> partial(@serviceName implementation, String prefix, Materializer mat, akka.japi.Function<ActorSystem, akka.japi.Function<Throwable, Trailers>> eHandler, ClassicActorSystemProvider system) {
+ public static Function<org.apache.pekko.http.javadsl.model.HttpRequest, CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse>> partial(@serviceName implementation, String prefix, Materializer mat, org.apache.pekko.japi.Function<ActorSystem, org.apache.pekko.japi.Function<Throwable, Trailers>> eHandler, ClassicActorSystemProvider system) {
TelemetrySpi spi = TelemetryExtension.get(system).spi();
return (req -> {
Iterator<String> segments = req.getUri().pathSegments().iterator();
@@ -153,9 +153,9 @@ public class @{serviceName}HandlerFactory {
return @{service.name}.name;
}
- private static CompletionStage<akka.http.javadsl.model.HttpResponse> handle(akka.http.javadsl.model.HttpRequest request, String method, @serviceName implementation, Materializer mat, akka.japi.Function<ActorSystem, akka.japi.Function<Throwable, Trailers>> eHandler, ClassicActorSystemProvider system) {
+ private static CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse> handle(org.apache.pekko.http.javadsl.model.HttpRequest request, String method, @serviceName implementation, Materializer mat, org.apache.pekko.japi.Function<ActorSystem, org.apache.pekko.japi.Function<Throwable, Trailers>> eHandler, ClassicActorSystemProvider system) {
return GrpcMarshalling.negotiated(request, (reader, writer) -> {
- final CompletionStage<akka.http.javadsl.model.HttpResponse> response;
+ final CompletionStage<org.apache.pekko.http.javadsl.model.HttpResponse> response;
@{if(powerApis) { "Metadata metadata = MetadataBuilder.fromHeaders(request.getHeaders());" } else { "" }}
switch(method) {
@for(method <- service.methods) {
@@ -166,7 +166,7 @@ public class @{serviceName}HandlerFactory {
break;
}
default:
- CompletableFuture<akka.http.javadsl.model.HttpResponse> result = new CompletableFuture<>();
+ CompletableFuture<org.apache.pekko.http.javadsl.model.HttpResponse> result = new CompletableFuture<>();
result.completeExceptionally(new UnsupportedOperationException("Not implemented: " + method));
response = result;
}
diff --git a/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt b/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt
index 57c5fb66..703ba085 100644
--- a/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt
@@ -2,19 +2,19 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.javadsl.Service)
+@(service: org.apache.pekko.grpc.gen.javadsl.Service)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName;
-import akka.grpc.ProtobufSerializer;
-import akka.grpc.javadsl.GoogleProtobufSerializer;
-import akka.grpc.javadsl.Metadata;
+import org.apache.pekko.grpc.ProtobufSerializer;
+import org.apache.pekko.grpc.javadsl.GoogleProtobufSerializer;
+import org.apache.pekko.grpc.javadsl.Metadata;
-import akka.grpc.AkkaGrpcGenerated;
+import org.apache.pekko.grpc.PekkoGrpcGenerated;
/*
- * Generated by Akka gRPC. DO NOT EDIT.
+ * Generated by Pekko gRPC. DO NOT EDIT.
*/
public interface @{service.name}PowerApi {
@for(method <- service.methods) {
@@ -23,7 +23,7 @@ public interface @{service.name}PowerApi {
static String name = "@service.grpcName";
- @@AkkaGrpcGenerated
+ @@PekkoGrpcGenerated
public static class Serializers {
@for(serializer <- service.serializers) {
public static ProtobufSerializer<@{serializer.messageType}> @serializer.name = @serializer.init;
diff --git a/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt b/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
index 20c1f374..bcdcea84 100644
--- a/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
@@ -2,35 +2,35 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.scaladsl.Service)
+@(service: org.apache.pekko.grpc.gen.scaladsl.Service)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName
import scala.concurrent.ExecutionContext
-import akka.actor.ClassicActorSystemProvider
+import org.apache.pekko.actor.ClassicActorSystemProvider
-import akka.grpc.GrpcChannel
-import akka.grpc.GrpcClientCloseException
-import akka.grpc.GrpcClientSettings
+import org.apache.pekko.grpc.GrpcChannel
+import org.apache.pekko.grpc.GrpcClientCloseException
+import org.apache.pekko.grpc.GrpcClientSettings
-import akka.grpc.scaladsl.AkkaGrpcClient
+import org.apache.pekko.grpc.scaladsl.PekkoGrpcClient
-import akka.grpc.internal.NettyClientUtils
+import org.apache.pekko.grpc.internal.NettyClientUtils
-import akka.grpc.AkkaGrpcGenerated
+import org.apache.pekko.grpc.PekkoGrpcGenerated
@{
- def withSingleResponse(stmt: String) = Set("import akka.grpc.scaladsl.SingleResponseRequestBuilder", stmt)
- def withStreamResponse(stmt: String) = Set("import akka.grpc.scaladsl.StreamResponseRequestBuilder", stmt)
- service.methods.flatMap { method: akka.grpc.gen.scaladsl.Method =>
+ def withSingleResponse(stmt: String) = Set("import org.apache.pekko.grpc.scaladsl.SingleResponseRequestBuilder", stmt)
+ def withStreamResponse(stmt: String) = Set("import org.apache.pekko.grpc.scaladsl.StreamResponseRequestBuilder", stmt)
+ service.methods.flatMap { method: org.apache.pekko.grpc.gen.scaladsl.Method =>
val statements = method.methodType match {
- case akka.grpc.gen.Unary => withSingleResponse("import akka.grpc.internal.ScalaUnaryRequestBuilder")
- case akka.grpc.gen.ClientStreaming => withSingleResponse("import akka.grpc.internal.ScalaClientStreamingRequestBuilder")
- case akka.grpc.gen.ServerStreaming => withStreamResponse("import akka.grpc.internal.ScalaServerStreamingRequestBuilder")
- case akka.grpc.gen.BidiStreaming => withStreamResponse("import akka.grpc.internal.ScalaBidirectionalStreamingRequestBuilder")
+ case org.apache.pekko.grpc.gen.Unary => withSingleResponse("import org.apache.pekko.grpc.internal.ScalaUnaryRequestBuilder")
+ case org.apache.pekko.grpc.gen.ClientStreaming => withSingleResponse("import org.apache.pekko.grpc.internal.ScalaClientStreamingRequestBuilder")
+ case org.apache.pekko.grpc.gen.ServerStreaming => withStreamResponse("import org.apache.pekko.grpc.internal.ScalaServerStreamingRequestBuilder")
+ case org.apache.pekko.grpc.gen.BidiStreaming => withStreamResponse("import org.apache.pekko.grpc.internal.ScalaBidirectionalStreamingRequestBuilder")
}
statements
@@ -38,10 +38,10 @@ import akka.grpc.AkkaGrpcGenerated
}
// Not sealed so users can extend to write their stubs
-@@AkkaGrpcGenerated
-trait @{service.name}Client extends @{service.name} with @{service.name}ClientPowerApi with AkkaGrpcClient
+@@PekkoGrpcGenerated
+trait @{service.name}Client extends @{service.name} with @{service.name}ClientPowerApi with PekkoGrpcClient
-@@AkkaGrpcGenerated
+@@PekkoGrpcGenerated
object @{service.name}Client {
def apply(settings: GrpcClientSettings)(implicit sys: ClassicActorSystemProvider): @{service.name}Client =
new Default@{service.name}Client(GrpcChannel(settings), isChannelOwned = true)
@@ -56,15 +56,15 @@ object @{service.name}Client {
private val options = NettyClientUtils.callOptions(settings)
@for(method <- service.methods) {
- private def @{method.name}RequestBuilder(channel: akka.grpc.internal.InternalChannel) =
- @if(method.methodType == akka.grpc.gen.Unary) {
+ private def @{method.name}RequestBuilder(channel: org.apache.pekko.grpc.internal.InternalChannel) =
+ @if(method.methodType == org.apache.pekko.grpc.gen.Unary) {
new ScalaUnaryRequestBuilder(@{method.name}Descriptor, channel, options, settings)
} else {
- @if(method.methodType == akka.grpc.gen.ServerStreaming) {
+ @if(method.methodType == org.apache.pekko.grpc.gen.ServerStreaming) {
new ScalaServerStreamingRequestBuilder(@{method.name}Descriptor, channel, options, settings)
- } else if(method.methodType == akka.grpc.gen.ClientStreaming) {
+ } else if(method.methodType == org.apache.pekko.grpc.gen.ClientStreaming) {
new ScalaClientStreamingRequestBuilder(@{method.name}Descriptor, channel, options, settings)
- } else if (method.methodType == akka.grpc.gen.BidiStreaming) {
+ } else if (method.methodType == org.apache.pekko.grpc.gen.BidiStreaming) {
new ScalaBidirectionalStreamingRequestBuilder(@{method.name}Descriptor, channel, options, settings)
}
}
@@ -75,7 +75,7 @@ object @{service.name}Client {
* Lower level "lifted" version of the method, giving access to request metadata etc.
* prefer @{method.nameSafe}(@method.parameterType) if possible.
*/
- @if(method.methodType == akka.grpc.gen.Unary || method.methodType == akka.grpc.gen.ClientStreaming) {
+ @if(method.methodType == org.apache.pekko.grpc.gen.Unary || method.methodType == org.apache.pekko.grpc.gen.ClientStreaming) {
override def @{method.nameSafe}(): SingleResponseRequestBuilder[@method.parameterType, @method.outputTypeUnboxed] =
@{method.name}RequestBuilder(channel.internalChannel)
} else {
@@ -90,22 +90,22 @@ object @{service.name}Client {
@{method.nameSafe}().invoke(in)
}
- override def close(): scala.concurrent.Future[akka.Done] =
+ override def close(): scala.concurrent.Future[org.apache.pekko.Done] =
if (isChannelOwned) channel.close()
else throw new GrpcClientCloseException()
- override def closed: scala.concurrent.Future[akka.Done] = channel.closed()
+ override def closed: scala.concurrent.Future[org.apache.pekko.Done] = channel.closed()
}
}
-@@AkkaGrpcGenerated
+@@PekkoGrpcGenerated
trait @{service.name}ClientPowerApi {
@for(method <- service.methods) {
/**
* Lower level "lifted" version of the method, giving access to request metadata etc.
* prefer @{method.nameSafe}(@method.parameterType) if possible.
*/
- @if(method.methodType == akka.grpc.gen.Unary || method.methodType == akka.grpc.gen.ClientStreaming) {
+ @if(method.methodType == org.apache.pekko.grpc.gen.Unary || method.methodType == org.apache.pekko.grpc.gen.ClientStreaming) {
def @{method.nameSafe}(): SingleResponseRequestBuilder[@method.parameterType, @method.outputTypeUnboxed] = ???
} else {
def @{method.nameSafe}(): StreamResponseRequestBuilder[@method.parameterType, @method.outputTypeUnboxed] = ???
diff --git a/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt b/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt
index 7843062a..f1237b86 100644
--- a/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt
@@ -2,18 +2,18 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.scaladsl.Service)
+@(service: org.apache.pekko.grpc.gen.scaladsl.Service)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName
-import akka.annotation.ApiMayChange
+import org.apache.pekko.annotation.ApiMayChange
-import akka.grpc.AkkaGrpcGenerated
+import org.apache.pekko.grpc.PekkoGrpcGenerated
@for(comment <- service.comment) {/**
@{java.util.regex.Pattern.compile("^\\s?(.*)$", java.util.regex.Pattern.MULTILINE).matcher(comment).replaceAll(" * $1")} */}
-@@AkkaGrpcGenerated
+@@PekkoGrpcGenerated
trait @{service.name} {
@for(method <- service.methods) {
@for(comment <- method.comment) {/**
@@ -22,31 +22,31 @@ trait @{service.name} {
}
}
-@mapMethodType(methodType: akka.grpc.gen.MethodType) = {
- @if(methodType == akka.grpc.gen.Unary) { MethodDescriptor.MethodType.UNARY }
- @if(methodType == akka.grpc.gen.ClientStreaming) {MethodDescriptor.MethodType.CLIENT_STREAMING }
- @if(methodType == akka.grpc.gen.ServerStreaming) { MethodDescriptor.MethodType.SERVER_STREAMING }
- @if(methodType == akka.grpc.gen.BidiStreaming) {MethodDescriptor.MethodType.BIDI_STREAMING }
+@mapMethodType(methodType: org.apache.pekko.grpc.gen.MethodType) = {
+ @if(methodType == org.apache.pekko.grpc.gen.Unary) { MethodDescriptor.MethodType.UNARY }
+ @if(methodType == org.apache.pekko.grpc.gen.ClientStreaming) {MethodDescriptor.MethodType.CLIENT_STREAMING }
+ @if(methodType == org.apache.pekko.grpc.gen.ServerStreaming) { MethodDescriptor.MethodType.SERVER_STREAMING }
+ @if(methodType == org.apache.pekko.grpc.gen.BidiStreaming) {MethodDescriptor.MethodType.BIDI_STREAMING }
}
-@@AkkaGrpcGenerated
-object @{service.name} extends akka.grpc.ServiceDescription {
+@@PekkoGrpcGenerated
+object @{service.name} extends org.apache.pekko.grpc.ServiceDescription {
val name = "@service.grpcName"
val descriptor: com.google.protobuf.Descriptors.FileDescriptor =
@service.descriptor;
object Serializers {
- import akka.grpc.scaladsl.ScalapbProtobufSerializer
+ import org.apache.pekko.grpc.scaladsl.ScalapbProtobufSerializer
@for(serializer <- service.serializers) {
val @serializer.name = @serializer.init
}
}
@@ApiMayChange
- @@AkkaGrpcGenerated
+ @@PekkoGrpcGenerated
object MethodDescriptors {
- import akka.grpc.internal.Marshaller
+ import org.apache.pekko.grpc.internal.Marshaller
import io.grpc.MethodDescriptor
import Serializers._
diff --git a/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt b/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt
index 72f347b9..b9ebed73 100644
--- a/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt
@@ -2,27 +2,27 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.scaladsl.Service)
+@(service: org.apache.pekko.grpc.gen.scaladsl.Service)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName
import scala.concurrent.ExecutionContext
-import akka.actor.ClassicActorSystemProvider
-import akka.stream.Materializer
-import akka.grpc.GrpcProtocol.GrpcProtocolWriter
-import akka.grpc.ProtobufSerializer
-import akka.grpc.scaladsl.GrpcMarshalling
-import akka.http.scaladsl.marshalling.Marshaller
-import akka.http.scaladsl.marshalling.ToResponseMarshaller
-import akka.http.scaladsl.model.HttpRequest
-import akka.http.scaladsl.unmarshalling.FromRequestUnmarshaller
-import akka.http.scaladsl.unmarshalling.Unmarshaller
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.grpc.GrpcProtocol.GrpcProtocolWriter
+import org.apache.pekko.grpc.ProtobufSerializer
+import org.apache.pekko.grpc.scaladsl.GrpcMarshalling
+import org.apache.pekko.http.scaladsl.marshalling.Marshaller
+import org.apache.pekko.http.scaladsl.marshalling.ToResponseMarshaller
+import org.apache.pekko.http.scaladsl.model.HttpRequest
+import org.apache.pekko.http.scaladsl.unmarshalling.FromRequestUnmarshaller
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller
-import akka.grpc.AkkaGrpcGenerated
+import org.apache.pekko.grpc.PekkoGrpcGenerated
-@@AkkaGrpcGenerated
+@@PekkoGrpcGenerated
object @{service.name}Marshallers {
@for(serializer <- service.serializers) {
implicit val @serializer.name = @{service.packageName}.@{service.name}.Serializers.@{serializer.name}
@@ -31,12 +31,12 @@ object @{service.name}Marshallers {
implicit def unmarshaller[T](implicit serializer: ProtobufSerializer[T], mat: Materializer): FromRequestUnmarshaller[T] =
Unmarshaller((_: ExecutionContext) => (req: HttpRequest) => GrpcMarshalling.unmarshal(req)(serializer, mat))
- implicit def toSourceUnmarshaller[T](implicit serializer: ProtobufSerializer[T], mat: Materializer): FromRequestUnmarshaller[akka.stream.scaladsl.Source[T, akka.NotUsed]] =
+ implicit def toSourceUnmarshaller[T](implicit serializer: ProtobufSerializer[T], mat: Materializer): FromRequestUnmarshaller[org.apache.pekko.stream.scaladsl.Source[T, org.apache.pekko.NotUsed]] =
Unmarshaller((_: ExecutionContext) => (req: HttpRequest) => GrpcMarshalling.unmarshalStream(req)(serializer, mat))
implicit def marshaller[T](implicit serializer: ProtobufSerializer[T], writer: GrpcProtocolWriter, system: ClassicActorSystemProvider): ToResponseMarshaller[T] =
Marshaller.opaque((response: T) => GrpcMarshalling.marshal(response)(serializer, writer, system))
- implicit def fromSourceMarshaller[T](implicit serializer: ProtobufSerializer[T], writer: GrpcProtocolWriter, system: ClassicActorSystemProvider): ToResponseMarshaller[akka.stream.scaladsl.Source[T, akka.NotUsed]] =
- Marshaller.opaque((response: akka.stream.scaladsl.Source[T, akka.NotUsed]) => GrpcMarshalling.marshalStream(response)(serializer, writer, system))
+ implicit def fromSourceMarshaller[T](implicit serializer: ProtobufSerializer[T], writer: GrpcProtocolWriter, system: ClassicActorSystemProvider): ToResponseMarshaller[org.apache.pekko.stream.scaladsl.Source[T, org.apache.pekko.NotUsed]] =
+ Marshaller.opaque((response: org.apache.pekko.stream.scaladsl.Source[T, org.apache.pekko.NotUsed]) => GrpcMarshalling.marshalStream(response)(serializer, writer, system))
}
diff --git a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt
index 47632536..69d8713e 100644
--- a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt
@@ -2,37 +2,37 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.scaladsl.Service, powerApis: Boolean)
+@(service: org.apache.pekko.grpc.gen.scaladsl.Service, powerApis: Boolean)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName
import scala.concurrent.ExecutionContext
-import akka.grpc.scaladsl.{ GrpcExceptionHandler, GrpcMarshalling }
-import akka.grpc.Trailers
+import org.apache.pekko.grpc.scaladsl.{ GrpcExceptionHandler, GrpcMarshalling }
+import org.apache.pekko.grpc.Trailers
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.ApiMayChange
-import akka.http.scaladsl.model
-import akka.stream.SystemMaterializer
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.http.scaladsl.model
+import org.apache.pekko.stream.SystemMaterializer
-import akka.grpc.internal.TelemetryExtension
+import org.apache.pekko.grpc.internal.TelemetryExtension
-import akka.grpc.AkkaGrpcGenerated
+import org.apache.pekko.grpc.PekkoGrpcGenerated
-@{if (powerApis) "import akka.grpc.scaladsl.MetadataBuilder" else ""}
+@{if (powerApis) "import org.apache.pekko.grpc.scaladsl.MetadataBuilder" else ""}
@defining(if (powerApis) service.name + "PowerApi" else service.name) { serviceName =>
/*
- * Generated by Akka gRPC. DO NOT EDIT.
+ * Generated by Pekko gRPC. DO NOT EDIT.
*
- * The API of this class may still change in future Akka gRPC versions, see for instance
+ * The API of this class may still change in future Pekko gRPC versions, see for instance
* https://github.com/akka/akka-grpc/issues/994
*/
@@ApiMayChange
-@@AkkaGrpcGenerated
+@@PekkoGrpcGenerated
object @{serviceName}Handler {
private val notFound = scala.concurrent.Future.successful(model.HttpResponse(model.StatusCodes.NotFound))
private val unsupportedMediaType = scala.concurrent.Future.successful(model.HttpResponse(model.StatusCodes.UnsupportedMediaType))
@@ -41,7 +41,7 @@ object @{serviceName}Handler {
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example `Http().bindAndHandleAsync`
* for the generated partial function handler and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use `akka.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
+ * Use `org.apache.pekko.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
* several services.
*/
def apply(implementation: @serviceName)(implicit system: ClassicActorSystemProvider): model.HttpRequest => scala.concurrent.Future[model.HttpResponse] =
@@ -51,7 +51,7 @@ object @{serviceName}Handler {
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example `Http().bindAndHandleAsync`
* for the generated partial function handler and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use `akka.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
+ * Use `org.apache.pekko.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
* several services.
*/
def apply(implementation: @serviceName, eHandler: ActorSystem => PartialFunction[Throwable, Trailers])(implicit system: ClassicActorSystemProvider): model.HttpRequest => scala.concurrent.Future[model.HttpResponse] =
@@ -61,7 +61,7 @@ object @{serviceName}Handler {
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example `Http().bindAndHandleAsync`
* for the generated partial function handler and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use `akka.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
+ * Use `org.apache.pekko.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
* several services.
*
* Registering a gRPC service under a custom prefix is not widely supported and strongly discouraged by the specification.
@@ -73,7 +73,7 @@ object @{serviceName}Handler {
* Creates a `HttpRequest` to `HttpResponse` handler that can be used in for example `Http().bindAndHandleAsync`
* for the generated partial function handler and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use `akka.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
+ * Use `org.apache.pekko.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
* several services.
*
* Registering a gRPC service under a custom prefix is not widely supported and strongly discouraged by the specification.
@@ -88,18 +88,18 @@ object @{serviceName}Handler {
* for the generated partial function handler. The generated handler falls back to a reflection handler for
* `@{service.name}` and ends with `StatusCodes.NotFound` if the request is not matching.
*
- * Use `akka.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
+ * Use `org.apache.pekko.grpc.scaladsl.ServiceHandler.concatOrNotFound` with `@{service.name}Handler.partial` when combining
* several services.
*/
def withServerReflection(implementation: @serviceName)(implicit system: ClassicActorSystemProvider): model.HttpRequest => scala.concurrent.Future[model.HttpResponse] =
- akka.grpc.scaladsl.ServiceHandler.concatOrNotFound(
+ org.apache.pekko.grpc.scaladsl.ServiceHandler.concatOrNotFound(
@{serviceName}Handler.partial(implementation),
- akka.grpc.scaladsl.ServerReflection.partial(List(@{service.name})))
+ org.apache.pekko.grpc.scaladsl.ServerReflection.partial(List(@{service.name})))
}
/**
* Creates a partial `HttpRequest` to `HttpResponse` handler that can be combined with handlers of other
- * services with `akka.grpc.scaladsl.ServiceHandler.concatOrNotFound` and then used in for example
+ * services with `org.apache.pekko.grpc.scaladsl.ServiceHandler.concatOrNotFound` and then used in for example
* `Http().bindAndHandleAsync`.
*
* Use `@{service.name}Handler.apply` if the server is only handling one service.
diff --git a/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt b/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt
index c268e570..75e88e62 100644
--- a/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt
@@ -2,19 +2,19 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*@
-@(service: akka.grpc.gen.scaladsl.Service)
+@(service: org.apache.pekko.grpc.gen.scaladsl.Service)
-@akka.grpc.gen.Constants.DoNotEditComment
+@org.apache.pekko.grpc.gen.Constants.DoNotEditComment
package @service.packageName
-import akka.grpc.AkkaGrpcGenerated
+import org.apache.pekko.grpc.PekkoGrpcGenerated
/*
- * Generated by Akka gRPC. DO NOT EDIT.
+ * Generated by Apache Pekko gRPC. DO NOT EDIT.
*/
-@@AkkaGrpcGenerated
+@@PekkoGrpcGenerated
trait @{service.name}PowerApi {
@for(method <- service.methods) {
- def @{method.nameSafe}(in: @method.parameterType, metadata: akka.grpc.scaladsl.Metadata): @method.returnType
+ def @{method.nameSafe}(in: @method.parameterType, metadata: org.apache.pekko.grpc.scaladsl.Metadata): @method.returnType
}
}
diff --git a/codegen/src/test/scala/akka/grpc/gen/javadsl/ServiceSpec.scala b/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala
similarity index 94%
rename from codegen/src/test/scala/akka/grpc/gen/javadsl/ServiceSpec.scala
rename to codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala
index a357f14f..0426d097 100644
--- a/codegen/src/test/scala/akka/grpc/gen/javadsl/ServiceSpec.scala
+++ b/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.gen.javadsl
+package org.apache.pekko.grpc.gen.javadsl
import org.scalatest.wordspec.AnyWordSpec
import org.scalatest.matchers.should.Matchers
diff --git a/docs/src/main/paradox/apidesign.md b/docs/src/main/paradox/apidesign.md
index 4fa13d50..45f42c39 100644
--- a/docs/src/main/paradox/apidesign.md
+++ b/docs/src/main/paradox/apidesign.md
@@ -37,7 +37,7 @@ libraryDependencies ++= Seq(
)
Compile / PB.targets +=
- Target(PB.gens.plugin("validate"), (Compile / akkaGrpcCodeGeneratorSettings / target).value, Seq("lang=java"))
+ Target(PB.gens.plugin("validate"), (Compile / pekkoGrpcCodeGeneratorSettings / target).value, Seq("lang=java"))
// PGV Java validators use lambda expressions
Compile / compile / javacOptions ++= Seq("-source", "8", "-target", "8"),
diff --git a/docs/src/main/paradox/binary-compatibility.md b/docs/src/main/paradox/binary-compatibility.md
index 4195e2d2..299b1002 100644
--- a/docs/src/main/paradox/binary-compatibility.md
+++ b/docs/src/main/paradox/binary-compatibility.md
@@ -32,7 +32,7 @@ may disappear in version `x.(y+1).z`.
### Internal and ApiMayChange API's
-Internal API's (designated by the `akka.grpc.internal` package or with the `@InternalApi` annotation) and API's that are still marked `@ApiMayChange` are not guaranteed to remain binary compatible.
+Internal API's (designated by the `org.apache.pekko.grpc.internal` package or with the `@InternalApi` annotation) and API's that are still marked `@ApiMayChange` are not guaranteed to remain binary compatible.
Libraries that use such methods may not work in applications that depend on a newer version of Akka gRPC.
diff --git a/docs/src/main/paradox/buildtools/gradle.md b/docs/src/main/paradox/buildtools/gradle.md
index d622fe84..716ef67f 100644
--- a/docs/src/main/paradox/buildtools/gradle.md
+++ b/docs/src/main/paradox/buildtools/gradle.md
@@ -13,7 +13,7 @@ By default both client and server are generated and Java or Scala is autodetecte
### Installation
-Follow instructions at [Gradle plugin portal](https://plugins.gradle.org/plugin/com.lightbend.akka.grpc.gradle) to apply plugin.
+Follow instructions at [Gradle plugin portal](https://plugins.gradle.org/plugin/org.apache.pekko.grpc.gradle) to apply plugin.
### Available plugin options
@@ -23,7 +23,7 @@ Names and default values are provided.
`build.gradle`
: @@@vars
```gradle
- akkaGrpc {
+ pekkoGrpc {
generateClient = true
generateServer = true
generatePlay = false
@@ -42,7 +42,7 @@ To additionally generate server "power APIs" that have access to request metadat
`build.gradle`
: @@@vars
```gradle
- akkaGrpc {
+ pekkoGrpc {
...
serverPowerApis = true
}
diff --git a/docs/src/main/paradox/buildtools/maven.md b/docs/src/main/paradox/buildtools/maven.md
index 114ff68e..ef8c6d47 100644
--- a/docs/src/main/paradox/buildtools/maven.md
+++ b/docs/src/main/paradox/buildtools/maven.md
@@ -12,7 +12,7 @@ Java
<plugin>
<groupId>com.lightbend.akka.grpc</groupId>
<artifactId>akka-grpc-maven-plugin</artifactId>
- <version>${akka.grpc.version}</version>
+ <version>${pekko.grpc.version}</version>
<configuration>
<language>Java</language>
<generateClient>false</generateClient>
@@ -26,7 +26,7 @@ Scala
<plugin>
<groupId>com.lightbend.akka.grpc</groupId>
<artifactId>akka-grpc-maven-plugin</artifactId>
- <version>${akka.grpc.version}</version>
+ <version>${pekko.grpc.version}</version>
<configuration>
<language>Scala</language>
<generateClient>false</generateClient>
@@ -63,7 +63,7 @@ which is a relative path to the project basedir. The below configuration overrid
<plugin>
<groupId>com.lightbend.akka.grpc</groupId>
<artifactId>akka-grpc-maven-plugin</artifactId>
- <version>${akka.grpc.version}</version>
+ <version>${pekko.grpc.version}</version>
<configuration>
<protoPaths>
<protoPath>src/main/protobuf</protoPath>
diff --git a/docs/src/main/paradox/buildtools/sbt.md b/docs/src/main/paradox/buildtools/sbt.md
index 5c5a218c..2634f9e4 100644
--- a/docs/src/main/paradox/buildtools/sbt.md
+++ b/docs/src/main/paradox/buildtools/sbt.md
@@ -32,7 +32,7 @@ To additionally generate server "power APIs" that have access to request metadat
@ref[here](../server/details.md#accessing-request-metadata), set the `server_power_apis` option:
```scala
-akkaGrpcCodeGeneratorSettings += "server_power_apis"
+pekkoGrpcCodeGeneratorSettings += "server_power_apis"
```
## Passing parameters to the generators
@@ -42,12 +42,12 @@ don't suit your needs.
### ScalaPB settings
-Passing generator parameters to the underlying ScalaPB generators can be done through `akkaGrpcCodeGeneratorSettings`
+Passing generator parameters to the underlying ScalaPB generators can be done through `pekkoGrpcCodeGeneratorSettings`
setting, any specified options will be passed to all underlying generators that are enabled. By default this setting
contains the `flat_package` parameter.
```scala
-akkaGrpcCodeGeneratorSettings += "single_line_to_proto_string"
+pekkoGrpcCodeGeneratorSettings += "single_line_to_proto_string"
```
#### Using a local `protoc` command
diff --git a/docs/src/main/paradox/client/configuration.md b/docs/src/main/paradox/client/configuration.md
index e33720db..84cf575e 100644
--- a/docs/src/main/paradox/client/configuration.md
+++ b/docs/src/main/paradox/client/configuration.md
@@ -8,28 +8,28 @@ docs are the best reference. An `ActorSystem` is always required as it is used f
The simplest way to create a client is to provide a static host and port.
Scala
-: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/scala/docs/akka/grpc/client/GrpcClientSettingsCompileOnly.scala) { #simple }
+: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala) { #simple }
Java
-: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/java/jdocs/akka/grpc/client/GrpcClientSettingsCompileOnly.java) { #simple }
+: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java) { #simple }
Further settings can be added via the `with` methods
Scala
-: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/scala/docs/akka/grpc/client/GrpcClientSettingsCompileOnly.scala) { #simple-programmatic }
+: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala) { #simple-programmatic }
Java
-: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/java/jdocs/akka/grpc/client/GrpcClientSettingsCompileOnly.java) { #simple-programmatic }
+: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java) { #simple-programmatic }
## By Configuration
-Instead a client can be defined in configuration. All client configurations need to be under `akka.grpc.client`
+Instead a client can be defined in configuration. All client configurations need to be under `pekko.grpc.client`
Scala
-: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/akka/grpc/GrpcClientSettingsSpec.scala) { #client-config }
+: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala) { #client-config }
Java
-: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/akka/grpc/GrpcClientSettingsSpec.scala) { #client-config }
+: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala) { #client-config }
Clients defined in configuration pick up defaults from `reference.conf`:
@@ -47,28 +47,28 @@ To see how to config a particular service discovery mechanism see the @extref[Ak
Once it is configured a service discovery mechanism name can either be passed into settings or put in the client's configuration.
Scala
-: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/akka/grpc/GrpcClientSettingsSpec.scala) { #config-service-discovery }
+: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala) { #config-service-discovery }
Java
-: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/akka/grpc/GrpcClientSettingsSpec.scala) { #config-service-discovery }
+: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala) { #config-service-discovery }
The above example configures the client `project.WithConfigServiceDiscovery` to use `config` based service discovery.
Then to create the `GrpcClientSettings`:
Scala
-: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/akka/grpc/GrpcClientSettingsSpec.scala) { #sd-settings }
+: @@snip [GrpcClientSettingsSpec](/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala) { #sd-settings }
Java
-: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/java/jdocs/akka/grpc/client/GrpcClientSettingsCompileOnly.java) { #sd-settings }
+: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java) { #sd-settings }
-Alternatively if a default instance is available (configured by `akka.discovery.method`) in your system it can be use like this:
+Alternatively if a default instance is available (configured by `pekko.discovery.method`) in your system it can be use like this:
Scala
-: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/scala/docs/akka/grpc/client/GrpcClientSettingsCompileOnly.scala) { #provide-sd }
+: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala) { #provide-sd }
Java
-: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/java/jdocs/akka/grpc/client/GrpcClientSettingsCompileOnly.java) { #provide-sd }
+: @@snip [GrpcClientSettingsCompileOnly](/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java) { #provide-sd }
Currently service discovery is only queried on creation of the client. A client can be automatically re-created, and go via service discovery again,
diff --git a/docs/src/main/paradox/client/details.md b/docs/src/main/paradox/client/details.md
index a929e7f8..02d0d518 100644
--- a/docs/src/main/paradox/client/details.md
+++ b/docs/src/main/paradox/client/details.md
@@ -81,7 +81,7 @@ Beyond status codes you can also use the [Rich error model](https://www.grpc.io/
Extract the `StatusRuntimeException` and parse the Rich error model to access `code`, `message` and `details`. Then find the details you are looking for based on their `typeUrl` and unpack them:
Scala
-: @@snip [GreeterClient.scala](/interop-tests/src/test/scala/akka/grpc/scaladsl/RichErrorModelSpec.scala) { #client_request }
+: @@snip [GreeterClient.scala](/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala) { #client_request }
Java
: @@snip[RichErrorModelSpec](/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java) { #client_request }
diff --git a/docs/src/main/paradox/client/walkthrough.md b/docs/src/main/paradox/client/walkthrough.md
index f16e75ec..486a3eac 100644
--- a/docs/src/main/paradox/client/walkthrough.md
+++ b/docs/src/main/paradox/client/walkthrough.md
@@ -14,9 +14,9 @@ sbt
: @@@vars
```scala
// in project/plugins.sbt:
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "$project.version$")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % "$project.version$")
// in build.sbt:
-enablePlugins(AkkaGrpcPlugin)
+enablePlugins(PekkoGrpcPlugin)
```
@@@
@@ -35,7 +35,7 @@ plugins {
id 'java'
id 'application'
}
-apply plugin: 'com.lightbend.akka.grpc.gradle'
+apply plugin: 'org.apache.pekko.grpc.gradle'
```
@@@
@@ -51,15 +51,15 @@ Maven
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <akka.grpc.version>$project.version$</akka.grpc.version>
+ <pekko.grpc.version>$project.version$</pekko.grpc.version>
<grpc.version>$grpc.version$</grpc.version>
<project.encoding>UTF-8</project.encoding>
</properties>
<dependencies>
<dependency>
<groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-runtime_2.12</artifactId>
- <version>${akka.grpc.version}</version>
+ <artifactId>pekko-grpc-runtime_2.12</artifactId>
+ <version>${pekko.grpc.version}</version>
</dependency>
<!-- for loading of cert, issue #89 -->
<dependency>
@@ -73,7 +73,7 @@ Maven
<plugin>
<groupId>com.lightbend.akka.grpc</groupId>
<artifactId>akka-grpc-maven-plugin</artifactId>
- <version>${akka.grpc.version}</version>
+ <version>${pekko.grpc.version}</version>
<!-- Hook the generate goal into the lifecycle,
automatically tied to generate-sources -->
<executions>
@@ -94,11 +94,11 @@ For a complete overview of the configuration options see the chapter for your bu
### Dependencies
-The Akka gRPC plugin makes your code depend on the `akka-grpc-runtime` library.
+The Akka gRPC plugin makes your code depend on the `pekko-grpc-runtime` library.
The table below shows direct dependencies of it and the second tab shows all libraries it depends on transitively. Be aware that the `io.grpc.grpc-api` library depends on Guava.
-@@dependencies { projectId="akka-grpc-runtime" }
+@@dependencies { projectId="pekko-grpc-runtime" }
## Generating Service Stubs
diff --git a/docs/src/main/paradox/deploy.md b/docs/src/main/paradox/deploy.md
index a3c5cf33..528078cd 100644
--- a/docs/src/main/paradox/deploy.md
+++ b/docs/src/main/paradox/deploy.md
@@ -6,7 +6,7 @@ Remember that the cleartext HTTP/2 "h2c with prior knowledge" protocol is not co
## Serve gRPC over HTTPS
-To deploy your gRPC service over a HTTPS connection you will have to use an @apidoc[akka.http.(javadsl|scaladsl).HttpsConnectionContext] as described in the [Akka-HTTP documentation](https://doc.akka.io/docs/akka-http/10.1/server-side/server-https-support.html).
+To deploy your gRPC service over a HTTPS connection you will have to use an @apidoc[HttpsConnectionContext] as described in the [Akka-HTTP documentation](https://doc.akka.io/docs/akka-http/10.1/server-side/server-https-support.html).
When using HTTPS and running your application on a JDK 8 prior to version 1.8.0_251 you also need to provide an external ALPN implementation. Follow the [section on ALPN](https://doc.akka.io/docs/akka-http/10.1/server-side/http2.html#application-layer-protocol-negotiation-alpn-) in the Akka-HTTP docs for more details.
diff --git a/docs/src/main/paradox/overview.md b/docs/src/main/paradox/overview.md
index 79b96777..820ba7e1 100644
--- a/docs/src/main/paradox/overview.md
+++ b/docs/src/main/paradox/overview.md
@@ -27,7 +27,7 @@ It features:
## Project Information
-@@project-info{ projectId="akka-grpc-runtime" }
+@@project-info{ projectId="pekko-grpc-runtime" }
## Project Status
diff --git a/docs/src/main/paradox/server/details.md b/docs/src/main/paradox/server/details.md
index 5de455a4..0daa257e 100644
--- a/docs/src/main/paradox/server/details.md
+++ b/docs/src/main/paradox/server/details.md
@@ -3,7 +3,7 @@
## Accessing request metadata
By default the generated service interfaces don't provide access to the request metadata, only to the request
-body (via the RPC method input parameter). If your methods require access to the request @apidoc[Metadata], you can configure
+body (via the RPC method input parameter). If your methods require access to the request @apidoc[Metadata], you can configure
Akka gRPC to generate server "power APIs" that extend the base service interfaces to provide an additional
request metadata parameter to each service method. See the detailed chapters on @ref[sbt](../buildtools/sbt.md), @ref[Gradle](../buildtools/gradle.md)
and @ref[Maven](../buildtools/maven.md) for how to set this build option. Note that this option doesn't effect the
@@ -30,7 +30,7 @@ For an overview of gRPC status codes and their meaning see [statuscodes.md](http
For unary responses:
Scala
-: @@snip[GrpcExceptionHandlerSpec](/interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala) { #unary }
+: @@snip[GrpcExceptionHandlerSpec](/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala) { #unary }
Java
: @@snip[ExceptionGreeterServiceImpl](/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java) { #unary }
@@ -38,7 +38,7 @@ Java
For streaming responses:
Scala
-: @@snip[GrpcExceptionHandlerSpec](/interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala) { #streaming }
+: @@snip[GrpcExceptionHandlerSpec](/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala) { #streaming }
Java
: @@snip[ExceptionGreeterServiceImpl](/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java) { #streaming }
@@ -46,10 +46,10 @@ Java
## Rich error model
Beyond status codes you can also use the [Rich error model](https://www.grpc.io/docs/guides/error/#richer-error-model).
-This example uses an error model taken from [common protobuf](https://github.com/googleapis/googleapis/blob/master/google/rpc/error_details.proto) but every class that is based on `scalapb.GeneratedMessage` can be used. Build and return the error as an `AkkaGrpcException`:
+This example uses an error model taken from [common protobuf](https://github.com/googleapis/googleapis/blob/master/google/rpc/error_details.proto) but every class that is based on `scalapb.GeneratedMessage` can be used. Build and return the error as a `PekkoGrpcException`:
Scala
-: @@snip[RichErrorModelSpec](/interop-tests/src/test/scala/akka/grpc/scaladsl/RichErrorModelSpec.scala) { #native_rich_error_model_unary }
+: @@snip[RichErrorModelSpec](/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala) { #native_rich_error_model_unary }
Java
: @@snip[RichErrorModelTest](/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java) { #rich_error_model_unary }
diff --git a/docs/src/main/paradox/server/walkthrough.md b/docs/src/main/paradox/server/walkthrough.md
index ccd36c43..d2a45c76 100644
--- a/docs/src/main/paradox/server/walkthrough.md
+++ b/docs/src/main/paradox/server/walkthrough.md
@@ -12,10 +12,10 @@ sbt
: @@@vars
```scala
// in project/plugins.sbt:
- addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "$project.version$")
+ addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % "$project.version$")
//
// in build.sbt:
- enablePlugins(AkkaGrpcPlugin)
+ enablePlugins(PekkoGrpcPlugin)
```
@@@
@@ -28,7 +28,7 @@ Gradle
gradlePluginPortal()
}
dependencies {
- // see https://plugins.gradle.org/plugin/com.lightbend.akka.grpc.gradle
+ // see https://plugins.gradle.org/plugin/org.apache.pekko.grpc.gradle
// for the currently latest version.
classpath 'gradle.plugin.com.lightbend.akka.grpc:akka-grpc-gradle-plugin:$project.version$'
}
@@ -37,7 +37,7 @@ Gradle
id 'java'
id 'application'
}
- apply plugin: 'com.lightbend.akka.grpc.gradle'
+ apply plugin: 'org.apache.pekko.grpc.gradle'
repositories {
mavenLocal()
mavenCentral()
@@ -57,15 +57,15 @@ Maven
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <akka.grpc.version>$project.version$</akka.grpc.version>
+ <pekko.grpc.version>$project.version$</pekko.grpc.version>
<grpc.version>$grpc.version$</grpc.version>
<project.encoding>UTF-8</project.encoding>
</properties>
<dependencies>
<dependency>
<groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-runtime_2.12</artifactId>
- <version>${akka.grpc.version}</version>
+ <artifactId>pekko-grpc-runtime_2.12</artifactId>
+ <version>${pekko.grpc.version}</version>
</dependency>
</dependencies>
<build>
@@ -73,7 +73,7 @@ Maven
<plugin>
<groupId>com.lightbend.akka.grpc</groupId>
<artifactId>akka-grpc-maven-plugin</artifactId>
- <version>${akka.grpc.version}</version>
+ <version>${pekko.grpc.version}</version>
<executions>
<execution>
<goals>
@@ -92,11 +92,11 @@ For a complete overview of the configuration options see the chapter for your bu
### Dependencies
-The Akka gRPC plugin makes your code depend on the `akka-grpc-runtime` library.
+The Akka gRPC plugin makes your code depend on the `pekko-grpc-runtime` library.
The table below shows direct dependencies of it and the second tab shows all libraries it depends on transitively. Be aware that the `io.grpc.grpc-api` library depends on Guava.
-@@dependencies { projectId="akka-grpc-runtime" }
+@@dependencies { projectId="pekko-grpc-runtime" }
## Writing a service definition
@@ -195,7 +195,7 @@ Java
It's important to enable HTTP/2 in Akka HTTP in the configuration of the `ActorSystem` by setting
```
-akka.http.server.preview.enable-http2 = on
+pekko.http.server.preview.enable-http2 = on
```
In the example this was done from the `main` method, but you could also do this from within your `application.conf`.
@@ -207,7 +207,7 @@ The above example does not use TLS. Find more about how to @ref[Serve gRPC over
## Serving multiple services
When a server handles several services the handlers must be combined with
-@scala[`akka.grpc.scaladsl.ServiceHandler.concatOrNotFound`]@java[`akka.grpc.javadsl.ServiceHandler.concatOrNotFound`]:
+@scala[`org.apache.pekko.grpc.scaladsl.ServiceHandler.concatOrNotFound`]@java[`org.apache.pekko.grpc.javadsl.ServiceHandler.concatOrNotFound`]:
Scala
: @@snip [GreeterServiceImpl.scala](/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala) { #concatOrNotFound }
diff --git a/docs/src/main/paradox/troubleshooting.md b/docs/src/main/paradox/troubleshooting.md
index f817d521..9504c3e4 100644
--- a/docs/src/main/paradox/troubleshooting.md
+++ b/docs/src/main/paradox/troubleshooting.md
@@ -15,5 +15,5 @@ gRPC server with a client that is configured with TLS enabled.
java.util.concurrent.ExecutionException: io.grpc.StatusRuntimeException: UNAVAILABLE: Failed ALPN negotiation: Unable to find compatible protocol
```
-This may happen when `akka.http.server.preview.enable-http2` is not enabled in
+This may happen when `pekko.http.server.preview.enable-http2` is not enabled in
the configuration.
diff --git a/gradle-plugin/README.md b/gradle-plugin/README.md
index 402ee7b3..5f3bf25d 100644
--- a/gradle-plugin/README.md
+++ b/gradle-plugin/README.md
@@ -1,7 +1,7 @@
-# Akka gRPC Gradle Plugin
+# Apache Pekko gRPC Gradle Plugin
Notes on how it works:
The plugin uses a gradle protobuf plugin, and then hooks our custom generators in through the Main class in the
-akka-grpc-codegen module (and additionally the Main of akka-grpc-scalapb-protoc-plugin scalapb for when building Scala
-projects with gradle)
\ No newline at end of file
+pekko-grpc-codegen module (and additionally the Main of pekko-grpc-scalapb-protoc-plugin scalapb for when building Scala
+projects with gradle)
diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
index fa10d19b..c3c5c9d2 100644
--- a/gradle-plugin/build.gradle
+++ b/gradle-plugin/build.gradle
@@ -16,23 +16,23 @@ version = finalVersion
gradlePlugin {
plugins {
- akkaGrpcPlugin {
- id = 'com.lightbend.akka.grpc.gradle'
- implementationClass = 'akka.grpc.gradle.AkkaGrpcPlugin'
+ pekkoGrpcPlugin {
+ id = 'org.apache.pekko.grpc.gradle'
+ implementationClass = 'org.apache.pekko.grpc.gradle.PekkoGrpcPlugin'
}
}
}
pluginBundle {
website = 'https://doc.akka.io/docs/akka-grpc/current/'
- vcsUrl = 'https://github.com/akka/akka-grpc'
- description = 'Building streaming gRPC servers and clients on top of Akka Streams'
- tags = ['akka', 'streams', 'reactive']
+ vcsUrl = 'https://github.com/apache/incubator-pekko-grpc'
+ description = 'Building streaming gRPC servers and clients on top of Apache Pekko Streams'
+ tags = ['pekko', 'streams', 'reactive']
plugins {
- akkaGrpcPlugin {
- id = 'com.lightbend.akka.grpc.gradle'
- displayName = 'Akka gRPC'
+ pekkoGrpcPlugin {
+ id = 'org.apache.pekko.grpc.gradle'
+ displayName = 'Apache Pekko gRPC'
}
}
}
@@ -54,7 +54,7 @@ dependencies {
}
test {
- systemProperty 'akkaGrpcTest.pluginVersion', project.version
+ systemProperty 'pekkoGrpcTest.pluginVersion', project.version
testLogging {
events "passed", "skipped", "failed"
exceptionFormat "full"
diff --git a/gradle-plugin/settings.gradle b/gradle-plugin/settings.gradle
index 599f9949..eb9b98fb 100644
--- a/gradle-plugin/settings.gradle
+++ b/gradle-plugin/settings.gradle
@@ -1 +1 @@
-rootProject.name = "akka-grpc-gradle-plugin"
+rootProject.name = "pekko-grpc-gradle-plugin"
diff --git a/gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPlugin.groovy b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy
similarity index 73%
rename from gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPlugin.groovy
rename to gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy
index 2d0f2613..6d3d4060 100644
--- a/gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPlugin.groovy
+++ b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPlugin.groovy
@@ -1,4 +1,4 @@
-package akka.grpc.gradle
+package org.apache.pekko.grpc.gradle
import com.google.protobuf.gradle.ProtobufPlugin
import org.apache.commons.lang.SystemUtils
@@ -15,15 +15,15 @@ import java.net.URLEncoder
import java.nio.file.Files
import java.nio.file.Path
-import static akka.grpc.gradle.AkkaGrpcPluginExtension.*
+import static org.apache.pekko.grpc.gradle.PekkoGrpcPluginExtension.*
-class AkkaGrpcPlugin implements Plugin<Project> {
+class PekkoGrpcPlugin implements Plugin<Project> {
Project project
// workaround for test projects, when one only neesd to tests a new plugin version without rebuilding dependencies.
String getBaselineVersion(String pluginVersion) {
- def pv = System.getProperty("akka.grpc.baseline.version", pluginVersion)
+ def pv = System.getProperty("pekko.grpc.baseline.version", pluginVersion)
if (VersionNumber.parse(pv).qualifier) {
pv + "-SNAPSHOT"
} else {
@@ -39,9 +39,9 @@ class AkkaGrpcPlugin implements Plugin<Project> {
}
this.project = project
- def akkaGrpcExt = project.extensions.create('akkaGrpc', AkkaGrpcPluginExtension, project)
+ def pekkoGrpcExt = project.extensions.create('pekkoGrpc', PekkoGrpcPluginExtension, project)
- if (akkaGrpcExt.scala) {
+ if (pekkoGrpcExt.scala) {
project.pluginManager.apply ScalaPlugin
} else {
project.pluginManager.apply JavaPlugin
@@ -49,21 +49,25 @@ class AkkaGrpcPlugin implements Plugin<Project> {
project.pluginManager.apply ProtobufPlugin
- def baselineVersion = getBaselineVersion(akkaGrpcExt.pluginVersion)
+ def baselineVersion = getBaselineVersion(pekkoGrpcExt.pluginVersion)
project.repositories {
+ mavenLocal()
mavenCentral()
if (VersionNumber.parse(baselineVersion).qualifier) {
maven {
url "https://oss.sonatype.org/content/repositories/snapshots"
}
+ maven {
+ url "https://repository.apache.org/content/groups/snapshots"
+ }
}
}
String assemblySuffix = SystemUtils.IS_OS_WINDOWS ? "bat" : "jar"
String assemblyClassifier = SystemUtils.IS_OS_WINDOWS ? "bat" : "assembly"
- Path logFile = project.buildDir.toPath().resolve("akka-grpc-gradle-plugin.log")
+ Path logFile = project.buildDir.toPath().resolve("pekko-grpc-gradle-plugin.log")
project.sourceSets {
main {
@@ -79,14 +83,14 @@ class AkkaGrpcPlugin implements Plugin<Project> {
project.sourceSets {
main {
- if (akkaGrpcExt.scala) {
+ if (pekkoGrpcExt.scala) {
scala {
- srcDir 'build/generated/source/proto/main/akkaGrpc'
+ srcDir 'build/generated/source/proto/main/pekkoGrpc'
srcDir 'build/generated/source/proto/main/scalapb'
}
} else {
java {
- srcDir 'build/generated/source/proto/main/akkaGrpc'
+ srcDir 'build/generated/source/proto/main/pekkoGrpc'
srcDir 'build/generated/source/proto/main/java'
}
}
@@ -101,43 +105,43 @@ class AkkaGrpcPlugin implements Plugin<Project> {
artifact = "com.google.protobuf:protoc:${PROTOC_VERSION}"
}
plugins {
- akkaGrpc {
- artifact = "com.lightbend.akka.grpc:akka-grpc-codegen_${PROTOC_PLUGIN_SCALA_VERSION}:${baselineVersion}:${assemblyClassifier}@${assemblySuffix}"
+ pekkoGrpc {
+ artifact = "com.lightbend.akka.grpc:pekko-grpc-codegen_${PROTOC_PLUGIN_SCALA_VERSION}:${baselineVersion}:${assemblyClassifier}@${assemblySuffix}"
}
- if (akkaGrpcExt.scala) {
+ if (pekkoGrpcExt.scala) {
scalapb {
- artifact = "com.lightbend.akka.grpc:akka-grpc-scalapb-protoc-plugin_${PROTOC_PLUGIN_SCALA_VERSION}:${baselineVersion}:${assemblyClassifier}@${assemblySuffix}"
+ artifact = "com.lightbend.akka.grpc:pekko-grpc-scalapb-protoc-plugin_${PROTOC_PLUGIN_SCALA_VERSION}:${baselineVersion}:${assemblyClassifier}@${assemblySuffix}"
}
}
}
generateProtoTasks {
all().each { task ->
- if (akkaGrpcExt.scala) {
+ if (pekkoGrpcExt.scala) {
task.builtins {
remove java
}
}
task.plugins {
- akkaGrpc {
- option "language=${akkaGrpcExt.scala ? "Scala" : "Java"}"
- option "generate_client=${akkaGrpcExt.generateClient}"
- option "generate_server=${akkaGrpcExt.generateServer}"
- option "server_power_apis=${akkaGrpcExt.serverPowerApis}"
- option "use_play_actions=${akkaGrpcExt.usePlayActions}"
- option "extra_generators=${akkaGrpcExt.extraGenerators.join(';')}"
+ pekkoGrpc {
+ option "language=${pekkoGrpcExt.scala ? "Scala" : "Java"}"
+ option "generate_client=${pekkoGrpcExt.generateClient}"
+ option "generate_server=${pekkoGrpcExt.generateServer}"
+ option "server_power_apis=${pekkoGrpcExt.serverPowerApis}"
+ option "use_play_actions=${pekkoGrpcExt.usePlayActions}"
+ option "extra_generators=${pekkoGrpcExt.extraGenerators.join(';')}"
option "logfile_enc=${URLEncoder.encode(logFile.toString(), "utf-8")}"
- if (akkaGrpcExt.includeStdTypes) {
+ if (pekkoGrpcExt.includeStdTypes) {
option "include_std_types=true"
}
- if (akkaGrpcExt.generatePlay) {
+ if (pekkoGrpcExt.generatePlay) {
option "generate_play=true"
}
- if (akkaGrpcExt.scala) {
+ if (pekkoGrpcExt.scala) {
option "flat_package"
}
}
- if (akkaGrpcExt.scala) {
+ if (pekkoGrpcExt.scala) {
scalapb {
option "flat_package"
}
@@ -155,7 +159,7 @@ class AkkaGrpcPlugin implements Plugin<Project> {
def scalaVersion = autodetectScala()
p.dependencies {
- implementation "com.lightbend.akka.grpc:akka-grpc-runtime_${scalaVersion}:${baselineVersion}"
+ implementation "com.lightbend.akka.grpc:pekko-grpc-runtime_${scalaVersion}:${baselineVersion}"
implementation "io.grpc:grpc-stub:${GRPC_VERSION}"
}
}
diff --git a/gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
similarity index 78%
rename from gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy
rename to gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
index 2b80bd02..6dcd0d0e 100644
--- a/gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy
+++ b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
@@ -1,9 +1,9 @@
-package akka.grpc.gradle
+package org.apache.pekko.grpc.gradle
import org.gradle.api.Project
-class AkkaGrpcPluginExtension {
+class PekkoGrpcPluginExtension {
static final String PROTOC_VERSION = "3.20.1" // checked synced by VersionSyncCheckPlugin
@@ -11,10 +11,10 @@ class AkkaGrpcPluginExtension {
static final String GRPC_VERSION = "1.48.1" // checked synced by VersionSyncCheckPlugin
- static final String PLUGIN_CODE = 'com.lightbend.akka.grpc.gradle'
+ static final String PLUGIN_CODE = 'org.apache.pekko.grpc.gradle'
// workaround for tests, where there's no jar and MANIFEST.MF can't be read
- final String pluginVersion = System.getProperty("akkaGrpcTest.pluginVersion", AkkaGrpcPlugin.class.package.implementationVersion)
+ final String pluginVersion = System.getProperty("pekkoGrpcTest.pluginVersion", PekkoGrpcPlugin.class.package.implementationVersion)
boolean generateClient = true
boolean generateServer = true
@@ -29,7 +29,7 @@ class AkkaGrpcPluginExtension {
final boolean scala
- AkkaGrpcPluginExtension(Project project) {
+ PekkoGrpcPluginExtension(Project project) {
this.project = project
def scalaFiles = project.fileTree("src/main").matching { include "**/*.scala" }
if (!scalaFiles.isEmpty()) {
diff --git a/gradle-plugin/src/test/groovy/helper/BaseSpec.groovy b/gradle-plugin/src/test/groovy/helper/BaseSpec.groovy
index 4e5e4e1f..1dbf0b06 100644
--- a/gradle-plugin/src/test/groovy/helper/BaseSpec.groovy
+++ b/gradle-plugin/src/test/groovy/helper/BaseSpec.groovy
@@ -1,11 +1,11 @@
package helper
-import akka.grpc.gradle.AkkaGrpcPluginExtension
+import org.apache.pekko.grpc.gradle.PekkoGrpcPluginExtension
import org.junit.Rule
import org.junit.rules.TemporaryFolder
import spock.lang.Specification
-import static akka.grpc.gradle.AkkaGrpcPluginExtension.getPLUGIN_CODE
+import static org.apache.pekko.grpc.gradle.PekkoGrpcPluginExtension.getPLUGIN_CODE
abstract class BaseSpec extends Specification {
@@ -35,20 +35,20 @@ project.dependencies {
"""
}
- def findAkkaGrpcRuntime() {
- this.project.configurations.akkaGrpcRuntime.allDependencies.find { it.name.contains("akka-grpc-runtime") }
+ def findPekkoGrpcRuntime() {
+ this.project.configurations.pekkoGrpcRuntime.allDependencies.find { it.name.contains("pekko-grpc-runtime") }
}
- AkkaGrpcPluginExtension sampleSetup(def plugin = "scala", String scala = "2.12") {
+ PekkoGrpcPluginExtension sampleSetup(def plugin = "scala", String scala = "2.12") {
if (plugin == "scala" || plugin == ScalaWrapperPlugin) {
def scalaDir = projectDir.newFolder('src', 'main', 'scala')
- new File(scalaDir, "test.scala").text = "object AkkaGrpc"
+ new File(scalaDir, "test.scala").text = "object PekkoGrpc"
}
project.pluginManager.apply PLUGIN_CODE
project.dependencies {
implementation "com.typesafe.scala-logging:scala-logging_$scala:3.9.2"
}
- project.extensions.getByType(AkkaGrpcPluginExtension)
+ project.extensions.getByType(PekkoGrpcPluginExtension)
}
}
diff --git a/gradle-plugin/src/test/groovy/unit/ApplySpec.groovy b/gradle-plugin/src/test/groovy/unit/ApplySpec.groovy
index 7ead6d1d..1f26f0a7 100644
--- a/gradle-plugin/src/test/groovy/unit/ApplySpec.groovy
+++ b/gradle-plugin/src/test/groovy/unit/ApplySpec.groovy
@@ -1,6 +1,6 @@
package unit
-import akka.grpc.gradle.AkkaGrpcPluginExtension
+import org.apache.pekko.grpc.gradle.PekkoGrpcPluginExtension
import helper.BaseSpec
import helper.ScalaWrapperPlugin
import org.gradle.api.Project
@@ -12,7 +12,7 @@ import spock.lang.Unroll
import static org.gradle.testkit.runner.TaskOutcome.SKIPPED
import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
-import static akka.grpc.gradle.AkkaGrpcPluginExtension.PLUGIN_CODE
+import static org.apache.pekko.grpc.gradle.PekkoGrpcPluginExtension.PLUGIN_CODE
class ApplySpec extends BaseSpec {
@@ -26,7 +26,7 @@ class ApplySpec extends BaseSpec {
}
def createLog() {
- log = projectDir.newFile("build/akka-grpc-gradle-plugin.log")
+ log = projectDir.newFile("build/pekko-grpcgradle-plugin.log")
}
BuildResult executeGradleTask(String task) {
@@ -41,12 +41,12 @@ class ApplySpec extends BaseSpec {
@Unroll
def "should detect language for #plugin"() {
given:
- def akkaGrpcExt = sampleSetup(plugin, scala)
+ def pekkoGrpcExt = sampleSetup(plugin, scala)
when:
project.evaluate()
then:
- with(akkaGrpcExt) {
- it.pluginVersion == System.getProperty("akkaGrpcTest.pluginVersion")
+ with(pekkoGrpcExt) {
+ it.pluginVersion == System.getProperty("pekkoGrpcTest.pluginVersion")
it.scala == isScala
}
where:
@@ -89,7 +89,7 @@ class ApplySpec extends BaseSpec {
def "should not fail scala autodetect if dependencies contain underscore"() {
given:
- def akkaGrpcExt = sampleSetup()
+ def pekkoGrpcExt = sampleSetup()
and:
project.dependencies {
implementation "com.google.errorprone:error_prone_annotations:2.3.4"
@@ -97,7 +97,7 @@ class ApplySpec extends BaseSpec {
when:
project.evaluate()
then: 'plugin is applied'
- akkaGrpcExt.scala
+ pekkoGrpcExt.scala
}
def "should disable compileJava if no java source files found"() {
@@ -151,7 +151,7 @@ class ApplySpec extends BaseSpec {
when:
project.evaluate()
then:
- project.extensions.getByType(AkkaGrpcPluginExtension)
+ project.extensions.getByType(PekkoGrpcPluginExtension)
}
def "should fail if scala-version implicitly declared and mismatches with other scala-library version"() {
diff --git a/gradle-plugin/src/test/groovy/unit/DependenciesSpec.groovy b/gradle-plugin/src/test/groovy/unit/DependenciesSpec.groovy
index 02b28213..d9bc8776 100644
--- a/gradle-plugin/src/test/groovy/unit/DependenciesSpec.groovy
+++ b/gradle-plugin/src/test/groovy/unit/DependenciesSpec.groovy
@@ -1,31 +1,31 @@
package unit
-import akka.grpc.gradle.AkkaGrpcPluginExtension
+import org.apache.pekko.grpc.gradle.PekkoGrpcPluginExtension
import helper.BaseSpec
import org.gradle.api.Project
import org.gradle.api.artifacts.Dependency
import org.gradle.testfixtures.ProjectBuilder
import spock.lang.Unroll
-import static akka.grpc.gradle.AkkaGrpcPluginExtension.GRPC_VERSION
-import static akka.grpc.gradle.AkkaGrpcPluginExtension.PROTOC_PLUGIN_SCALA_VERSION
+import static org.apache.pekko.grpc.gradle.PekkoGrpcPluginExtension.GRPC_VERSION
+import static org.apache.pekko.grpc.gradle.PekkoGrpcPluginExtension.PROTOC_PLUGIN_SCALA_VERSION
class DependenciesSpec extends BaseSpec {
- static final String PROTOC_PLUGIN_CODEGEN = "akkaGrpc"
+ static final String PROTOC_PLUGIN_CODEGEN = "pekkoGrpc"
- def checkCodegen(Dependency d, AkkaGrpcPluginExtension ext) {
+ def checkCodegen(Dependency d, PekkoGrpcPluginExtension ext) {
assert d.group == "com.lightbend.akka.grpc"
- assert d.name == "akka-grpc-codegen_${PROTOC_PLUGIN_SCALA_VERSION}"
+ assert d.name == "pekko-grpc-codegen_${PROTOC_PLUGIN_SCALA_VERSION}"
assert d.version == ext.pluginVersion
true
}
static final String PROTOC_PLUGIN_SCALAPB = "scalapb"
- def checkScalapb(Dependency d, AkkaGrpcPluginExtension ext) {
+ def checkScalapb(Dependency d, PekkoGrpcPluginExtension ext) {
assert d.group == "com.lightbend.akka.grpc"
- assert d.name == "akka-grpc-scalapb-protoc-plugin_${PROTOC_PLUGIN_SCALA_VERSION}"
+ assert d.name == "pekko-grpc-scalapb-protoc-plugin_${PROTOC_PLUGIN_SCALA_VERSION}"
assert d.version == ext.pluginVersion
true
}
@@ -39,50 +39,50 @@ class DependenciesSpec extends BaseSpec {
def "should add only protoc codegen plugin for java"() {
given:
- def akkaGrpcExt = sampleSetup('java')
+ def pekkoGrpcExt = sampleSetup('java')
when:
project.evaluate()
then:
Map<String, Dependency> plugins = project.protobuf.tools.plugins.collectEntries { [(it.name): project.dependencies.create(it.artifact)] }
plugins.keySet().sort() == [PROTOC_PLUGIN_CODEGEN]
and:
- checkCodegen(plugins[(PROTOC_PLUGIN_CODEGEN)], akkaGrpcExt)
+ checkCodegen(plugins[(PROTOC_PLUGIN_CODEGEN)], pekkoGrpcExt)
and:
def cfg = project.configurations.getByName("protobufToolsLocator_$PROTOC_PLUGIN_CODEGEN")
cfg.dependencies.size() == 1
- checkCodegen(cfg.dependencies.first(), akkaGrpcExt)
+ checkCodegen(cfg.dependencies.first(), pekkoGrpcExt)
}
def "should add protoc codegen and scalapb plugins for scala"() {
given:
- def akkaGrpcExt = sampleSetup('scala')
+ def pekkoGrpcExt = sampleSetup('scala')
when:
project.evaluate()
then:
Map<String, Dependency> plugins = project.protobuf.tools.plugins.collectEntries { [(it.name): project.dependencies.create(it.artifact)] }
plugins.keySet().sort() == [PROTOC_PLUGIN_CODEGEN, PROTOC_PLUGIN_SCALAPB]
and:
- checkCodegen(plugins[(PROTOC_PLUGIN_CODEGEN)], akkaGrpcExt)
- checkScalapb(plugins[(PROTOC_PLUGIN_SCALAPB)], akkaGrpcExt)
+ checkCodegen(plugins[(PROTOC_PLUGIN_CODEGEN)], pekkoGrpcExt)
+ checkScalapb(plugins[(PROTOC_PLUGIN_SCALAPB)], pekkoGrpcExt)
and:
def cfg = project.configurations.getByName("protobufToolsLocator_$PROTOC_PLUGIN_CODEGEN")
cfg.dependencies.size() == 1
- checkCodegen(cfg.dependencies.first(), akkaGrpcExt)
+ checkCodegen(cfg.dependencies.first(), pekkoGrpcExt)
and:
def cfg2 = project.configurations.getByName("protobufToolsLocator_$PROTOC_PLUGIN_SCALAPB")
cfg2.dependencies.size() == 1
- checkScalapb(cfg2.dependencies.first(), akkaGrpcExt)
+ checkScalapb(cfg2.dependencies.first(), pekkoGrpcExt)
}
@Unroll
- def "should autodetected scala version for akka-grpc-runtime #plugin #scala"() {
+ def "should autodetected scala version for pekko-grpc-runtime #plugin #scala"() {
given:
- def akkaGrpcExt = sampleSetup(plugin, scala)
+ def pekkoGrpcExt = sampleSetup(plugin, scala)
when:
project.evaluate()
then: "added to configuration"
def deps = project.configurations.implementation.dependencies
- deps.any { it.name == "akka-grpc-runtime_$scala" && it.version == akkaGrpcExt.pluginVersion }
+ deps.any { it.name == "pekko-grpc-runtime_$scala" && it.version == pekkoGrpcExt.pluginVersion }
deps.any { it.name == "grpc-stub" && it.version == GRPC_VERSION }
where:
plugin || scala
diff --git a/interop-tests/README.md b/interop-tests/README.md
index 923df78d..4498a7c2 100644
--- a/interop-tests/README.md
+++ b/interop-tests/README.md
@@ -1,24 +1,24 @@
-# Akka gRPC Interop tests
+# Apache Pekko gRPC Interop tests
This project contains `grpc-interop-testing` tests and other tests that require code generation.
The project layout is roughly as follows:
* `src/main/*`: code shared between this subproject and the `00-interop-tests` scripted tests
-* `src/main/*/io/grpc/testing/integration2`: infrastructure taken from grpc-java, but generalized to also allow invoking the Akka gRPC implementation
+* `src/main/*/io/grpc/testing/integration2`: infrastructure taken from grpc-java, but generalized to also allow invoking the Apache Pekko gRPC implementation
* `src/*/*/akka/grpc/interop`: `grpc-interop-testing` tests
-* `src/test/scala/akka/grpc/scaladsl` other tests that require code generation
+* `src/test/scala/org/apache/pekko/grpc/scaladsl` other tests that require code generation
## grpc-interop-testing tests
-Test interoperability between the Akka implementation and the implementation from `io.gpc:grpc-interop-testing`, based on [gRPC's original testset](https://github.com/grpc/grpc/blob/master/doc/interop-test-descriptions.md).
+Test interoperability between the Apache Pekko implementation and the implementation from `io.gpc:grpc-interop-testing`, based on [gRPC's original testset](https://github.com/grpc/grpc/blob/master/doc/interop-test-descriptions.md).
There are 3 ways to run these tests:
### Running as unit tests
The GrpcInteropSpec test in this project will run the test suite using various
-combinations of Akka gRPC Java, Akka gRPC Scala and gRPC-Java.
+combinations of Apache Pekko gRPC Java, Apache Pekko gRPC Scala and gRPC-Java.
### Running as scripted tests
@@ -30,7 +30,7 @@ code generation from the actual sbt plugin.
Running the tests manually is a WiP and might need some local tweaks to work.
-Run `AkkaHttpServerAppScala` to start a gRPC server with the server-side of the
+Run `PekkoHttpServerAppScala` to start a gRPC server with the server-side of the
tests, which can then be tested against using other gRPC implementations
implementing the client side.
diff --git a/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java b/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java
index dc0ebffb..8283b8fc 100644
--- a/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java
+++ b/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java
@@ -10,7 +10,7 @@ import java.io.InputStream;
/**
* This class has all the methods of the grpc-java AbstractInteropTest, but none of the implementations,
- * so it can implemented either by calling AbstractInteropTest or with an Akka gRPC implementation.
+ * so it can implemented either by calling AbstractInteropTest or with an Apache Pekko gRPC implementation.
*
* Test requirements documentation: https://github.com/grpc/grpc/blob/master/doc/interop-test-descriptions.md
*/
diff --git a/interop-tests/src/main/java/akka/grpc/interop/AkkaGrpcClientJava.java b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java
similarity index 77%
rename from interop-tests/src/main/java/akka/grpc/interop/AkkaGrpcClientJava.java
rename to interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java
index 57404e35..14a8607d 100644
--- a/interop-tests/src/main/java/akka/grpc/interop/AkkaGrpcClientJava.java
+++ b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java
@@ -2,9 +2,9 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop;
+package org.apache.pekko.grpc.interop;
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
import io.grpc.internal.testing.TestUtils;
import io.grpc.testing.integration2.ClientTester;
import io.grpc.testing.integration2.TestServiceClient;
@@ -15,11 +15,11 @@ import scala.concurrent.duration.Duration;
import java.util.concurrent.TimeUnit;
-public class AkkaGrpcClientJava extends GrpcClient {
+public class PekkoGrpcClientJava extends GrpcClient {
private final Function2<Settings, ActorSystem, ClientTester> clientTesterFactory;
- public AkkaGrpcClientJava(Function2<Settings, ActorSystem, ClientTester> clientTesterFactory) {
+ public PekkoGrpcClientJava(Function2<Settings, ActorSystem, ClientTester> clientTesterFactory) {
this.clientTesterFactory = clientTesterFactory;
}
@@ -27,7 +27,7 @@ public class AkkaGrpcClientJava extends GrpcClient {
TestUtils.installConscryptIfAvailable();
final Settings settings = Settings.parseArgs(args);
- final ActorSystem sys = ActorSystem.create("AkkaGrpcClientJava");
+ final ActorSystem sys = ActorSystem.create("PekkoGrpcClientJava");
final TestServiceClient client = new TestServiceClient(clientTesterFactory.apply(settings, sys));
client.setUp();
diff --git a/interop-tests/src/main/java/akka/grpc/interop/AkkaGrpcServerJava.java b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java
similarity index 79%
rename from interop-tests/src/main/java/akka/grpc/interop/AkkaGrpcServerJava.java
rename to interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java
index 05abe133..3b14d31b 100644
--- a/interop-tests/src/main/java/akka/grpc/interop/AkkaGrpcServerJava.java
+++ b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java
@@ -2,20 +2,20 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop;
-
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.HttpsConnectionContext;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.settings.ServerSettings;
-import akka.japi.function.Function;
-import akka.stream.Materializer;
-import akka.stream.SystemMaterializer;
-import akka.util.ByteString;
+package org.apache.pekko.grpc.interop;
+
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.HttpsConnectionContext;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.settings.ServerSettings;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.util.ByteString;
import com.typesafe.config.ConfigFactory;
import io.grpc.internal.testing.TestUtils;
import io.grpc.testing.integration.TestService;
@@ -41,19 +41,19 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
/**
- * Glue code to start a gRPC server based on the akka-grpc Java API to test against
+ * Glue code to start a gRPC server based on the pekko-grpc Java API to test against
*/
-public class AkkaGrpcServerJava extends GrpcServer<Tuple2<ActorSystem, ServerBinding>> {
+public class PekkoGrpcServerJava extends GrpcServer<Tuple2<ActorSystem, ServerBinding>> {
private final Function2<Materializer, ActorSystem, Function<HttpRequest, CompletionStage<HttpResponse>>> handlerFactory;
- public AkkaGrpcServerJava(Function2<Materializer, ActorSystem, Function<HttpRequest, CompletionStage<HttpResponse>>> handlerFactory) {
+ public PekkoGrpcServerJava(Function2<Materializer, ActorSystem, Function<HttpRequest, CompletionStage<HttpResponse>>> handlerFactory) {
this.handlerFactory = handlerFactory;
}
public Tuple2<ActorSystem, ServerBinding> start(String[] args) throws Exception {
ActorSystem sys = ActorSystem.create(
- "akka-grpc-server-java",
- ConfigFactory.parseString("akka.http.server.preview.enable-http2 = on"));
+ "pekko-grpc-server-java",
+ ConfigFactory.parseString("pekko.http.server.preview.enable-http2 = on"));
Materializer mat = SystemMaterializer.get(sys).materializer();
Function<HttpRequest, CompletionStage<HttpResponse>> testService = handlerFactory.apply(mat, sys);
diff --git a/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala b/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala
index e24e613f..dd2fd76a 100644
--- a/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala
+++ b/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala
@@ -15,7 +15,7 @@ object ChannelBuilder {
* Reimplementation of the private io.grpc.testing.integration.TestServiceClient$Tester#createChannelBuilder
*/
def create(settings: Settings): ManagedChannelBuilder[NettyChannelBuilder] =
- if (settings.useAkkaHttp) {
+ if (settings.usePekkoHttp) {
// TODO: here comes the akka-http based channel (when ready)
throw new RuntimeException("Not implemented")
} else {
diff --git a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
index 6da770ae..5688b781 100644
--- a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
+++ b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
@@ -13,7 +13,7 @@ final case class Settings(
testCase: String,
useTls: Boolean,
useTestCa: Boolean,
- useAkkaHttp: Boolean,
+ usePekkoHttp: Boolean,
defaultServiceAccount: String,
serviceAccountKeyFile: String,
oauthScope: String) {
@@ -33,7 +33,7 @@ object Settings {
testCase = "empty_unary",
useTls = true,
useTestCa = false,
- useAkkaHttp = false,
+ usePekkoHttp = false,
defaultServiceAccount = null,
serviceAccountKeyFile = null,
oauthScope = null)
@@ -59,7 +59,7 @@ object Settings {
| --use_tls=true|false Whether to use TLS. Default ${defaultSettings.useTls}
| --use_test_ca=true|false Whether to trust our fake CA. Requires --use_tls=true
| to have effect. Default ${defaultSettings.useTestCa}
- | --use_akkaHttp=true|false Whether to use akka-http instead of Netty. Default ${defaultSettings.useAkkaHttp}
+ | --use_pekkoHttp=true|false Whether to use pekko-http instead of Netty. Default ${defaultSettings.usePekkoHttp}
| --default_service_account Email of GCE default service account. Default ${defaultSettings.defaultServiceAccount}
| --service_account_key_file Path to service account json key file. ${defaultSettings.serviceAccountKeyFile}
| --oauth_scope Scope for OAuth tokens. Default ${defaultSettings.oauthScope}
@@ -97,7 +97,7 @@ object Settings {
case "test_case" => settings.copy(testCase = value)
case "use_tls" => settings.copy(useTls = value.toBoolean)
case "use_test_ca" => settings.copy(useTestCa = value.toBoolean)
- case "use_akkaHttp" => settings.copy(useAkkaHttp = value.toBoolean)
+ case "use_akkaHttp" => settings.copy(usePekkoHttp = value.toBoolean)
case "default_service_account" => settings.copy(defaultServiceAccount = value)
case "service_account_key_file" => settings.copy(serviceAccountKeyFile = value)
case "oauth_scope" => settings.copy(oauthScope = value)
diff --git a/interop-tests/src/main/scala/akka/grpc/interop/GrpcClient.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala
similarity index 56%
rename from interop-tests/src/main/scala/akka/grpc/interop/GrpcClient.scala
rename to interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala
index ef169b22..72771060 100644
--- a/interop-tests/src/main/scala/akka/grpc/interop/GrpcClient.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
+package org.apache.pekko.grpc.interop
/**
- * Glue code to start a gRPC client (either akka-grpc or io.grpc) to test with
+ * Glue code to start a gRPC client (either pekko-grpc or io.grpc) to test with
*/
abstract class GrpcClient {
def run(args: Array[String]): Unit
diff --git a/interop-tests/src/main/scala/akka/grpc/interop/GrpcInteropTests.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala
similarity index 96%
rename from interop-tests/src/main/scala/akka/grpc/interop/GrpcInteropTests.scala
rename to interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala
index 25dc1553..d3282b6c 100644
--- a/interop-tests/src/main/scala/akka/grpc/interop/GrpcInteropTests.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
+package org.apache.pekko.grpc.interop
import io.grpc.StatusRuntimeException
import org.scalatest.{ Assertion, Succeeded }
@@ -142,9 +142,9 @@ object IoGrpcJavaClientProvider extends GrpcClientProvider {
val client = IoGrpcClient
}
-trait AkkaHttpServerProvider extends GrpcServerProvider
+trait PekkoHttpServerProvider extends GrpcServerProvider
-trait AkkaClientProvider extends GrpcClientProvider {
+trait PekkoClientProvider extends GrpcClientProvider {
// All client implementations currently support the same set of interop tests.
// When adding support for further interop tests, we should either implement them
// for all client implementations simultaneously, or distribute `pendingCases` over
diff --git a/interop-tests/src/main/scala/akka/grpc/interop/GrpcServer.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala
similarity index 68%
rename from interop-tests/src/main/scala/akka/grpc/interop/GrpcServer.scala
rename to interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala
index c74273ad..9c5df063 100644
--- a/interop-tests/src/main/scala/akka/grpc/interop/GrpcServer.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
+package org.apache.pekko.grpc.interop
/**
- * Glue code to start a gRPC server (either akka-grpc or io.grpc) to test against
+ * Glue code to start a gRPC server (either pekko-grpc or io.grpc) to test against
*/
abstract class GrpcServer[T] {
@throws[Exception]
diff --git a/interop-tests/src/main/scala/akka/grpc/interop/IoGrpcClient.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala
similarity index 93%
rename from interop-tests/src/main/scala/akka/grpc/interop/IoGrpcClient.scala
rename to interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala
index 4b3cafd9..7bc56ca2 100644
--- a/interop-tests/src/main/scala/akka/grpc/interop/IoGrpcClient.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
+package org.apache.pekko.grpc.interop
import io.grpc.internal.testing.TestUtils
import io.grpc.testing.integration2.{ GrpcJavaClientTester, Settings, TestServiceClient }
diff --git a/interop-tests/src/main/scala/akka/grpc/interop/IoGrpcServer.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala
similarity index 96%
rename from interop-tests/src/main/scala/akka/grpc/interop/IoGrpcServer.scala
rename to interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala
index d202b49c..1b0e0568 100644
--- a/interop-tests/src/main/scala/akka/grpc/interop/IoGrpcServer.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
+package org.apache.pekko.grpc.interop
import io.grpc.testing.integration2.TestServiceServer
diff --git a/interop-tests/src/main/scala/akka/grpc/interop/AkkaGrpcClientScala.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala
similarity index 77%
rename from interop-tests/src/main/scala/akka/grpc/interop/AkkaGrpcClientScala.scala
rename to interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala
index 716262fe..f577c7e1 100644
--- a/interop-tests/src/main/scala/akka/grpc/interop/AkkaGrpcClientScala.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala
@@ -2,17 +2,17 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
+package org.apache.pekko.grpc.interop
import scala.concurrent.duration._
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
import io.grpc.internal.testing.TestUtils
import io.grpc.testing.integration2.{ ClientTester, Settings, TestServiceClient }
import scala.concurrent.Await
// TODO #151 use our own Settings object
-final case class AkkaGrpcClientScala(clientTesterFactory: Settings => ActorSystem => ClientTester) extends GrpcClient {
+final case class PekkoGrpcClientScala(clientTesterFactory: Settings => ActorSystem => ClientTester) extends GrpcClient {
override def run(args: Array[String]): Unit = {
TestUtils.installConscryptIfAvailable()
val settings = Settings.parseArgs(args)
diff --git a/interop-tests/src/main/scala/akka/grpc/interop/AkkaGrpcServerScala.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala
similarity index 82%
rename from interop-tests/src/main/scala/akka/grpc/interop/AkkaGrpcServerScala.scala
rename to interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala
index 7bcca270..b7c04b65 100644
--- a/interop-tests/src/main/scala/akka/grpc/interop/AkkaGrpcServerScala.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
+package org.apache.pekko.grpc.interop
import java.io.FileInputStream
import java.nio.file.{ Files, Paths }
@@ -11,20 +11,20 @@ import java.security.spec.PKCS8EncodedKeySpec
import java.security.{ KeyFactory, KeyStore, SecureRandom }
import scala.concurrent.duration._
-import akka.actor.ActorSystem
-import akka.util.ByteString
-import akka.http.scaladsl.Http.ServerBinding
-import akka.http.scaladsl.model.{ HttpRequest, HttpResponse }
-import akka.http.scaladsl.{ ConnectionContext, Http }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.http.scaladsl.Http.ServerBinding
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, HttpResponse }
+import org.apache.pekko.http.scaladsl.{ ConnectionContext, Http }
import io.grpc.internal.testing.TestUtils
import javax.net.ssl.{ KeyManagerFactory, SSLContext }
import scala.concurrent.{ Await, Future }
/**
- * Glue code to start a gRPC server based on the akka-grpc Scala API to test against
+ * Glue code to start a gRPC server based on the pekko-grpc Scala API to test against
*/
-case class AkkaGrpcServerScala(serverHandlerFactory: ActorSystem => HttpRequest => Future[HttpResponse])
+case class PekkoGrpcServerScala(serverHandlerFactory: ActorSystem => HttpRequest => Future[HttpResponse])
extends GrpcServer[(ActorSystem, ServerBinding)] {
override def start(args: Array[String]) = {
implicit val sys = ActorSystem()
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java
index b286a375..1fb6c42b 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java
@@ -10,15 +10,15 @@ import java.util.concurrent.CompletionStage;
//#unary
//#streaming
-import akka.NotUsed;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.javadsl.Source;
//#streaming
//#unary
//#streaming
import io.grpc.Status;
-import akka.grpc.GrpcServiceException;
+import org.apache.pekko.grpc.GrpcServiceException;
//#unary
//#streaming
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java
index 97833f15..1128bd1f 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java
@@ -4,8 +4,8 @@
package example.myapp.helloworld.grpc;
-import akka.NotUsed;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.javadsl.Source;
import com.google.protobuf.any.Any;
import com.google.rpc.Code;
import com.google.rpc.error_details.LocalizedMessage;
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
index b2784553..1441eec1 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
@@ -4,12 +4,12 @@
package example.myapp.helloworld.grpc;
-import akka.actor.ActorSystem;
-import akka.grpc.GrpcClientSettings;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.grpc.GrpcClientSettings;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import io.grpc.Status;
@@ -34,7 +34,7 @@ public class RichErrorModelTest extends JUnitSuite {
GreeterService impl = new RichErrorImpl();
- akka.japi.function.Function<HttpRequest, CompletionStage<HttpResponse>> service = GreeterServiceHandlerFactory.create(impl, sys);
+ org.apache.pekko.japi.function.Function<HttpRequest, CompletionStage<HttpResponse>> service = GreeterServiceHandlerFactory.create(impl, sys);
return Http
.get(sys)
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java
index 86bb4283..598f9b90 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java
@@ -4,9 +4,9 @@
package example.myapp.helloworld.grpc;
-import akka.NotUsed;
-import akka.grpc.GrpcServiceException;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.grpc.GrpcServiceException;
+import org.apache.pekko.stream.javadsl.Source;
import com.google.rpc.Code;
import com.google.rpc.error_details.LocalizedMessage;
import scala.collection.JavaConverters;
diff --git a/interop-tests/src/test/java/akka/grpc/interop/JavaTestServiceImpl.java b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java
similarity index 92%
rename from interop-tests/src/test/java/akka/grpc/interop/JavaTestServiceImpl.java
rename to interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java
index de154d52..399a4ed8 100644
--- a/interop-tests/src/test/java/akka/grpc/interop/JavaTestServiceImpl.java
+++ b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java
@@ -2,16 +2,16 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop;
+package org.apache.pekko.grpc.interop;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.CompletableFuture;
-import akka.NotUsed;
-import akka.grpc.GrpcServiceException;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.grpc.GrpcServiceException;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
import com.google.protobuf.ByteString;
// Generated by our plugin
@@ -26,7 +26,7 @@ import io.grpc.testing.integration.TestService;
* Essentially porting the client code from [[io.grpc.testing.integration.TestServiceImpl]] against our API's
*
* The same implementation is also be found as part of the 'scripted' tests at
- * /sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/main/java/akka/grpc/JavaTestServiceImpl.scala
+ * /sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/main/java/org/apache/pekko/grpc/JavaTestServiceImpl.scala
*/
public class JavaTestServiceImpl implements TestService {
private final Materializer mat;
diff --git a/interop-tests/src/test/java/akka/grpc/interop/AkkaGrpcJavaClientTester.java b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java
similarity index 94%
rename from interop-tests/src/test/java/akka/grpc/interop/AkkaGrpcJavaClientTester.java
rename to interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java
index e2ea6c49..6974648c 100644
--- a/interop-tests/src/test/java/akka/grpc/interop/AkkaGrpcJavaClientTester.java
+++ b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java
@@ -2,20 +2,20 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop;
-
-import akka.actor.ActorSystem;
-import akka.grpc.GrpcClientSettings;
-import akka.grpc.GrpcResponseMetadata;
-import akka.grpc.GrpcSingleResponse;
-import akka.grpc.SSLContextUtils;
-import akka.grpc.javadsl.Metadata;
-import akka.japi.Pair;
-import akka.stream.Materializer;
-import akka.stream.SystemMaterializer;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+package org.apache.pekko.grpc.interop;
+
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.grpc.GrpcClientSettings;
+import org.apache.pekko.grpc.GrpcResponseMetadata;
+import org.apache.pekko.grpc.GrpcSingleResponse;
+import org.apache.pekko.grpc.SSLContextUtils;
+import org.apache.pekko.grpc.javadsl.Metadata;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
import com.google.protobuf.ByteString;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
@@ -39,11 +39,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
/**
- * ClientTester implementation that uses the generated akka-grpc Java client to exercise a server under test.
+ * ClientTester implementation that uses the generated pekko-grpc Java client to exercise a server under test.
*
* Essentially porting the client code from [[io.grpc.testing.integration.AbstractInteropTest]] against our Scala API's
*/
-public class AkkaGrpcJavaClientTester implements ClientTester {
+public class PekkoGrpcJavaClientTester implements ClientTester {
private final Settings settings;
private final Materializer mat;
private final ExecutionContext ec;
@@ -54,7 +54,7 @@ public class AkkaGrpcJavaClientTester implements ClientTester {
private static int AWAIT_TIME_SECONDS = 3;
- public AkkaGrpcJavaClientTester(Settings settings, ActorSystem sys) {
+ public PekkoGrpcJavaClientTester(Settings settings, ActorSystem sys) {
this.settings = settings;
this.mat = SystemMaterializer.get(sys).materializer();
this.as = sys;
@@ -276,7 +276,7 @@ public class AkkaGrpcJavaClientTester implements ClientTester {
@Override
public void customMetadata() throws Exception {
// unary call
- akka.util.ByteString binaryValue = akka.util.ByteString.fromInts(0xababab);
+ org.apache.pekko.util.ByteString binaryValue = org.apache.pekko.util.ByteString.fromInts(0xababab);
CompletionStage<GrpcSingleResponse<Messages.SimpleResponse>> unaryResponseCs = client.unaryCall()
.addHeader("x-grpc-test-echo-initial", "test_initial_metadata_value")
.addHeader("x-grpc-test-echo-trailing-bin", binaryValue)
@@ -300,7 +300,7 @@ public class AkkaGrpcJavaClientTester implements ClientTester {
Source<Messages.StreamingOutputCallResponse, CompletionStage<GrpcResponseMetadata>> fullDuplexSource =
client.fullDuplexCall()
.addHeader("x-grpc-test-echo-initial", "test_initial_metadata_value")
- .addHeader("x-grpc-test-echo-trailing-bin", akka.util.ByteString.fromInts(0xababab))
+ .addHeader("x-grpc-test-echo-trailing-bin", org.apache.pekko.util.ByteString.fromInts(0xababab))
.invokeWithMetadata(Source.single(Messages.StreamingOutputCallRequest.newBuilder()
.addResponseParameters(Messages.ResponseParameters.newBuilder().setSize(314159).build())
.setPayload(Messages.Payload.newBuilder()
diff --git a/interop-tests/src/test/resources/application.conf b/interop-tests/src/test/resources/application.conf
index 1cf8e7fd..cb4b7603 100644
--- a/interop-tests/src/test/resources/application.conf
+++ b/interop-tests/src/test/resources/application.conf
@@ -1,4 +1,4 @@
-akka.http {
+pekko.http {
client.http2 {
log-frames = true
}
diff --git a/interop-tests/src/test/scala/akka/grpc/interop/GrpcInteropSpec.scala b/interop-tests/src/test/scala/akka/grpc/interop/GrpcInteropSpec.scala
deleted file mode 100644
index 5425c34b..00000000
--- a/interop-tests/src/test/scala/akka/grpc/interop/GrpcInteropSpec.scala
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
- */
-
-package akka.grpc.interop
-
-import io.grpc.testing.integration.TestServiceHandlerFactory
-
-class GrpcInteropIoWithIoSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.IoGrpc)
-class GrpcInteropIoWithAkkaNettyScalaSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.AkkaNetty.Scala)
-class GrpcInteropIoWithAkkaNettyJavaSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.AkkaNetty.Java)
-class GrpcInteropIoWithAkkaHttpScalaSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.AkkaHttp.Scala)
-//class GrpcInteropIoWithAkkaHttpJavaSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.AkkaHttp.Java)
-
-class GrpcInteropAkkaScalaWithIoSpec extends GrpcInteropTests(Servers.Akka.Scala, Clients.IoGrpc)
-class GrpcInteropAkkaScalaWithAkkaNettyScalaSpec extends GrpcInteropTests(Servers.Akka.Scala, Clients.AkkaNetty.Scala)
-class GrpcInteropAkkaScalaWithAkkaNettyJavaSpec extends GrpcInteropTests(Servers.Akka.Scala, Clients.AkkaNetty.Java)
-class GrpcInteropAkkaScalaWithAkkaHttpScalaSpec extends GrpcInteropTests(Servers.Akka.Scala, Clients.AkkaHttp.Scala)
-//class GrpcInteropAkkaScalaWithAkkaHttpJavaSpec extends GrpcInteropTests(Servers.Akka.Scala, Clients.AkkaHttp.Java)
-
-class GrpcInteropAkkaJavaWithIoSpec extends GrpcInteropTests(Servers.Akka.Java, Clients.IoGrpc)
-class GrpcInteropAkkaJavaWithAkkaNettyScalaSpec extends GrpcInteropTests(Servers.Akka.Java, Clients.AkkaNetty.Scala)
-class GrpcInteropAkkaJavaWithAkkaNettyJavaSpec extends GrpcInteropTests(Servers.Akka.Java, Clients.AkkaNetty.Java)
-class GrpcInteropAkkaJavaWithAkkaHttpScalaSpec extends GrpcInteropTests(Servers.Akka.Java, Clients.AkkaHttp.Scala)
-//class GrpcInteropAkkaJavaWithAkkaHttpJavaSpec extends GrpcInteropTests(Servers.Akka.Java, Clients.AkkaHttp.Java)
-
-//--- Aliases
-
-object Servers {
- val IoGrpc = IoGrpcJavaServerProvider
- object Akka {
- val Java = AkkaHttpServerProviderJava
- val Scala = AkkaHttpServerProviderScala
- }
-}
-
-object Clients {
- val IoGrpc = IoGrpcJavaClientProvider
- object AkkaNetty {
- val Java = AkkaNettyClientProviderJava
- val Scala = new AkkaClientProviderScala("netty")
- }
- object AkkaHttp {
- // FIXME: let's have Scala stable and we'll do Java later.
- // val Java = AkkaHttpClientProviderJava
- val Scala = new AkkaClientProviderScala("akka-http")
- }
-}
-
-//--- Some more providers
-
-object AkkaHttpServerProviderJava extends AkkaHttpServerProvider {
- val label: String = "akka-grpc java server"
-
- val pendingCases =
- Set("custom_metadata")
-
- val server = new AkkaGrpcServerJava((mat, sys) => {
- TestServiceHandlerFactory.create(new JavaTestServiceImpl(mat), sys)
- })
-}
-
-class AkkaClientProviderScala(backend: String) extends AkkaClientProvider {
- val label: String = s"akka-grpc scala client tester $backend"
-
- def client = AkkaGrpcClientScala(settings => implicit sys => new AkkaGrpcScalaClientTester(settings, backend))
-}
-
-object AkkaNettyClientProviderJava extends AkkaClientProvider {
- val label: String = "akka-grpc java client tester"
-
- def client = new AkkaGrpcClientJava((settings, sys) => new AkkaGrpcJavaClientTester(settings, sys))
-}
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala
new file mode 100644
index 00000000..42f7770b
--- /dev/null
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+package org.apache.pekko.grpc.interop
+
+import io.grpc.testing.integration.TestServiceHandlerFactory
+
+class GrpcInteropIoWithIoSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.IoGrpc)
+class GrpcInteropIoWithPekkoNettyScalaSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.PekkoNetty.Scala)
+class GrpcInteropIoWithPekkoNettyJavaSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.PekkoNetty.Java)
+class GrpcInteropIoWithPekkkoHttpScalaSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.PekkoHttp.Scala)
+//class GrpcInteropIoWithpekkoHttpJavaSpec extends GrpcInteropTests(Servers.IoGrpc, Clients.PekkoHttp.Java)
+
+class GrpcInteropPekkoScalaWithIoSpec extends GrpcInteropTests(Servers.Pekko.Scala, Clients.IoGrpc)
+class GrpcInteropPekkoScalaWithPekkoNettyScalaSpec
+ extends GrpcInteropTests(Servers.Pekko.Scala, Clients.PekkoNetty.Scala)
+class GrpcInteropPekkoScalaWithPekkoNettyJavaSpec extends GrpcInteropTests(Servers.Pekko.Scala, Clients.PekkoNetty.Java)
+class GrpcInteropPekkoScalaWithPekkoHttpScalaSpec extends GrpcInteropTests(Servers.Pekko.Scala, Clients.PekkoHttp.Scala)
+//class GrpcInteropPekkoScalaWithPekkoHttpJavaSpec extends GrpcInteropTests(Servers.Pekko.Scala, Clients.PekkoHttp.Java)
+
+class GrpcInteropPekkoJavaWithIoSpec extends GrpcInteropTests(Servers.Pekko.Java, Clients.IoGrpc)
+class GrpcInteropPekkoJavaWithPekkoNettyScalaSpec extends GrpcInteropTests(Servers.Pekko.Java, Clients.PekkoNetty.Scala)
+class GrpcInteropPekkoJavaWithPekkoNettyJavaSpec extends GrpcInteropTests(Servers.Pekko.Java, Clients.PekkoNetty.Java)
+class GrpcInteropPekkoJavaWithPekkoHttpScalaSpec extends GrpcInteropTests(Servers.Pekko.Java, Clients.PekkoHttp.Scala)
+//class GrpcInteropPekkoJavaWithPekkoHttpJavaSpec extends GrpcInteropTests(Servers.Pekko.Java, Clients.PekkoHttp.Java)
+
+//--- Aliases
+
+object Servers {
+ val IoGrpc = IoGrpcJavaServerProvider
+ object Pekko {
+ val Java = PekkoHttpServerProviderJava$
+ val Scala = PekkoHttpServerProviderScala
+ }
+}
+
+object Clients {
+ val IoGrpc = IoGrpcJavaClientProvider
+ object PekkoNetty {
+ val Java = PekkoNettyClientProviderJava$
+ val Scala = new PekkoClientProviderScala("netty")
+ }
+ object PekkoHttp {
+ // FIXME: let's have Scala stable and we'll do Java later.
+ // val Java = PekkoHttpClientProviderJava
+ val Scala = new PekkoClientProviderScala("pekko-http")
+ }
+}
+
+//--- Some more providers
+
+object PekkoHttpServerProviderJava$ extends PekkoHttpServerProvider {
+ val label: String = "pekko-grpc java server"
+
+ val pendingCases =
+ Set("custom_metadata")
+
+ val server = new PekkoGrpcServerJava((mat, sys) => {
+ TestServiceHandlerFactory.create(new JavaTestServiceImpl(mat), sys)
+ })
+}
+
+class PekkoClientProviderScala(backend: String) extends PekkoClientProvider {
+ val label: String = s"pekko-grpc scala client tester $backend"
+
+ def client = PekkoGrpcClientScala(settings => implicit sys => new PekkoGrpcScalaClientTester(settings, backend))
+}
+
+object PekkoNettyClientProviderJava$ extends PekkoClientProvider {
+ val label: String = "pekko-grpc java client tester"
+
+ def client = new PekkoGrpcClientJava((settings, sys) => new PekkoGrpcJavaClientTester(settings, sys))
+}
diff --git a/interop-tests/src/test/scala/akka/grpc/interop/AkkaGrpcScalaClientTester.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala
similarity index 94%
rename from interop-tests/src/test/scala/akka/grpc/interop/AkkaGrpcScalaClientTester.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala
index a0eea44a..c7b66e3c 100644
--- a/interop-tests/src/test/scala/akka/grpc/interop/AkkaGrpcScalaClientTester.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala
@@ -2,14 +2,14 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
+package org.apache.pekko.grpc.interop
import java.io.InputStream
-import akka.actor.ActorSystem
-import akka.grpc.{ GrpcClientSettings, GrpcResponseMetadata, SSLContextUtils }
-import akka.stream.SystemMaterializer
-import akka.stream.scaladsl.{ Keep, Sink, Source }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.{ GrpcClientSettings, GrpcResponseMetadata, SSLContextUtils }
+import org.apache.pekko.stream.SystemMaterializer
+import org.apache.pekko.stream.scaladsl.{ Keep, Sink, Source }
import com.google.protobuf.ByteString
import io.grpc.testing.integration.empty.Empty
import io.grpc.testing.integration.messages._
@@ -24,14 +24,14 @@ import scala.concurrent.{ Await, Future }
import scala.util.control.NoStackTrace
/**
- * ClientTester implementation that uses the generated akka-grpc Scala client to exercise a server under test.
+ * ClientTester implementation that uses the generated pekko-grpc Scala client to exercise a server under test.
*
* Essentially porting the client code from [[io.grpc.testing.integration.AbstractInteropTest]] against our Java API's
*
* The same implementation is also be found as part of the 'scripted' tests at
- * /sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/akka/grpc/AkkaGrpcClientTester.scala
+ * /sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/PekkoGrpcClientTester.scala
*/
-class AkkaGrpcScalaClientTester(val settings: Settings, backend: String)(implicit system: ActorSystem)
+class PekkoGrpcScalaClientTester(val settings: Settings, backend: String)(implicit system: ActorSystem)
extends ClientTester {
private var client: TestServiceClient = null
private var clientUnimplementedService: UnimplementedServiceClient = null
@@ -185,7 +185,7 @@ class AkkaGrpcScalaClientTester(val settings: Settings, backend: String)(implici
def customMetadata(): Unit = {
// unary call
- val binaryHeaderValue = akka.util.ByteString.fromInts(0xABABAB)
+ val binaryHeaderValue = org.apache.pekko.util.ByteString.fromInts(0xABABAB)
val unaryResponseFuture = client
.unaryCall()
.addHeader("x-grpc-test-echo-initial", "test_initial_metadata_value")
@@ -207,7 +207,7 @@ class AkkaGrpcScalaClientTester(val settings: Settings, backend: String)(implici
.fullDuplexCall()
.addHeader("x-grpc-test-echo-initial", "test_initial_metadata_value")
// this one is returned as trailer
- .addHeader("x-grpc-test-echo-trailing-bin", akka.util.ByteString.fromInts(0xABABAB))
+ .addHeader("x-grpc-test-echo-trailing-bin", org.apache.pekko.util.ByteString.fromInts(0xABABAB))
.invokeWithMetadata(
Source.single(
StreamingOutputCallRequest(
diff --git a/interop-tests/src/test/scala/akka/grpc/interop/AkkaHttpServerProviderScala.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
similarity index 84%
rename from interop-tests/src/test/scala/akka/grpc/interop/AkkaHttpServerProviderScala.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
index 5c185ecd..daf5feb8 100644
--- a/interop-tests/src/test/scala/akka/grpc/interop/AkkaHttpServerProviderScala.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
-
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.grpc.internal.{ GrpcEntityHelpers, GrpcProtocolNative, GrpcResponseHelpers, Identity }
-import akka.http.scaladsl.model.headers.RawHeader
-import akka.http.scaladsl.model.{ AttributeKeys, HttpEntity, HttpHeader, Trailer }
-import akka.http.scaladsl.server.{ Directive0, Directives, Route }
-import akka.stream.Materializer
-import akka.stream.scaladsl.Source
+package org.apache.pekko.grpc.interop
+
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.internal.{ GrpcEntityHelpers, GrpcProtocolNative, GrpcResponseHelpers, Identity }
+import org.apache.pekko.http.scaladsl.model.headers.RawHeader
+import org.apache.pekko.http.scaladsl.model.{ AttributeKeys, HttpEntity, HttpHeader, Trailer }
+import org.apache.pekko.http.scaladsl.server.{ Directive0, Directives, Route }
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.Source
import io.grpc.Status
import io.grpc.testing.integration.messages.{ SimpleRequest, StreamingOutputCallRequest }
import io.grpc.testing.integration.test.{ TestService, TestServiceHandler, TestServiceMarshallers }
@@ -19,12 +19,12 @@ import io.grpc.testing.integration.test.{ TestService, TestServiceHandler, TestS
import scala.collection.immutable
import scala.concurrent.Promise
-object AkkaHttpServerProviderScala extends AkkaHttpServerProvider with Directives {
- val label: String = "akka-grpc server scala"
+object PekkoHttpServerProviderScala extends PekkoHttpServerProvider with Directives {
+ val label: String = "pekko-grpc server scala"
val pendingCases =
Set()
- val server = AkkaGrpcServerScala(implicit sys => {
+ val server = PekkoGrpcServerScala(implicit sys => {
val testServiceImpl = new TestServiceImpl()
val testServiceHandler = TestServiceHandler(testServiceImpl)
diff --git a/interop-tests/src/test/scala/akka/grpc/interop/TestServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala
similarity index 89%
rename from interop-tests/src/test/scala/akka/grpc/interop/TestServiceImpl.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala
index fe5c3d17..b1de13fa 100644
--- a/interop-tests/src/test/scala/akka/grpc/interop/TestServiceImpl.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop
+package org.apache.pekko.grpc.interop
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.grpc.GrpcServiceException
-import akka.stream.{ Materializer, SystemMaterializer }
-import akka.stream.scaladsl.{ Flow, Source }
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.GrpcServiceException
+import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko.stream.scaladsl.{ Flow, Source }
import com.google.protobuf.ByteString
@@ -34,7 +34,7 @@ object TestServiceImpl {
* Essentially porting the client code from [[io.grpc.testing.integration.TestServiceImpl]] against our API's
*
* The same implementation is also be found as part of the 'scripted' tests at
- * /sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/main/scala/akka/grpc/TestServiceImpl.scala
+ * /sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/main/scala/org/apache/pekko/grpc/TestServiceImpl.scala
*/
class TestServiceImpl(implicit sys: ActorSystem) extends TestService {
import TestServiceImpl._
diff --git a/interop-tests/src/test/scala/akka/grpc/interop/app/AkkaHttpServerAppScala.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
similarity index 52%
rename from interop-tests/src/test/scala/akka/grpc/interop/app/AkkaHttpServerAppScala.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
index 5629e903..01d99ad1 100644
--- a/interop-tests/src/test/scala/akka/grpc/interop/app/AkkaHttpServerAppScala.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
@@ -2,9 +2,9 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.interop.app
+package org.apache.pekko.grpc.interop.app
-import akka.grpc.interop.AkkaHttpServerProviderScala
+import org.apache.pekko.grpc.interop.PekkoHttpServerProviderScala
/**
* Scala application that starts a web server at localhost serving the test
@@ -12,9 +12,9 @@ import akka.grpc.interop.AkkaHttpServerProviderScala
*
* This can be useful for 'manually' interacting with this server.
*
- * You can start this app from sbt with 'akka-grpc-interop-tests/test:reStart'
+ * You can start this app from sbt with 'pekko-grpc-interop-tests/test:reStart'
*/
-object AkkaHttpServerAppScala extends App {
- val (sys, binding) = AkkaHttpServerProviderScala.server.start(Array())
+object PekkoHttpServerAppScala extends App {
+ val (sys, binding) = PekkoHttpServerProviderScala.server.start(Array())
sys.log.info(s"Bound to ${binding.localAddress}")
}
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/CountingGreeterServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala
similarity index 51%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/CountingGreeterServiceImpl.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala
index 266b3ae6..cd76f847 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/CountingGreeterServiceImpl.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala
@@ -2,14 +2,14 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.Future
-import akka.NotUsed
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.Source
import example.myapp.helloworld.grpc.helloworld._
@@ -24,9 +24,11 @@ class CountingGreeterServiceImpl extends GreeterService {
def itKeepsReplying(in: HelloRequest): Source[HelloReply, NotUsed] =
Source(List(HelloReply("First"), HelloReply("Second"))).mapMaterializedValue { m => println("XXX MAT YYY"); m }
def itKeepsTalking(
- in: akka.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloRequest, akka.NotUsed])
- : scala.concurrent.Future[example.myapp.helloworld.grpc.helloworld.HelloReply] = ???
- def streamHellos(in: akka.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloRequest, akka.NotUsed])
- : akka.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloReply, akka.NotUsed] = ???
+ in: org.apache.pekko.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloRequest,
+ org.apache.pekko.NotUsed]): scala.concurrent.Future[example.myapp.helloworld.grpc.helloworld.HelloReply] = ???
+ def streamHellos(
+ in: org.apache.pekko.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloRequest,
+ org.apache.pekko.NotUsed]): org.apache.pekko.stream.scaladsl.Source[
+ example.myapp.helloworld.grpc.helloworld.HelloReply, org.apache.pekko.NotUsed] = ???
}
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcChannelSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala
similarity index 87%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcChannelSpec.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala
index 17f63cf0..991d0583 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcChannelSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala
@@ -2,18 +2,18 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import scala.concurrent.Await
import scala.concurrent.duration._
-import akka.actor.ActorSystem
-import akka.grpc.scaladsl.tools.MutableServiceDiscovery
-import akka.grpc.{ GrpcChannel, GrpcClientCloseException, GrpcClientSettings }
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.RemoteAddress
-import akka.http.scaladsl.server.Directives
-import akka.stream.SystemMaterializer
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.scaladsl.tools.MutableServiceDiscovery
+import org.apache.pekko.grpc.{ GrpcChannel, GrpcClientCloseException, GrpcClientSettings }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.RemoteAddress
+import org.apache.pekko.http.scaladsl.server.Directives
+import org.apache.pekko.stream.SystemMaterializer
import com.typesafe.config.{ Config, ConfigFactory }
import example.myapp.helloworld.grpc.helloworld._
import org.scalatest.BeforeAndAfterAll
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
similarity index 81%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
index 2e5c341a..bfc8fdc0 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
-
-import akka.actor.ActorSystem
-import akka.grpc.internal.{ GrpcProtocolNative, GrpcRequestHelpers, Identity }
-import akka.grpc.scaladsl.headers.`Status`
-import akka.http.scaladsl.model.{ AttributeKeys, HttpEntity, HttpRequest, HttpResponse }
-import akka.http.scaladsl.model.HttpEntity.{ Chunked, LastChunk, Strict }
-import akka.stream.scaladsl.{ Sink, Source }
-import akka.testkit.TestKit
-import akka.util.ByteString
+package org.apache.pekko.grpc.scaladsl
+
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.internal.{ GrpcProtocolNative, GrpcRequestHelpers, Identity }
+import org.apache.pekko.grpc.scaladsl.headers.`Status`
+import org.apache.pekko.http.scaladsl.model.{ AttributeKeys, HttpEntity, HttpRequest, HttpResponse }
+import org.apache.pekko.http.scaladsl.model.HttpEntity.{ Chunked, LastChunk, Strict }
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.testkit.TestKit
+import org.apache.pekko.util.ByteString
import io.grpc.testing.integration.test.TestService
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.matchers.should.Matchers
@@ -55,14 +55,14 @@ class GrpcExceptionHandlerSpec
object ExampleImpl extends GreeterService {
// #streaming
- import akka.NotUsed
- import akka.stream.scaladsl.Source
+ import org.apache.pekko.NotUsed
+ import org.apache.pekko.stream.scaladsl.Source
// #streaming
// #unary
// #streaming
- import akka.grpc.GrpcServiceException
+ import org.apache.pekko.grpc.GrpcServiceException
import io.grpc.Status
val exceptionMetadata = new MetadataBuilder()
@@ -98,11 +98,13 @@ class GrpcExceptionHandlerSpec
// #streaming
def itKeepsTalking(
- in: akka.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloRequest, akka.NotUsed])
- : scala.concurrent.Future[example.myapp.helloworld.grpc.helloworld.HelloReply] = ???
+ in: org.apache.pekko.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloRequest,
+ org.apache.pekko.NotUsed]): scala.concurrent.Future[example.myapp.helloworld.grpc.helloworld.HelloReply] =
+ ???
def streamHellos(
- in: akka.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloRequest, akka.NotUsed])
- : akka.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloReply, akka.NotUsed] = ???
+ in: org.apache.pekko.stream.scaladsl.Source[example.myapp.helloworld.grpc.helloworld.HelloRequest,
+ org.apache.pekko.NotUsed]): org.apache.pekko.stream.scaladsl.Source[
+ example.myapp.helloworld.grpc.helloworld.HelloReply, org.apache.pekko.NotUsed] = ???
}
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcMarshallingSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala
similarity index 88%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcMarshallingSpec.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala
index 42569f1e..144e900f 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/GrpcMarshallingSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala
@@ -2,17 +2,17 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
-
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.grpc.internal.{ AbstractGrpcProtocol, GrpcProtocolNative, Gzip }
-import akka.grpc.scaladsl.headers.`Message-Encoding`
-import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart
-import akka.http.scaladsl.model.{ HttpEntity, HttpRequest }
-import akka.stream.scaladsl.Sink
-import akka.stream.testkit.TestPublisher
-import akka.stream.testkit.scaladsl.TestSource
+package org.apache.pekko.grpc.scaladsl
+
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.internal.{ AbstractGrpcProtocol, GrpcProtocolNative, Gzip }
+import org.apache.pekko.grpc.scaladsl.headers.`Message-Encoding`
+import org.apache.pekko.http.scaladsl.model.HttpEntity.ChunkStreamPart
+import org.apache.pekko.http.scaladsl.model.{ HttpEntity, HttpRequest }
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.testkit.TestPublisher
+import org.apache.pekko.stream.testkit.scaladsl.TestSource
import io.grpc.{ Status, StatusException }
import io.grpc.testing.integration.messages.{ BoolValue, SimpleRequest }
import io.grpc.testing.integration.test.TestService
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/LoadBalancingIntegrationSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
similarity index 92%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
index e31fe47d..ba53db7b 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import java.net.InetSocketAddress
-import akka.actor.ActorSystem
-import akka.grpc.GrpcClientSettings
-import akka.grpc.internal.ClientConnectionException
-import akka.grpc.scaladsl.tools.MutableServiceDiscovery
-import akka.http.scaladsl.Http
-import akka.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.GrpcClientSettings
+import org.apache.pekko.grpc.internal.ClientConnectionException
+import org.apache.pekko.grpc.scaladsl.tools.MutableServiceDiscovery
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
import com.typesafe.config.{ Config, ConfigFactory }
import example.myapp.helloworld.grpc.helloworld._
import io.grpc.Status.Code
@@ -28,12 +28,12 @@ import scala.concurrent.duration._
class LoadBalancingIntegrationSpecNetty extends LoadBalancingIntegrationSpec()
-// TODO FIXME enable this test when we can use a pool interface in AkkaHttpClientUtils
+// TODO FIXME enable this test when we can use a pool interface in PekkoHttpClientUtils
// https://github.com/akka/akka-grpc/issues/1196
// https://github.com/akka/akka-grpc/issues/1197
-//class LoadBalancingIntegrationSpecAkkaHttp
+//class LoadBalancingIntegrationSpecPekkoHttp
// extends LoadBalancingIntegrationSpec(
-// ConfigFactory.parseString("""akka.grpc.client."*".backend = "akka-http" """).withFallback(ConfigFactory.load()))
+// ConfigFactory.parseString("""pekko.grpc.client."*".backend = "pekko-http" """).withFallback(ConfigFactory.load()))
class LoadBalancingIntegrationSpec(config: Config = ConfigFactory.load())
extends AnyWordSpec
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/NonBalancingIntegrationSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala
similarity index 91%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/NonBalancingIntegrationSpec.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala
index 9c024e3a..d2aa5588 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/NonBalancingIntegrationSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala
@@ -2,15 +2,15 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import java.net.InetSocketAddress
-import akka.actor.ActorSystem
-import akka.grpc.GrpcClientSettings
-import akka.grpc.internal.ClientConnectionException
-import akka.grpc.scaladsl.tools.MutableServiceDiscovery
-import akka.http.scaladsl.Http
-import akka.stream.SystemMaterializer
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.GrpcClientSettings
+import org.apache.pekko.grpc.internal.ClientConnectionException
+import org.apache.pekko.grpc.scaladsl.tools.MutableServiceDiscovery
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.stream.SystemMaterializer
import com.typesafe.config.ConfigFactory
import example.myapp.helloworld.grpc.helloworld._
import io.grpc.Status.Code
@@ -26,7 +26,7 @@ import scala.concurrent.{ Await, Future }
import scala.concurrent.duration._
class NonBalancingIntegrationSpecNetty extends NonBalancingIntegrationSpec("netty")
-class NonBalancingIntegrationSpecAkkaHttp extends NonBalancingIntegrationSpec("akka-http")
+class NonBalancingIntegrationSpecPekkoHttp extends NonBalancingIntegrationSpec("pekko-http")
class NonBalancingIntegrationSpec(backend: String)
extends AnyWordSpec
@@ -35,7 +35,7 @@ class NonBalancingIntegrationSpec(backend: String)
with ScalaFutures {
implicit val system = ActorSystem(
s"NonBalancingIntegrationSpec-$backend",
- ConfigFactory.parseString(s"""akka.grpc.client."*".backend = "$backend" """).withFallback(ConfigFactory.load()))
+ ConfigFactory.parseString(s"""pekko.grpc.client."*".backend = "$backend" """).withFallback(ConfigFactory.load()))
implicit val mat = SystemMaterializer(system).materializer
implicit val ec = system.dispatcher
@@ -159,8 +159,8 @@ class NonBalancingIntegrationSpec(backend: String)
"eventually fail when no valid endpoints are provided" in {
// https://github.com/akka/akka-grpc/issues/1246
- if (backend == "akka-http")
- cancel("The Akka HTTP backend doesn't fail when the persistent connection fails")
+ if (backend == "pekko-http")
+ cancel("The Pekko HTTP backend doesn't fail when the persistent connection fails")
val discovery =
new MutableServiceDiscovery(
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/PowerApiSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala
similarity index 85%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/PowerApiSpec.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala
index f52f6a42..9fcf32d8 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/PowerApiSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala
@@ -2,28 +2,28 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import scala.concurrent.Future
import scala.concurrent.Promise
import scala.concurrent.duration._
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.grpc.GrpcClientSettings
-import akka.grpc.GrpcProtocol.TrailerFrame
-import akka.grpc.GrpcResponseMetadata
-import akka.grpc.internal.GrpcEntityHelpers
-import akka.grpc.internal.GrpcProtocolNative
-import akka.grpc.internal.GrpcResponseHelpers
-import akka.grpc.internal.HeaderMetadataImpl
-import akka.grpc.internal.Identity
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.headers.RawHeader
-import akka.http.scaladsl.server.Directives
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
-import akka.testkit.TestKit
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.GrpcClientSettings
+import org.apache.pekko.grpc.GrpcProtocol.TrailerFrame
+import org.apache.pekko.grpc.GrpcResponseMetadata
+import org.apache.pekko.grpc.internal.GrpcEntityHelpers
+import org.apache.pekko.grpc.internal.GrpcProtocolNative
+import org.apache.pekko.grpc.internal.GrpcResponseHelpers
+import org.apache.pekko.grpc.internal.HeaderMetadataImpl
+import org.apache.pekko.grpc.internal.Identity
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.headers.RawHeader
+import org.apache.pekko.http.scaladsl.server.Directives
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.testkit.TestKit
import com.typesafe.config.ConfigFactory
import example.myapp.helloworld.grpc.helloworld.GreeterServiceClient
import example.myapp.helloworld.grpc.helloworld.GreeterServicePowerApiHandler
@@ -39,12 +39,12 @@ import org.scalatest.time.Span
import org.scalatest.wordspec.AnyWordSpecLike
class PowerApiSpecNetty extends PowerApiSpec("netty")
-class PowerApiSpecAkkaHttp extends PowerApiSpec("akka-http")
+class PowerApiSpecPekkoHttp extends PowerApiSpec("pekko-http")
abstract class PowerApiSpec(backend: String)
extends TestKit(ActorSystem(
"GrpcExceptionHandlerSpec",
- ConfigFactory.parseString(s"""akka.grpc.client."*".backend = "$backend" """).withFallback(ConfigFactory.load())))
+ ConfigFactory.parseString(s"""pekko.grpc.client."*".backend = "$backend" """).withFallback(ConfigFactory.load())))
with AnyWordSpecLike
with Matchers
with ScalaFutures
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/PowerGreeterServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala
similarity index 91%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/PowerGreeterServiceImpl.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala
index d93225ff..6c17e54f 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/PowerGreeterServiceImpl.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala
@@ -2,14 +2,14 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import scala.concurrent.Future
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
import example.myapp.helloworld.grpc.helloworld._
class PowerGreeterServiceImpl()(implicit system: ActorSystem) extends GreeterServicePowerApi {
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/RichErrorModelSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala
similarity index 96%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/RichErrorModelSpec.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala
index cb3b675e..4592dbb6 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/RichErrorModelSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala
@@ -2,15 +2,15 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
-
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.grpc.{ GrpcClientSettings, GrpcServiceException }
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.{ HttpRequest, HttpResponse }
-import akka.stream.scaladsl.{ Sink, Source }
-import akka.testkit.TestKit
+package org.apache.pekko.grpc.scaladsl
+
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.{ GrpcClientSettings, GrpcServiceException }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, HttpResponse }
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.testkit.TestKit
import com.google.protobuf.any.Any
import com.google.rpc.error_details.LocalizedMessage
import com.google.rpc.{ Code, Status }
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/TelemetrySpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala
similarity index 78%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/TelemetrySpec.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala
index f5c2d947..a3989342 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/TelemetrySpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala
@@ -2,15 +2,21 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import com.typesafe.config.ConfigFactory
-import akka.actor.ActorSystem
-import akka.grpc.internal.{ GrpcProtocolNative, GrpcRequestHelpers, Identity, TelemetryExtension, TelemetrySpi }
-import akka.http.javadsl.model.HttpRequest
-import akka.stream.scaladsl.Source
-import akka.testkit.TestKit
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.internal.{
+ GrpcProtocolNative,
+ GrpcRequestHelpers,
+ Identity,
+ TelemetryExtension,
+ TelemetrySpi
+}
+import org.apache.pekko.http.javadsl.model.HttpRequest
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.testkit.TestKit
import example.myapp.helloworld.grpc.helloworld.{ GreeterService, GreeterServiceHandler, HelloRequest }
@@ -23,7 +29,7 @@ class TelemetrySpec
ActorSystem(
"TelemetrySpec",
ConfigFactory
- .parseString(s"""akka.grpc.telemetry-class = "akka.grpc.scaladsl.CollectingTelemetrySpi" """)
+ .parseString("""pekko.grpc.telemetry-class = "org.apache.pekko.grpc.scaladsl.CollectingTelemetrySpi" """)
.withFallback(ConfigFactory.load())))
with AnyWordSpecLike
with Matchers
diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/tools/MutableServiceDiscovery.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala
similarity index 76%
rename from interop-tests/src/test/scala/akka/grpc/scaladsl/tools/MutableServiceDiscovery.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala
index 5f769581..7ef32396 100644
--- a/interop-tests/src/test/scala/akka/grpc/scaladsl/tools/MutableServiceDiscovery.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala
@@ -2,15 +2,15 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl.tools
+package org.apache.pekko.grpc.scaladsl.tools
import java.net.InetSocketAddress
-import akka.discovery.Lookup
-import akka.discovery.ServiceDiscovery
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.http.scaladsl.Http
+import org.apache.pekko.discovery.Lookup
+import org.apache.pekko.discovery.ServiceDiscovery
+import org.apache.pekko.discovery.ServiceDiscovery.Resolved
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.http.scaladsl.Http
import scala.concurrent.Future
import scala.concurrent.duration.FiniteDuration
diff --git a/maven-plugin/src/main/maven/plugin.xml b/maven-plugin/src/main/maven/plugin.xml
index 50ede1c1..f98f0e26 100644
--- a/maven-plugin/src/main/maven/plugin.xml
+++ b/maven-plugin/src/main/maven/plugin.xml
@@ -1,16 +1,16 @@
<!-- Post-processed by SbtMavenPlugin -->
<plugin xmlns="http://maven.apache.org/PLUGIN/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/PLUGIN/1.0.0 http://maven.apache.org/xsd/plugin-1.0.0.xsd">
- <name>Akka gRPC</name>
+ <name>Apache Pekko gRPC</name>
<description>Generate gRPC client and/or server code</description>
<groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-maven-plugin</artifactId>
- <goalPrefix>akka-grpc</goalPrefix>
+ <artifactId>pekko-grpc-maven-plugin</artifactId>
+ <goalPrefix>pekko-grpc</goalPrefix>
<mojos>
<mojo>
<goal>generate</goal>
- <description>Generate Akka gRPC model and service code</description>
- <implementation>akka.grpc.maven.GenerateMojo</implementation>
+ <description>Generate Apache Pekko gRPC model and service code</description>
+ <implementation>org.apache.pekko.grpc.maven.GenerateMojo</implementation>
<instantiationStrategy>singleton</instantiationStrategy>
<phase>generate-sources</phase>
@@ -87,21 +87,21 @@
</parameters>
<configuration>
<project implementation="" default-value="${project}"/>
- <language implementation="enum" default-value="JAVA">${akka-grpc.language}</language>
- <generateClient implementation="boolean" default-value="true">${akka-grpc.generate-client}</generateClient>
- <generateServer implementation="boolean" default-value="true">${akka-grpc.generate-server}</generateServer>
+ <language implementation="enum" default-value="JAVA">${pekko-grpc.language}</language>
+ <generateClient implementation="boolean" default-value="true">${pekko-grpc.generate-client}</generateClient>
+ <generateServer implementation="boolean" default-value="true">${pekko-grpc.generate-server}</generateServer>
<generatorSettings implementation="java.util.List" default-value=""/>
<extraGenerators implementation="java.util.List" default-value=""/>
- <protoPaths default-value="${project.basedir}/src/main/proto,${project.basedir}/src/main/protobuf">${akka-grpc.protoPaths}</protoPaths>
- <outputDirectory default-value="${project.build.directory}/generated-sources">${akka-grpc.outputDirectory}</outputDirectory>
- <protocVersion implementation="java.lang.String" default-value="-v3.20.1">${akka-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
+ <protoPaths default-value="${project.basedir}/src/main/proto,${project.basedir}/src/main/protobuf">${pekko-grpc.protoPaths}</protoPaths>
+ <outputDirectory default-value="${project.build.directory}/generated-sources">${pekko-grpc.outputDirectory}</outputDirectory>
+ <protocVersion implementation="java.lang.String" default-value="-v3.20.1">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
<mojo>
<goal>test-generate</goal>
- <description>Generate test Akka gRPC model and service code</description>
- <implementation>akka.grpc.maven.TestGenerateMojo</implementation>
+ <description>Generate test Apache Pekko gRPC model and service code</description>
+ <implementation>org.apache.pekko.grpc.maven.TestGenerateMojo</implementation>
<instantiationStrategy>singleton</instantiationStrategy>
<phase>generate-test-sources</phase>
@@ -178,14 +178,14 @@
</parameters>
<configuration>
<project implementation="" default-value="${project}"/>
- <language implementation="enum" default-value="JAVA">${akka-grpc.language}</language>
- <generateClient implementation="boolean" default-value="true">${akka-grpc.generate-client}</generateClient>
- <generateServer implementation="boolean" default-value="true">${akka-grpc.generate-server}</generateServer>
+ <language implementation="enum" default-value="JAVA">${pekko-grpc.language}</language>
+ <generateClient implementation="boolean" default-value="true">${pekko-grpc.generate-client}</generateClient>
+ <generateServer implementation="boolean" default-value="true">${pekko-grpc.generate-server}</generateServer>
<generatorSettings implementation="java.util.List" default-value=""/>
<extraGenerators implementation="java.util.List" default-value=""/>
- <protoPaths default-value="src/test/proto,src/test/protobuf">${akka-grpc.protoPaths}</protoPaths>
- <outputDirectory default-value="target/generated-test-sources">${akka-grpc.outputDirectory}</outputDirectory>
- <protocVersion implementation="java.lang.String" default-value="-v3.20.1">${akka-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
+ <protoPaths default-value="src/test/proto,src/test/protobuf">${pekko-grpc.protoPaths}</protoPaths>
+ <outputDirectory default-value="target/generated-test-sources">${pekko-grpc.outputDirectory}</outputDirectory>
+ <protocVersion implementation="java.lang.String" default-value="-v3.20.1">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
diff --git a/maven-plugin/src/main/scala/akka/grpc/maven/AbstractGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
similarity index 93%
rename from maven-plugin/src/main/scala/akka/grpc/maven/AbstractGenerateMojo.scala
rename to maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
index 0f865da6..806aec8b 100644
--- a/maven-plugin/src/main/scala/akka/grpc/maven/AbstractGenerateMojo.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
@@ -2,12 +2,20 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.maven
+package org.apache.pekko.grpc.maven
import java.io.{ ByteArrayOutputStream, File, PrintStream }
-import akka.grpc.gen.{ CodeGenerator, Logger, ProtocSettings }
-import akka.grpc.gen.javadsl.{ JavaClientCodeGenerator, JavaInterfaceCodeGenerator, JavaServerCodeGenerator }
-import akka.grpc.gen.scaladsl.{ ScalaClientCodeGenerator, ScalaServerCodeGenerator, ScalaTraitCodeGenerator }
+import org.apache.pekko.grpc.gen.{ CodeGenerator, Logger, ProtocSettings }
+import org.apache.pekko.grpc.gen.javadsl.{
+ JavaClientCodeGenerator,
+ JavaInterfaceCodeGenerator,
+ JavaServerCodeGenerator
+}
+import org.apache.pekko.grpc.gen.scaladsl.{
+ ScalaClientCodeGenerator,
+ ScalaServerCodeGenerator,
+ ScalaTraitCodeGenerator
+}
import javax.inject.Inject
import org.apache.maven.plugin.AbstractMojo
@@ -101,11 +109,11 @@ abstract class AbstractGenerateMojo @Inject() (buildContext: BuildContext) exten
@BeanProperty
var generateServer: Boolean = _
- // Add the 'akka.grpc.gen.javadsl.play.PlayJavaClientCodeGenerator' or 'akka.grpc.gen.scaladsl.play.PlayScalaClientCodeGenerator' extra generator instead
+ // Add the 'org.apache.pekko.grpc.gen.javadsl.play.PlayJavaClientCodeGenerator' or 'org.apache.pekko.grpc.gen.scaladsl.play.PlayScalaClientCodeGenerator' extra generator instead
@Deprecated
@BeanProperty
var generatePlayClient: Boolean = _
- // Add the 'akka.grpc.gen.javadsl.play.PlayJavaServerCodeGenerator' or 'akka.grpc.gen.scaladsl.play.PlayScalaServerCodeGenerator' extra generator instead
+ // Add the 'org.apache.pekko.grpc.gen.javadsl.play.PlayJavaServerCodeGenerator' or 'org.apache.pekko.grpc.gen.scaladsl.play.PlayScalaServerCodeGenerator' extra generator instead
@Deprecated
@BeanProperty
var generatePlayServer: Boolean = _
@@ -143,7 +151,7 @@ abstract class AbstractGenerateMojo @Inject() (buildContext: BuildContext) exten
if (protoDir.exists()) {
directoryFound = true
// generated sources should be compiled
- val generatedSourcesDir = s"${outputDirectory}/akka-grpc-${chosenLanguage.targetDirSuffix}"
+ val generatedSourcesDir = s"${outputDirectory}/pekko-grpc${chosenLanguage.targetDirSuffix}"
val compileSourceRoot = {
val generatedSourcesFile = new File(generatedSourcesDir)
if (!generatedSourcesFile.isAbsolute()) {
diff --git a/maven-plugin/src/main/scala/akka/grpc/maven/GenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala
similarity index 91%
rename from maven-plugin/src/main/scala/akka/grpc/maven/GenerateMojo.scala
rename to maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala
index ebe8a1fd..bebbf52e 100644
--- a/maven-plugin/src/main/scala/akka/grpc/maven/GenerateMojo.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.maven
+package org.apache.pekko.grpc.maven
import javax.inject.Inject
import org.sonatype.plexus.build.incremental.BuildContext
diff --git a/maven-plugin/src/main/scala/akka/grpc/maven/ProtocBridgeCodeGenerator.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala
similarity index 61%
rename from maven-plugin/src/main/scala/akka/grpc/maven/ProtocBridgeCodeGenerator.scala
rename to maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala
index 552baecb..f393d1aa 100644
--- a/maven-plugin/src/main/scala/akka/grpc/maven/ProtocBridgeCodeGenerator.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala
@@ -2,17 +2,17 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.maven
+package org.apache.pekko.grpc.maven
-import akka.grpc.gen.Logger
+import org.apache.pekko.grpc.gen.Logger
import protocbridge.Artifact
/**
- * Adapts existing `akka.grpc.gen.CodeGenerator` into the protocbridge required type
+ * Adapts existing `org.apache.pekko.grpc.gen.CodeGenerator` into the protocbridge required type
*/
class ProtocBridgeCodeGenerator(
- impl: akka.grpc.gen.CodeGenerator,
- scalaBinaryVersion: akka.grpc.gen.CodeGenerator.ScalaBinaryVersion,
+ impl: org.apache.pekko.grpc.gen.CodeGenerator,
+ scalaBinaryVersion: org.apache.pekko.grpc.gen.CodeGenerator.ScalaBinaryVersion,
logger: Logger)
extends protocbridge.ProtocCodeGenerator {
override def run(request: Array[Byte]): Array[Byte] = impl.run(request, logger)
diff --git a/maven-plugin/src/main/scala/akka/grpc/maven/TestGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala
similarity index 91%
rename from maven-plugin/src/main/scala/akka/grpc/maven/TestGenerateMojo.scala
rename to maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala
index 9d05251c..b7d9e578 100644
--- a/maven-plugin/src/main/scala/akka/grpc/maven/TestGenerateMojo.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.maven
+package org.apache.pekko.grpc.maven
import javax.inject.Inject
import org.sonatype.plexus.build.incremental.BuildContext
diff --git a/maven-plugin/src/test/scala/akka/grpc/maven/ProtocSpec.scala b/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala
similarity index 97%
rename from maven-plugin/src/test/scala/akka/grpc/maven/ProtocSpec.scala
rename to maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala
index 8828461c..ac63c10f 100644
--- a/maven-plugin/src/test/scala/akka/grpc/maven/ProtocSpec.scala
+++ b/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.maven
+package org.apache.pekko.grpc.maven
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
diff --git a/plugin-tester-java/README.md b/plugin-tester-java/README.md
index 7cfac02a..a73daf36 100644
--- a/plugin-tester-java/README.md
+++ b/plugin-tester-java/README.md
@@ -3,6 +3,6 @@
Use this project to test the behavior of the sbt plugin without the need of separately releasing it from within the main build.
```
-project akka-grpc-plugin-tester-java
+project pekko-grpc-plugin-tester-java
test
-```
\ No newline at end of file
+```
diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
index 56e7ec93..c8a36689 100644
--- a/plugin-tester-java/build.gradle
+++ b/plugin-tester-java/build.gradle
@@ -1,9 +1,9 @@
plugins {
id 'scala'
- id 'com.lightbend.akka.grpc.gradle'
+ id 'org.apache.pekko.grpc.gradle'
}
-akkaGrpc {
+pekkoGrpc {
generateClient = true
generateServer = true
serverPowerApis = true // This isn't default
@@ -15,12 +15,15 @@ repositories {
mavenLocal()
}
-def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCALA_VERSION") ?: "2.12")
+def scalaFullVersion = "2.12.16"
+def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
dependencies {
- implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.3'
- testImplementation "com.typesafe.akka:akka-stream-testkit_${scalaBinaryVersion}:2.6.19"
- testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.12"
+ // see https://github.com/apache/incubator-pekko-grpc/issues/22
+ // implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.3'
+ implementation "org.scala-lang:scala-library:${scalaFullVersion}"
+ testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:0.0.0+26599-83545a33-SNAPSHOT"
+ testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.15"
testImplementation "org.scalatestplus:junit-4-12_${scalaBinaryVersion}:3.2.2.0"
}
diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
index 4367b607..5c6b7fae 100644
--- a/plugin-tester-java/pom.xml
+++ b/plugin-tester-java/pom.xml
@@ -1,11 +1,11 @@
<!--
- To test locally, first 'sbt akka-grpc-maven-plugin:publishM2' in the parent dir
- and define the published version as akka.grpc.project.version in the properties block below
- or pass it to mvn when running like so: mvn -Dakka.grpc.project.version=some-version compile exec:exec
+ To test locally, first 'sbt pekko-grpc-maven-plugin:publishM2' in the parent dir
+ and define the published version as pekko.grpc.project.version in the properties block below
+ or pass it to mvn when running like so: mvn -Dpekko.grpc.project.version=some-version compile exec:exec
-->
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Akka gRPC Java example project</name>
+ <name>Pekko gRPC Java example project</name>
<groupId>com.lightbend.akka.grpc</groupId>
<artifactId>grpc-plugin-tester-java</artifactId>
<version>0.1-SNAPSHOT</version>
@@ -20,17 +20,27 @@
<project.encoding>UTF-8</project.encoding>
</properties>
+ <repositories>
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-runtime_2.12</artifactId>
- <version>${akka.grpc.project.version}</version>
+ <artifactId>pekko-grpc-runtime_2.12</artifactId>
+ <version>${pekko.grpc.project.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>ch.megard</groupId>
<artifactId>akka-http-cors_2.12</artifactId>
<version>${akka.http.cors.version}</version>
</dependency>
+ -->
<!-- Needed for the generated client -->
<dependency>
@@ -43,8 +53,8 @@
<plugins>
<plugin>
<groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-maven-plugin</artifactId>
- <version>${akka.grpc.project.version}</version>
+ <artifactId>pekko-grpc-maven-plugin</artifactId>
+ <version>${pekko.grpc.project.version}</version>
<executions>
<execution>
<goals>
diff --git a/plugin-tester-java/settings.gradle b/plugin-tester-java/settings.gradle
index cc1fa6f2..ff115d5b 100644
--- a/plugin-tester-java/settings.gradle
+++ b/plugin-tester-java/settings.gradle
@@ -4,10 +4,10 @@ pluginManagement {
gradlePluginPortal()
}
plugins {
- id 'com.lightbend.akka.grpc.gradle' version "${System.getProperty('akka.grpc.project.version')}"
+ id 'org.apache.pekko.grpc.gradle' version "${System.getProperty('pekko.grpc.project.version')}"
}
}
-if (!System.getProperty('akka.grpc.project.version')) {
- throw new GradleException("System property `akka.grpc.project.version` is not provided. Use -Dakka.grpc.project.version=\$VERSION.")
+if (!System.getProperty('pekko.grpc.project.version')) {
+ throw new GradleException("System property `pekko.grpc.project.version` is not provided. Use -Dpekko.grpc.project.version=\$VERSION.")
}
diff --git a/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java b/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java
index 990c7758..b5de9fbd 100644
--- a/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java
@@ -4,10 +4,10 @@
package example.myapp;
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.stream.SystemMaterializer;
-import akka.stream.Materializer;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.Materializer;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
@@ -15,15 +15,15 @@ import java.util.Arrays;
import java.util.concurrent.CompletionStage;
//#import
-import akka.grpc.javadsl.ServiceHandler;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.japi.function.Function;
+import org.apache.pekko.grpc.javadsl.ServiceHandler;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.japi.function.Function;
//#import
//#grpc-web
-import akka.grpc.javadsl.WebHandler;
+import org.apache.pekko.grpc.javadsl.WebHandler;
//#grpc-web
@@ -35,7 +35,7 @@ import example.myapp.echo.grpc.*;
class CombinedServer {
public static void main(String[] args) {
// important to enable HTTP/2 in ActorSystem's config
- Config conf = ConfigFactory.parseString("akka.http.server.preview.enable-http2 = on")
+ Config conf = ConfigFactory.parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication());
ActorSystem sys = ActorSystem.create("HelloWorld", conf);
Materializer mat = SystemMaterializer.get(sys).materializer();
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java
index bff868f8..98c0be87 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java
@@ -6,32 +6,32 @@ package example.myapp.helloworld;
import java.util.concurrent.CompletionStage;
-import akka.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.server.Route;
-import akka.japi.function.Function;
-import akka.stream.SystemMaterializer;
-import akka.stream.Materializer;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.Materializer;
import example.myapp.helloworld.grpc.GreeterService;
import example.myapp.helloworld.grpc.GreeterServiceHandlerFactory;
-import static akka.http.javadsl.server.Directives.*;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
class AuthenticatedGreeterServer {
public static void main(String[] args) throws Exception {
// important to enable HTTP/2 in ActorSystem's config
- Config conf = ConfigFactory.parseString("akka.http.server.preview.enable-http2 = on")
+ Config conf = ConfigFactory.parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication());
- // Akka ActorSystem Boot
+ // ActorSystem Boot
ActorSystem sys = ActorSystem.create("HelloWorld", conf);
run(sys).thenAccept(binding -> {
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java
index 9e27050e..395f2fdb 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java
@@ -14,13 +14,13 @@ import java.time.Duration;
import io.grpc.StatusRuntimeException;
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.SystemMaterializer;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Source;
-import akka.grpc.GrpcClientSettings;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.grpc.GrpcClientSettings;
import example.myapp.helloworld.grpc.*;
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java
index 96e6da48..56c3c4c9 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java
@@ -5,12 +5,12 @@
//#full-server
package example.myapp.helloworld;
-import akka.actor.ActorSystem;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.stream.SystemMaterializer;
-import akka.stream.Materializer;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.Materializer;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import example.myapp.helloworld.grpc.GreeterService;
@@ -21,10 +21,10 @@ import java.util.concurrent.CompletionStage;
class GreeterServer {
public static void main(String[] args) throws Exception {
// important to enable HTTP/2 in ActorSystem's config
- Config conf = ConfigFactory.parseString("akka.http.server.preview.enable-http2 = on")
+ Config conf = ConfigFactory.parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication());
- // Akka ActorSystem Boot
+ // ActorSystem Boot
ActorSystem sys = ActorSystem.create("HelloWorld", conf);
run(sys).thenAccept(binding -> {
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java
index 5a89e68c..960e22c3 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java
@@ -10,10 +10,10 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.stream.Collectors;
-import akka.NotUsed;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
import com.google.protobuf.Timestamp;
import example.myapp.helloworld.grpc.*;
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java
index 6ab1856b..e7ac979c 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java
@@ -5,11 +5,11 @@
//#full-service-impl
package example.myapp.helloworld;
-import akka.NotUsed;
-import akka.grpc.javadsl.Metadata;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.grpc.javadsl.Metadata;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
import example.myapp.helloworld.grpc.GreeterServicePowerApi;
import example.myapp.helloworld.grpc.HelloReply;
import example.myapp.helloworld.grpc.HelloRequest;
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java
index db3aa112..636d8baf 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java
@@ -13,13 +13,13 @@ import java.time.Duration;
import io.grpc.StatusRuntimeException;
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.SystemMaterializer;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Source;
-import akka.grpc.GrpcClientSettings;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.grpc.GrpcClientSettings;
import example.myapp.helloworld.grpc.*;
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java
index 4e026730..66add89e 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java
@@ -4,18 +4,18 @@
package example.myapp.helloworld;
-import akka.actor.ActorSystem;
-import akka.event.Logging;
-import akka.grpc.Trailers;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.server.RequestContext;
-import akka.http.javadsl.server.Route;
-import akka.japi.Function;
-import akka.stream.Materializer;
-import akka.stream.SystemMaterializer;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.grpc.Trailers;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.server.RequestContext;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.japi.Function;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.SystemMaterializer;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import example.myapp.helloworld.grpc.GreeterService;
@@ -28,15 +28,15 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.function.BiFunction;
-import static akka.http.javadsl.server.Directives.*;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
public class LoggingErrorHandlingGreeterServer {
public static void main(String[] args) throws Exception {
// important to enable HTTP/2 in ActorSystem's config
- Config conf = ConfigFactory.parseString("akka.http.server.preview.enable-http2 = on")
+ Config conf = ConfigFactory.parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication());
- // Akka ActorSystem Boot
+ // ActorSystem Boot
ActorSystem sys = ActorSystem.create("HelloWorld", conf);
run(sys).thenAccept(binding -> {
@@ -71,7 +71,7 @@ public class LoggingErrorHandlingGreeterServer {
private static <ServiceImpl> Route loggingErrorHandlingGrpcRoute(
Function<RequestContext, ServiceImpl> buildImpl,
Function<ActorSystem, Function<Throwable, Trailers>> errorHandler,
- BiFunction<ServiceImpl, Function<ActorSystem, Function<Throwable, Trailers>>, akka.japi.function.Function<HttpRequest, CompletionStage<HttpResponse>>> buildHandler
+ BiFunction<ServiceImpl, Function<ActorSystem, Function<Throwable, Trailers>>, org.apache.pekko.japi.function.Function<HttpRequest, CompletionStage<HttpResponse>>> buildHandler
) {
return logRequest("loggingErrorHandlingGrpcRoute", Logging.InfoLevel(), () -> extractRequestContext(ctx -> {
Function<ActorSystem, Function<Throwable, Trailers>> loggingErrorHandler = (actorSystem) -> (throwable) -> {
@@ -88,7 +88,7 @@ public class LoggingErrorHandlingGreeterServer {
};
try {
ServiceImpl impl = buildImpl.apply(ctx);
- akka.japi.function.Function<HttpRequest, CompletionStage<HttpResponse>> handler = buildHandler.apply(impl, loggingErrorHandler);
+ org.apache.pekko.japi.function.Function<HttpRequest, CompletionStage<HttpResponse>> handler = buildHandler.apply(impl, loggingErrorHandler);
return handle(handler);
} catch (Exception e) {
return failWith(e);
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java
index 35ffa349..dce561b0 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java
@@ -5,12 +5,12 @@
//#full-server
package example.myapp.helloworld;
-import akka.actor.ActorSystem;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.stream.SystemMaterializer;
-import akka.stream.Materializer;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.Materializer;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import example.myapp.helloworld.grpc.GreeterServicePowerApi;
@@ -21,10 +21,10 @@ import java.util.concurrent.CompletionStage;
class PowerGreeterServer {
public static void main(String[] args) throws Exception {
// important to enable HTTP/2 in ActorSystem's config
- Config conf = ConfigFactory.parseString("akka.http.server.preview.enable-http2 = on")
+ Config conf = ConfigFactory.parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication());
- // Akka ActorSystem Boot
+ // ActorSystem Boot
ActorSystem sys = ActorSystem.create("HelloWorld", conf);
run(sys).thenAccept(binding -> {
diff --git a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java
index 10d17c7f..d3978a89 100644
--- a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java
+++ b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java
@@ -4,8 +4,8 @@
package example.myapp.statefulhelloworld;
-import akka.actor.AbstractActor;
-import akka.actor.Props;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.Props;
// #actor
public class GreeterActor extends AbstractActor {
diff --git a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java
index c5949d70..12bfb212 100644
--- a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java
@@ -6,9 +6,9 @@ package example.myapp.statefulhelloworld;
import example.myapp.statefulhelloworld.grpc.*;
-import akka.actor.ActorSystem;
-import akka.actor.ActorRef;
-import static akka.pattern.Patterns.ask;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.ActorRef;
+import static org.apache.pekko.pattern.Patterns.ask;
import java.time.Duration;
import java.util.concurrent.CompletableFuture;
diff --git a/plugin-tester-java/src/main/resources/application.conf b/plugin-tester-java/src/main/resources/application.conf
index f3c56ea9..e6ddb4b2 100644
--- a/plugin-tester-java/src/main/resources/application.conf
+++ b/plugin-tester-java/src/main/resources/application.conf
@@ -1,5 +1,5 @@
-akka.loglevel = INFO
-akka.grpc.client {
+pekko.loglevel = INFO
+pekko.grpc.client {
"helloworld.GreeterService" {
host = 127.0.0.1
port = 8090
diff --git a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
index cf0cb142..6b337942 100644
--- a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
+++ b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
@@ -6,15 +6,15 @@ package example.myapp.helloworld
import java.util.concurrent.CompletionStage
-import akka.actor.ActorSystem
-import akka.grpc.internal.GrpcProtocolNative
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.HttpEntity.{ Chunked, LastChunk }
-import akka.http.scaladsl.model.headers.RawHeader
-import akka.http.scaladsl.model.{ HttpMethods, HttpRequest, HttpResponse, StatusCodes }
-import akka.stream.Materializer
-import akka.stream.scaladsl.Sink
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.internal.GrpcProtocolNative
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.model.HttpEntity.{ Chunked, LastChunk }
+import org.apache.pekko.http.scaladsl.model.headers.RawHeader
+import org.apache.pekko.http.scaladsl.model.{ HttpMethods, HttpRequest, HttpResponse, StatusCodes }
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.Sink
import example.myapp.helloworld.grpc.{ GreeterService, GreeterServiceHandlerFactory }
import io.grpc.Status
import org.scalatest.concurrent.ScalaFutures
@@ -35,12 +35,13 @@ class ErrorReportingSpec extends AnyWordSpec with Matchers with ScalaFutures wit
val handler = GreeterServiceHandlerFactory.create(new GreeterServiceImpl(mat), sys)
val binding = {
- import akka.http.javadsl.Http
- import akka.http.javadsl.model.{ HttpRequest, HttpResponse }
+ import org.apache.pekko.http.javadsl.Http
+ import org.apache.pekko.http.javadsl.model.{ HttpRequest, HttpResponse }
Http(sys)
.newServerAt("127.0.0.1", 0)
- .bind((req => handler(req)): akka.japi.function.Function[HttpRequest, CompletionStage[HttpResponse]])
+ .bind((req => handler(req)): org.apache.pekko.japi.function.Function[HttpRequest, CompletionStage[
+ HttpResponse]])
.toCompletableFuture
.get
}
diff --git a/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala b/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala
index 73eb087d..ae41234b 100644
--- a/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala
+++ b/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala
@@ -9,8 +9,8 @@ import scala.concurrent.Await
import org.scalatest.BeforeAndAfterAll
import scala.concurrent.duration._
-import akka.actor.ActorSystem
-import akka.grpc.GrpcClientSettings
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.GrpcClientSettings
import com.google.protobuf.Timestamp
import com.typesafe.config.ConfigFactory
import org.scalatest.concurrent.ScalaFutures
@@ -27,7 +27,7 @@ class JGreeterServiceSpec extends Matchers with AnyWordSpecLike with BeforeAndAf
implicit val serverSystem: ActorSystem = {
// important to enable HTTP/2 in server ActorSystem's config
val conf = ConfigFactory
- .parseString("akka.http.server.preview.enable-http2 = on")
+ .parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication())
val sys = ActorSystem("GreeterServer", conf)
// make sure servers are bound before using client
diff --git a/plugin-tester-scala/README.md b/plugin-tester-scala/README.md
index bc1a5de6..552751bc 100644
--- a/plugin-tester-scala/README.md
+++ b/plugin-tester-scala/README.md
@@ -6,7 +6,7 @@ Exact version of plugin *must be provided* via java system property.
The version must either be published to Gradle plugin portal or to local maven (`~/.m2`).
```shell script
-$ ./gradlew clean test -Dakka.grpc.project.version=1.0.0
+$ ./gradlew clean test -Dpekko.grpc.project.version=1.0.0
```
## Use different versions of Gradle plugin and akka grpc libraries.
@@ -17,7 +17,7 @@ Libraries must be published to akka grpc release or snapshot repo.
[source,sh]
```shell script
-$ ./gradlew clean test -Dakka.grpc.project.version=1.0.0 -Dakka.grpc.baseline.version=0.0.1
+$ ./gradlew clean test -Dpekko.grpc.project.version=1.0.0 -Dpekko.grpc.baseline.version=0.0.1
```
diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle
index dd539656..ec588b83 100644
--- a/plugin-tester-scala/build.gradle
+++ b/plugin-tester-scala/build.gradle
@@ -1,8 +1,8 @@
plugins {
- id 'com.lightbend.akka.grpc.gradle'
+ id 'org.apache.pekko.grpc.gradle'
}
-akkaGrpc {
+pekkoGrpc {
serverPowerApis = true // This isn't default
}
@@ -10,12 +10,15 @@ repositories {
mavenLocal()
}
-def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCALA_VERSION") ?: "2.12")
+def scalaFullVersion = "2.12.16"
+def scalaVersion = org.gradle.util.VersionNumber.parse(scalaFullVersion)
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
dependencies {
- implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.3'
- testImplementation "com.typesafe.akka:akka-stream-testkit_${scalaBinaryVersion}:2.6.19"
+ // see https://github.com/apache/incubator-pekko-grpc/issues/22
+ // implementation group: 'ch.megard', name: "akka-http-cors_${scalaBinaryVersion}", version: '1.1.3'
+ implementation "org.scala-lang:scala-library:${scalaFullVersion}"
+ testImplementation "org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:0.0.0+26599-83545a33-SNAPSHOT"
testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.12"
testImplementation "org.scalatestplus:junit-4-12_${scalaBinaryVersion}:3.2.2.0"
}
diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
index ad2f322c..4775cdd1 100644
--- a/plugin-tester-scala/pom.xml
+++ b/plugin-tester-scala/pom.xml
@@ -1,11 +1,11 @@
<!--
- To test locally, first 'sbt akka-grpc-maven-plugin:publishM2' in the parent dir
- and define the published version as akka.grpc.project.version in the properties block below
- or pass it to mvn when running like so: mvn -Dakka.grpc.project.version=some-version compile exec:exec
+ To test locally, first 'sbt pekko-grpc-maven-plugin:publishM2' in the parent dir
+ and define the published version as pekko.grpc.project.version in the properties block below
+ or pass it to mvn when running like so: mvn -Dpekko.grpc.project.version=some-version compile exec:exec
-->
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Akka gRPC Scala example project</name>
+ <name>Pekko gRPC Scala example project</name>
<groupId>com.lightbend.akka.grpc</groupId>
<artifactId>grpc-plugin-tester-scala</artifactId>
<version>0.1-SNAPSHOT</version>
@@ -13,28 +13,38 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <akka.version>2.5.13</akka.version>
+ <pekko.version>0.0.0+26599-83545a33-SNAPSHOT</pekko.version>
<akka.http.cors.version>0.4.2</akka.http.cors.version>
<grpc.version>1.48.1</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>
+ <repositories>
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-runtime_2.12</artifactId>
- <version>${akka.grpc.project.version}</version>
+ <artifactId>pekko-grpc-runtime_2.12</artifactId>
+ <version>${pekko.grpc.project.version}</version>
</dependency>
+ <!-- see https://github.com/apache/incubator-pekko-grpc/issues/22
<dependency>
<groupId>ch.megard</groupId>
<artifactId>akka-http-cors_2.12</artifactId>
<version>${akka.http.cors.version}</version>
</dependency>
+ -->
<dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-stream-testkit_2.12</artifactId>
- <version>${akka.version}</version>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-stream-testkit_2.12</artifactId>
+ <version>${pekko.version}</version>
<scope>test</scope>
</dependency>
@@ -71,8 +81,8 @@
<plugin>
<groupId>com.lightbend.akka.grpc</groupId>
- <artifactId>akka-grpc-maven-plugin</artifactId>
- <version>${akka.grpc.project.version}</version>
+ <artifactId>pekko-grpc-maven-plugin</artifactId>
+ <version>${pekko.grpc.project.version}</version>
<configuration>
<language>Scala</language>
<generatorSettings>
diff --git a/plugin-tester-scala/settings.gradle b/plugin-tester-scala/settings.gradle
index 87858e3b..207488f8 100644
--- a/plugin-tester-scala/settings.gradle
+++ b/plugin-tester-scala/settings.gradle
@@ -4,11 +4,11 @@ pluginManagement {
gradlePluginPortal()
}
plugins {
- id 'com.lightbend.akka.grpc.gradle' version "${System.getProperty('akka.grpc.project.version')}"
+ id 'org.apache.pekko.grpc.gradle' version "${System.getProperty('pekko.grpc.project.version')}"
}
}
-if (!System.getProperty('akka.grpc.project.version')) {
- throw new GradleException("System property `akka.grpc.project.version` is not provided. Use -Dakka.grpc.project.version=\$VERSION.")
+if (!System.getProperty('pekko.grpc.project.version')) {
+ throw new GradleException("System property `pekko.grpc.project.version` is not provided. Use -Dpekko.grpc.project.version=\$VERSION.")
}
diff --git a/plugin-tester-scala/src/main/resources/application.conf b/plugin-tester-scala/src/main/resources/application.conf
index 98431cba..e15ee681 100644
--- a/plugin-tester-scala/src/main/resources/application.conf
+++ b/plugin-tester-scala/src/main/resources/application.conf
@@ -1,6 +1,6 @@
-akka.loglevel = INFO
+pekko.loglevel = INFO
-akka.grpc.client {
+pekko.grpc.client {
"helloworld.GreeterService" {
host = 127.0.0.1
port = 8080
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala
index 0b68bd01..96b924cf 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala
@@ -6,11 +6,11 @@ package example.myapp
import scala.concurrent.ExecutionContext
import scala.concurrent.Future
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.HttpRequest
-import akka.http.scaladsl.model.HttpResponse
-import akka.grpc.scaladsl.ServerReflection
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.HttpRequest
+import org.apache.pekko.http.scaladsl.model.HttpResponse
+import org.apache.pekko.grpc.scaladsl.ServerReflection
import com.typesafe.config.ConfigFactory
import example.myapp.helloworld._
import example.myapp.echo._
@@ -18,12 +18,12 @@ import example.myapp.echo.grpc._
import example.myapp.helloworld.grpc.GreeterService
//#concatOrNotFound
-import akka.grpc.scaladsl.ServiceHandler
+import org.apache.pekko.grpc.scaladsl.ServiceHandler
//#concatOrNotFound
//#grpc-web
-import akka.grpc.scaladsl.WebHandler
+import org.apache.pekko.grpc.scaladsl.WebHandler
//#grpc-web
@@ -31,7 +31,7 @@ object CombinedServer {
def main(args: Array[String]): Unit = {
// important to enable HTTP/2 in ActorSystem's config
val conf = ConfigFactory
- .parseString("akka.http.server.preview.enable-http2 = on")
+ .parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication())
implicit val sys: ActorSystem = ActorSystem("HelloWorld", conf)
implicit val ec: ExecutionContext = sys.dispatcher
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala
index a7fc1e4b..d3a65f45 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala
@@ -4,8 +4,8 @@
package example.myapp.helloworld
-import akka.actor.ActorSystem
-import akka.grpc.GrpcClientSettings
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.GrpcClientSettings
import example.myapp.helloworld.grpc._
import scala.concurrent.Await
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala
index 9a570964..2e5bd534 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala
@@ -4,11 +4,11 @@
package example.myapp.helloworld
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.{ HttpRequest, HttpResponse }
-import akka.http.scaladsl.server.{ Directive0, Route }
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, HttpResponse }
+import org.apache.pekko.http.scaladsl.server.{ Directive0, Route }
+import org.apache.pekko.http.scaladsl.server.Directives._
import com.typesafe.config.ConfigFactory
import example.myapp.helloworld.grpc._
@@ -19,7 +19,7 @@ object AuthenticatedGreeterServer {
// Important: enable HTTP/2 in ActorSystem's config
// We do it here programmatically, but you can also set it in the application.conf
val conf = ConfigFactory
- .parseString("akka.http.server.preview.enable-http2 = on")
+ .parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication())
val system = ActorSystem("HelloWorld", conf)
new AuthenticatedGreeterServer(system).run()
@@ -29,7 +29,7 @@ object AuthenticatedGreeterServer {
class AuthenticatedGreeterServer(system: ActorSystem) {
def run(): Future[Http.ServerBinding] = {
- // Akka boot up code
+ // Pekko boot up code
implicit val sys: ActorSystem = system
implicit val ec: ExecutionContext = sys.dispatcher
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala
index 8dae99cf..16c4ddad 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala
@@ -5,10 +5,10 @@
//#full-client
package example.myapp.helloworld
-import akka.{ Done, NotUsed }
-import akka.actor.ActorSystem
-import akka.grpc.GrpcClientSettings
-import akka.stream.scaladsl.Source
+import org.apache.pekko.{ Done, NotUsed }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.GrpcClientSettings
+import org.apache.pekko.stream.scaladsl.Source
import example.myapp.helloworld.grpc._
import scala.concurrent.Future
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala
index a61307e5..d74d5aa3 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala
@@ -5,9 +5,9 @@
//#full-server
package example.myapp.helloworld
-import akka.actor.ActorSystem
-import akka.http.scaladsl.model.{ HttpRequest, HttpResponse }
-import akka.http.scaladsl.Http
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, HttpResponse }
+import org.apache.pekko.http.scaladsl.Http
import com.typesafe.config.ConfigFactory
import example.myapp.helloworld.grpc._
@@ -18,7 +18,7 @@ object GreeterServer {
// Important: enable HTTP/2 in ActorSystem's config
// We do it here programmatically, but you can also set it in the application.conf
val conf = ConfigFactory
- .parseString("akka.http.server.preview.enable-http2 = on")
+ .parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication())
val system = ActorSystem("HelloWorld", conf)
new GreeterServer(system).run()
@@ -28,7 +28,7 @@ object GreeterServer {
class GreeterServer(system: ActorSystem) {
def run(): Future[Http.ServerBinding] = {
- // Akka boot up code
+ // Pekko boot up code
implicit val sys: ActorSystem = system
implicit val ec: ExecutionContext = sys.dispatcher
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala
index 076e2b89..a90b8d3a 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala
@@ -6,10 +6,10 @@
package example.myapp.helloworld
import scala.concurrent.Future
-import akka.NotUsed
-import akka.stream.Materializer
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
import com.google.protobuf.timestamp.Timestamp
import example.myapp.helloworld.grpc._
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala
index 8577e421..b3ffc3d2 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala
@@ -9,11 +9,11 @@ import scala.concurrent.Future
import scala.concurrent.duration._
import scala.util.Try
-import akka.Done
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.grpc.GrpcClientSettings
-import akka.stream.scaladsl.Source
+import org.apache.pekko.Done
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.GrpcClientSettings
+import org.apache.pekko.stream.scaladsl.Source
import example.myapp.helloworld.grpc._
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala
index 20ef6fd4..de2396f4 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala
@@ -4,8 +4,8 @@
package example.myapp.helloworld
-import akka.actor.ActorSystem
-import akka.grpc.GrpcClientSettings
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.GrpcClientSettings
import example.myapp.helloworld.grpc.{ GreeterServiceClient, HelloRequest }
import scala.concurrent.Await
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala
index 13830f2f..9b6add12 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala
@@ -4,16 +4,16 @@
package example.myapp.helloworld
-import akka.actor.ActorSystem
-import akka.event.Logging
-import akka.grpc.Trailers
-import akka.grpc.scaladsl.{ ServerReflection, ServiceHandler }
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.{ HttpRequest, HttpResponse }
-import akka.http.scaladsl.server.Directives._
-import akka.http.scaladsl.server._
-import akka.http.scaladsl.server.directives.DebuggingDirectives
-import akka.stream.Materializer
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.event.Logging
+import org.apache.pekko.grpc.Trailers
+import org.apache.pekko.grpc.scaladsl.{ ServerReflection, ServiceHandler }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, HttpResponse }
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.server._
+import org.apache.pekko.http.scaladsl.server.directives.DebuggingDirectives
+import org.apache.pekko.stream.Materializer
import com.typesafe.config.ConfigFactory
import example.myapp.helloworld.grpc.{ GreeterService, GreeterServiceHandler, HelloReply, HelloRequest }
import io.grpc.Status
@@ -24,7 +24,7 @@ import scala.util.control.NonFatal
object LoggingErrorHandlingGreeterServer {
def main(args: Array[String]): Unit = {
val conf = ConfigFactory
- .parseString("akka.http.server.preview.enable-http2 = on")
+ .parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication())
val system = ActorSystem("Server", conf)
new LoggingErrorHandlingGreeterServer(system).run()
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala
index 8f8facbe..dc2137f2 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala
@@ -5,16 +5,16 @@
//#full-server
package example.myapp.helloworld
-import akka.actor.ActorSystem
-import akka.http.scaladsl.model.{ HttpRequest, HttpResponse }
-import akka.http.scaladsl.Http
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, HttpResponse }
+import org.apache.pekko.http.scaladsl.Http
import example.myapp.helloworld.grpc._
import scala.concurrent.{ ExecutionContext, Future }
class PowerGreeterServer(system: ActorSystem) {
def run(): Future[Http.ServerBinding] = {
- // Akka boot up code
+ // Pekko boot up code
implicit val sys: ActorSystem = system
implicit val ec: ExecutionContext = sys.dispatcher
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala
index b2b6c05a..49fbb889 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala
@@ -5,10 +5,10 @@
//#full-service-impl
package example.myapp.helloworld
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.grpc.scaladsl.Metadata
-import akka.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.grpc.scaladsl.Metadata
+import org.apache.pekko.stream.scaladsl.{ Sink, Source }
import example.myapp.helloworld.grpc._
import scala.concurrent.Future
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala
index 84937544..66c24653 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala
@@ -4,8 +4,8 @@
package example.myapp.statefulhelloworld
-import akka.actor.Actor
-import akka.actor.Props
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.Props
// #actor
object GreeterActor {
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala
index a9de0268..906fc5ac 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala
@@ -6,9 +6,9 @@ package example.myapp.statefulhelloworld
import example.myapp.statefulhelloworld.grpc.GreeterService
import example.myapp.statefulhelloworld.grpc.{ ChangeRequest, ChangeResponse, HelloReply, HelloRequest }
-import akka.actor.ActorSystem
-import akka.pattern.ask
-import akka.util.Timeout
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.util.Timeout
import scala.concurrent.duration._
import scala.concurrent.Future
diff --git a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
index b0b07ecb..83c49358 100644
--- a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
+++ b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
@@ -4,13 +4,13 @@
package example.myapp.helloworld
-import akka.actor.{ ActorSystem, ClassicActorSystemProvider }
-import akka.grpc.internal.GrpcProtocolNative
-import akka.http.scaladsl.model.HttpEntity.{ Chunked, LastChunk }
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.headers.RawHeader
-import akka.http.scaladsl.Http
-import akka.stream.scaladsl.Sink
+import org.apache.pekko.actor.{ ActorSystem, ClassicActorSystemProvider }
+import org.apache.pekko.grpc.internal.GrpcProtocolNative
+import org.apache.pekko.http.scaladsl.model.HttpEntity.{ Chunked, LastChunk }
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.model.headers.RawHeader
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.stream.scaladsl.Sink
import example.myapp.helloworld.grpc.{ GreeterService, GreeterServiceHandler }
import io.grpc.Status
import org.junit.runner.RunWith
diff --git a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala
index ff5d5e0c..136fbd16 100644
--- a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala
+++ b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala
@@ -4,8 +4,8 @@
package example.myapp.helloworld
-import akka.actor.{ ActorSystem, ClassicActorSystemProvider }
-import akka.grpc.GrpcClientSettings
+import org.apache.pekko.actor.{ ActorSystem, ClassicActorSystemProvider }
+import org.apache.pekko.grpc.GrpcClientSettings
import com.google.protobuf.timestamp.Timestamp
import com.typesafe.config.ConfigFactory
import example.myapp.helloworld.grpc._
@@ -28,7 +28,7 @@ class GreeterSpec extends Matchers with AnyWordSpecLike with BeforeAndAfterAll w
implicit val serverSystem: ActorSystem = {
// important to enable HTTP/2 in server ActorSystem's config
val conf = ConfigFactory
- .parseString("akka.http.server.preview.enable-http2 = on")
+ .parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication())
val sys = ActorSystem("GreeterServer", conf)
// make sure servers are bound before using client
diff --git a/project/Assemblies.scala b/project/Assemblies.scala
index 05e798d5..62a66c45 100644
--- a/project/Assemblies.scala
+++ b/project/Assemblies.scala
@@ -10,7 +10,7 @@ object Assemblies {
* sbt-assembly using `defaultUniversalScript(shebang = true)`
*/
def mkBatAssembly(assembly: File): File = {
- val file = Files.createTempFile("akka-grpc-", ".tmp").toFile
+ val file = Files.createTempFile("pekko-grpc-", ".tmp").toFile
file.deleteOnExit()
copySkippingUntil('@'.toByte, assembly, file)
diff --git a/project/Common.scala b/project/Common.scala
index e5cc381f..0e24eb14 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -1,9 +1,9 @@
-package akka.grpc
+package org.apache.pekko.grpc
import sbt.Keys._
import sbt._
import sbt.plugins.JvmPlugin
-import akka.grpc.Dependencies.Versions.{ scala212, scala213 }
+import org.apache.pekko.grpc.Dependencies.Versions.{ scala212, scala213 }
import com.lightbend.paradox.projectinfo.ParadoxProjectInfoPluginKeys.projectInfoVersion
import com.typesafe.tools.mima.plugin.MimaKeys._
import sbtprotoc.ProtocPlugin.autoImport.PB
diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala
index 3fa98ce2..1410303f 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2019 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
import sbt._, Keys._
import de.heikoseeberger.sbtheader.{ CommentCreator, HeaderPlugin }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 48702ea3..a697cfbc 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -1,4 +1,4 @@
-package akka.grpc
+package org.apache.pekko.grpc
import sbt._
import sbt.Keys._
@@ -16,15 +16,15 @@ object Dependencies {
// We don't force Akka updates because downstream projects can upgrade
// themselves. For more information see
// https://doc.akka.io//docs/akka/current/project/downstream-upgrade-strategy.html
- val akka = "2.6.19"
+ val pekko = "0.0.0+26599-83545a33-SNAPSHOT"
val akkaBinary = "2.6"
- val akkaHttp = "10.2.9"
+ val pekkoHttp = "0.0.0+4298-26846a02-SNAPSHOT"
val akkaHttpBinary = "10.2"
val grpc = "1.48.1" // checked synced by VersionSyncCheckPlugin
// Even referenced explicitly in the sbt-plugin's sbt-tests
// If changing this, remember to update protoc plugin version to align in
- // maven-plugin/src/main/maven/plugin.xml and akka.grpc.sbt.AkkaGrpcPlugin
+ // maven-plugin/src/main/maven/plugin.xml and org.apache.pekko.grpc.sbt.PekkoGrpcPlugin
val googleProtobuf = "3.20.1" // checked synced by VersionSyncCheckPlugin
val scalaTest = "3.1.4"
@@ -33,13 +33,11 @@ object Dependencies {
}
object Compile {
- val akkaStream = "com.typesafe.akka" %% "akka-stream" % Versions.akka
- val akkaHttp = "com.typesafe.akka" %% "akka-http" % Versions.akkaHttp
- val akkaHttpCore = "com.typesafe.akka" %% "akka-http-core" % Versions.akkaHttp
- val akkaDiscovery = "com.typesafe.akka" %% "akka-discovery" % Versions.akka
- val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % Versions.akka
-
- val akkaHttpCors = "ch.megard" %% "akka-http-cors" % "1.1.3" // Apache v2
+ val pekkoStream = "org.apache.pekko" %% "pekko-stream" % Versions.pekko
+ val pekkoHttp = "org.apache.pekko" %% "pekko-http" % Versions.pekkoHttp
+ val pekkoHttpCore = "org.apache.pekko" %% "pekko-http-core" % Versions.pekkoHttp
+ val pekkoDiscovery = "org.apache.pekko" %% "pekko-discovery" % Versions.pekko
+ val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % Versions.pekko
val scalapbCompilerPlugin = "com.thesamet.scalapb" %% "compilerplugin" % scalapb.compiler.Version.scalapbVersion
val scalapbRuntime = ("com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion)
@@ -68,9 +66,9 @@ object Dependencies {
final val Test = sbt.Test
val scalaTest = "org.scalatest" %% "scalatest" % Versions.scalaTest % "test" // Apache V2
val scalaTestPlusJunit = "org.scalatestplus" %% "junit-4-12" % (Versions.scalaTest + ".0") % "test" // Apache V2
- val akkaDiscoveryConfig = "com.typesafe.akka" %% "akka-discovery" % Versions.akka % "test"
- val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % Versions.akka % "test"
- val akkaStreamTestkit = "com.typesafe.akka" %% "akka-stream-testkit" % Versions.akka % "test"
+ val pekkoDiscoveryConfig = "org.apache.pekko" %% "pekko-discovery" % Versions.pekko % "test"
+ val pekkoTestkit = "org.apache.pekko" %% "pekko-testkit" % Versions.pekko % "test"
+ val pekkoStreamTestkit = "org.apache.pekko" %% "pekko-stream-testkit" % Versions.pekko % "test"
}
object Runtime {
@@ -101,13 +99,13 @@ object Dependencies {
Compile.grpcCore,
Compile.grpcStub % "provided", // comes from the generators
Compile.grpcNettyShaded,
- Compile.akkaStream,
- Compile.akkaHttpCore,
- Compile.akkaHttp,
- Compile.akkaDiscovery,
- Compile.akkaHttpCors % "provided",
- Test.akkaTestkit,
- Test.akkaStreamTestkit,
+ Compile.pekkoStream,
+ Compile.pekkoHttpCore,
+ Compile.pekkoHttp,
+ Compile.pekkoDiscovery,
+ // Compile.akkaHttpCors % "provided",
+ Test.pekkoTestkit,
+ Test.pekkoStreamTestkit,
Test.scalaTest,
Test.scalaTestPlusJunit)
@@ -127,18 +125,18 @@ object Dependencies {
val interopTests = l ++= Seq(
Compile.grpcInteropTesting,
Compile.grpcInteropTesting % "protobuf", // gets the proto files for interop tests
- Compile.akkaHttp,
- Compile.akkaSlf4j,
+ Compile.pekkoHttp,
+ Compile.pekkoSlf4j,
Runtime.logback,
Test.scalaTest.withConfigurations(Some("compile")),
Test.scalaTestPlusJunit.withConfigurations(Some("compile")),
- Test.akkaTestkit,
- Test.akkaStreamTestkit)
+ Test.pekkoTestkit,
+ Test.pekkoStreamTestkit)
val pluginTester = l ++= Seq(
// usually automatically added by `suggestedDependencies`, which doesn't work with ReflectiveCodeGen
Compile.grpcStub,
- Compile.akkaHttpCors,
+ // Compile.akkaHttpCors,
Test.scalaTest,
Test.scalaTestPlusJunit,
Protobuf.googleCommonProtos)
diff --git a/project/ProjectExtensions.scala b/project/ProjectExtensions.scala
index 2c8ae179..a792c8e6 100644
--- a/project/ProjectExtensions.scala
+++ b/project/ProjectExtensions.scala
@@ -1,4 +1,4 @@
-package akka.grpc
+package org.apache.pekko.grpc
import sbt._
@@ -8,6 +8,7 @@ object ProjectExtensions {
/** Add settings to test the sbt-plugin in-process */
def pluginTestingSettings: Project =
- project.dependsOn(ProjectRef(file("."), "akka-grpc-runtime")).enablePlugins(akka.grpc.build.ReflectiveCodeGen)
+ project.dependsOn(ProjectRef(file("."), "pekko-grpc-runtime")).enablePlugins(
+ org.apache.pekko.grpc.build.ReflectiveCodeGen)
}
}
diff --git a/project/ReflectiveCodeGen.scala b/project/ReflectiveCodeGen.scala
index 6c626aa2..db7ac16e 100644
--- a/project/ReflectiveCodeGen.scala
+++ b/project/ReflectiveCodeGen.scala
@@ -1,4 +1,4 @@
-package akka.grpc.build
+package org.apache.pekko.grpc.build
import java.io.File
import sbt._
@@ -52,7 +52,7 @@ object ReflectiveCodeGen extends AutoPlugin {
PB.targets := scala.collection.mutable.ListBuffer.empty,
// Put an artifact resolver that returns the project's classpath for our generators
PB.artifactResolver := Def.taskDyn {
- val cp = (ProjectRef(file("."), "akka-grpc-codegen") / Compile / fullClasspath).value.map(_.data)
+ val cp = (ProjectRef(file("."), "pekko-grpc-codegen") / Compile / fullClasspath).value.map(_.data)
val oldResolver = PB.artifactResolver.value
Def.task { (artifact: BridgeArtifact) =>
artifact.groupId match {
@@ -65,7 +65,7 @@ object ReflectiveCodeGen extends AutoPlugin {
}.value,
setCodeGenerator := loadAndSetGenerator(
// the magic sauce: use the output classpath from the the sbt-plugin project and instantiate generators from there
- (ProjectRef(file("."), "sbt-akka-grpc") / Compile / fullClasspath).value,
+ (ProjectRef(file("."), "sbt-pekko-grpc") / Compile / fullClasspath).value,
generatedLanguages.value,
generatedSources.value,
extraGenerators.value,
@@ -81,8 +81,8 @@ object ReflectiveCodeGen extends AutoPlugin {
(Global / generatedSources) := Seq("Client", "Server"),
(Global / extraGenerators) := Seq.empty,
(Global / protocOptions) := Seq.empty,
- watchSources ++= (ProjectRef(file("."), "akka-grpc-codegen") / watchSources).value,
- watchSources ++= (ProjectRef(file("."), "sbt-akka-grpc") / watchSources).value)
+ watchSources ++= (ProjectRef(file("."), "pekko-grpc-codegen") / watchSources).value,
+ watchSources ++= (ProjectRef(file("."), "sbt-pekko-grpc") / watchSources).value)
val setCodeGenerator = taskKey[Unit]("grpc-set-code-generator")
@@ -109,25 +109,25 @@ object ReflectiveCodeGen extends AutoPlugin {
val tb = universe.runtimeMirror(loader).mkToolBox()
val source =
- s"""import akka.grpc.sbt.AkkaGrpcPlugin
- |import akka.grpc.sbt.GeneratorBridge
- |import AkkaGrpcPlugin.autoImport._
- |import AkkaGrpc._
- |import akka.grpc.gen.scaladsl._
- |import akka.grpc.gen.javadsl._
- |import akka.grpc.gen.CodeGenerator.ScalaBinaryVersion
+ s"""import org.apache.pekko.grpc.sbt.PekkoGrpcPlugin
+ |import org.apache.pekko.grpc.sbt.GeneratorBridge
+ |import PekkoGrpcPlugin.autoImport._
+ |import PekkoGrpc._
+ |import org.apache.pekko.grpc.gen.scaladsl._
+ |import org.apache.pekko.grpc.gen.javadsl._
+ |import org.apache.pekko.grpc.gen.CodeGenerator.ScalaBinaryVersion
|
- |val languages: Seq[AkkaGrpc.Language] = Seq($languages)
- |val sources: Seq[AkkaGrpc.GeneratedSource] = Seq($sources)
+ |val languages: Seq[PekkoGrpc.Language] = Seq($languages)
+ |val sources: Seq[PekkoGrpc.GeneratedSource] = Seq($sources)
|val scalaBinaryVersion = ScalaBinaryVersion("$scalaBinaryVersion")
|
- |val logger = akka.grpc.gen.StdoutLogger
+ |val logger = org.apache.pekko.grpc.gen.StdoutLogger
|
|(targetPath: java.io.File, settings: Seq[String]) => {
| val generators =
- | AkkaGrpcPlugin.generatorsFor(sources, languages, scalaBinaryVersion, logger) ++
- | Seq($extraGenerators).map(gen => GeneratorBridge.sandboxedGenerator(gen, scalaBinaryVersion, akka.grpc.gen.StdoutLogger))
- | AkkaGrpcPlugin.targetsFor(targetPath, settings, generators)
+ | PekkoGrpcPlugin.generatorsFor(sources, languages, scalaBinaryVersion, logger) ++
+ | Seq($extraGenerators).map(gen => GeneratorBridge.sandboxedGenerator(gen, scalaBinaryVersion, org.apache.pekko.grpc.gen.StdoutLogger))
+ | PekkoGrpcPlugin.targetsFor(targetPath, settings, generators)
|}
""".stripMargin
val generatorsF = tb.eval(tb.parse(source)).asInstanceOf[(File, Seq[String]) => Seq[Target]]
diff --git a/project/SbtMavenPlugin.scala b/project/SbtMavenPlugin.scala
index c32131ba..43b77bf8 100644
--- a/project/SbtMavenPlugin.scala
+++ b/project/SbtMavenPlugin.scala
@@ -1,4 +1,4 @@
-package akka.grpc
+package org.apache.pekko.grpc
import java.io.File
diff --git a/project/VersionGenerator.scala b/project/VersionGenerator.scala
index 3d6c79f8..588f9188 100644
--- a/project/VersionGenerator.scala
+++ b/project/VersionGenerator.scala
@@ -10,7 +10,8 @@ object VersionGenerator {
val settings: Seq[Setting[_]] = inConfig(Compile)(
Seq(
- resourceGenerators += generateVersion(resourceManaged, _ / "akka-grpc-version.conf", """|akka.grpc.version = "%s"
+ resourceGenerators += generateVersion(resourceManaged, _ / "pekko-grpc-version.conf",
+ """|pekko.grpc.version = "%s"
|""")))
def generateVersion(dir: SettingKey[File], locate: File => File, template: String) =
diff --git a/project/VersionSyncCheckPlugin.scala b/project/VersionSyncCheckPlugin.scala
index a74bbfc0..55fdf1e5 100644
--- a/project/VersionSyncCheckPlugin.scala
+++ b/project/VersionSyncCheckPlugin.scala
@@ -1,4 +1,4 @@
-package akka.grpc
+package org.apache.pekko.grpc
import java.nio.file.{ Files, Path, Paths }
@@ -28,14 +28,14 @@ object VersionSyncCheckPlugin extends AutoPlugin {
Paths.get("plugin-tester-java/pom.xml"),
Paths.get("plugin-tester-scala/pom.xml"),
Paths.get("sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt"),
- Paths.get("gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy"))).value,
+ Paths.get("gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy"))).value,
googleProtobufVersionSyncCheck := versionSyncCheckImpl(
"Google Protobuf",
Dependencies.Versions.googleProtobuf,
raw"""(?i)protoc_?version.*= ?"-?v?(\d+\.\d+\.\d+)"""".r.unanchored,
Seq(
Paths.get("maven-plugin/src/main/maven/plugin.xml"),
- Paths.get("gradle-plugin/src/main/groovy/akka/grpc/gradle/AkkaGrpcPluginExtension.groovy"))).value)
+ Paths.get("gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy"))).value)
def versionSyncCheckImpl(
name: String,
diff --git a/project/project-info.conf b/project/project-info.conf
index 1c19ae20..efecb927 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -31,9 +31,9 @@ project-info {
}
]
}
- akka-grpc-runtime: ${project-info.shared-info} {
- title: "Akka gRPC"
- jpms-name: "akka.grpc.runtime"
+ pekko-grpc-runtime: ${project-info.shared-info} {
+ title: "Apache Pekko gRPC"
+ jpms-name: "pekko.grpc.runtime"
levels: [
{
readiness: Supported
diff --git a/runtime/src/main/java/akka/grpc/AkkaGrpcGenerated.java b/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java
similarity index 73%
rename from runtime/src/main/java/akka/grpc/AkkaGrpcGenerated.java
rename to runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java
index 8dba0ff5..5677eb96 100644
--- a/runtime/src/main/java/akka/grpc/AkkaGrpcGenerated.java
+++ b/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java
@@ -2,10 +2,10 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc;
+package org.apache.pekko.grpc;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.CLASS)
-public @interface AkkaGrpcGenerated { }
+public @interface PekkoGrpcGenerated { }
diff --git a/runtime/src/main/resources/reference.conf b/runtime/src/main/resources/reference.conf
index 25d8b47a..28e33b81 100644
--- a/runtime/src/main/resources/reference.conf
+++ b/runtime/src/main/resources/reference.conf
@@ -1,6 +1,6 @@
//#defaults
-akka.grpc.client."*" {
- # netty or akka-http (experimental)
+pekko.grpc.client."*" {
+ # netty or pekko-http (experimental)
backend = "netty"
# Host to use if service-discovery-mechanism is set to static or grpc-dns
diff --git a/runtime/src/main/scala/akka/grpc/GrpcChannel.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala
similarity index 74%
rename from runtime/src/main/scala/akka/grpc/GrpcChannel.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala
index b403ff80..57fbbb5a 100644
--- a/runtime/src/main/scala/akka/grpc/GrpcChannel.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala
@@ -2,18 +2,18 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
import java.util.concurrent.CompletionStage
import scala.compat.java8.FutureConverters._
import scala.concurrent.Future
-import akka.Done
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.InternalStableApi
-import akka.grpc.internal.{ ChannelUtils, InternalChannel }
-import akka.grpc.scaladsl.Grpc
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.InternalStableApi
+import org.apache.pekko.grpc.internal.{ ChannelUtils, InternalChannel }
+import org.apache.pekko.grpc.scaladsl.Grpc
final class GrpcChannel private (
@InternalStableApi val settings: GrpcClientSettings,
@@ -37,7 +37,7 @@ final class GrpcChannel private (
/**
* Scala API: Initiates a shutdown in which preexisting and new calls are cancelled.
*/
- def close(): Future[akka.Done] = {
+ def close(): Future[org.apache.pekko.Done] = {
Grpc(sys).deregisterChannel(this)
ChannelUtils.close(internalChannel)
}
@@ -46,7 +46,7 @@ final class GrpcChannel private (
* Scala API: Returns a Future that completes successfully when channel is shut down via close()
* or exceptionally if a connection cannot be established or reestablished after maxConnectionAttempts.
*/
- def closed(): Future[akka.Done] =
+ def closed(): Future[org.apache.pekko.Done] =
internalChannel.done
}
@@ -54,6 +54,6 @@ object GrpcChannel {
def apply(settings: GrpcClientSettings)(implicit sys: ClassicActorSystemProvider): GrpcChannel = {
new GrpcChannel(
settings,
- ChannelUtils.create(settings, akka.event.Logging(sys.classicSystem, classOf[GrpcChannel])))
+ ChannelUtils.create(settings, org.apache.pekko.event.Logging(sys.classicSystem, classOf[GrpcChannel])))
}
}
diff --git a/runtime/src/main/scala/akka/grpc/GrpcClientCloseException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala
similarity index 90%
rename from runtime/src/main/scala/akka/grpc/GrpcClientCloseException.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala
index 36155058..cb94b290 100644
--- a/runtime/src/main/scala/akka/grpc/GrpcClientCloseException.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
/**
* Thrown if close() is called on a client that uses a shared channel.
diff --git a/runtime/src/main/scala/akka/grpc/GrpcClientResponse.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala
similarity index 75%
rename from runtime/src/main/scala/akka/grpc/GrpcClientResponse.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala
index 64e19de7..99bcde04 100644
--- a/runtime/src/main/scala/akka/grpc/GrpcClientResponse.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala
@@ -2,11 +2,11 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
import java.util.concurrent.CompletionStage
-import akka.annotation.{ ApiMayChange, DoNotInherit }
+import org.apache.pekko.annotation.{ ApiMayChange, DoNotInherit }
import scala.concurrent.Future
@@ -22,22 +22,22 @@ trait GrpcResponseMetadata {
/**
* Scala API: The response metadata, the metadata is only for reading and must not be mutated.
*/
- def headers: akka.grpc.scaladsl.Metadata
+ def headers: org.apache.pekko.grpc.scaladsl.Metadata
/**
* Java API: The response metadata, the metadata is only for reading and must not be mutated.
*/
- def getHeaders(): akka.grpc.javadsl.Metadata
+ def getHeaders(): org.apache.pekko.grpc.javadsl.Metadata
/**
* Scala API: Trailers from the server, is completed after the response stream completes
*/
- def trailers: Future[akka.grpc.scaladsl.Metadata]
+ def trailers: Future[org.apache.pekko.grpc.scaladsl.Metadata]
/**
* Java API: Trailers from the server, is completed after the response stream completes
*/
- def getTrailers(): CompletionStage[akka.grpc.javadsl.Metadata]
+ def getTrailers(): CompletionStage[org.apache.pekko.grpc.javadsl.Metadata]
}
/**
diff --git a/runtime/src/main/scala/akka/grpc/GrpcClientSettings.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala
similarity index 93%
rename from runtime/src/main/scala/akka/grpc/GrpcClientSettings.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala
index 8d680c2d..30f406f5 100644
--- a/runtime/src/main/scala/akka/grpc/GrpcClientSettings.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala
@@ -2,15 +2,15 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.{ ApiMayChange, InternalApi }
-import akka.discovery.{ Discovery, ServiceDiscovery }
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.grpc.internal.HardcodedServiceDiscovery
-import akka.util.Helpers
-import akka.util.JavaDurationConverters._
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.{ ApiMayChange, InternalApi }
+import org.apache.pekko.discovery.{ Discovery, ServiceDiscovery }
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.grpc.internal.HardcodedServiceDiscovery
+import org.apache.pekko.util.Helpers
+import org.apache.pekko.util.JavaDurationConverters._
import com.typesafe.config.{ Config, ConfigValueFactory }
import io.grpc.CallCredentials
import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder
@@ -31,7 +31,7 @@ object GrpcClientSettings {
val system = actorSystem.classicSystem
// default is static
val defaultServiceConfig = system.settings.config
- .getConfig("akka.grpc.client")
+ .getConfig("pekko.grpc.client")
.getConfig("\"*\"")
.withValue("host", ConfigValueFactory.fromAnyRef(host))
.withValue("port", ConfigValueFactory.fromAnyRef(port))
@@ -40,20 +40,20 @@ object GrpcClientSettings {
/**
* Look up client settings from an ActorSystem's configuration. Client configuration
- * must be under `akka.grpc.client`. Each client configuration falls back to the
+ * must be under `pekko.grpc.client`. Each client configuration falls back to the
* defaults defined in reference.conf
*
* @param clientName of the client configuration to lookup config from the ActorSystem's config
*/
def fromConfig(clientName: String)(implicit actorSystem: ClassicActorSystemProvider): GrpcClientSettings = {
val system = actorSystem.classicSystem
- val akkaGrpcClientConfig = system.settings.config.getConfig("akka.grpc.client")
+ val akkaGrpcClientConfig = system.settings.config.getConfig("pekko.grpc.client")
val clientConfig = {
// Use config named "*" by default
val defaultServiceConfig = akkaGrpcClientConfig.getConfig("\"*\"")
require(
akkaGrpcClientConfig.hasPath(s""""$clientName""""),
- s"Config path `akka.grpc.client.$clientName` does not exist")
+ s"Config path `pekko.grpc.client.$clientName` does not exist")
akkaGrpcClientConfig.getConfig(s""""$clientName"""").withFallback(defaultServiceConfig)
}
@@ -71,7 +71,7 @@ object GrpcClientSettings {
def usingServiceDiscovery(serviceName: String)(
implicit actorSystem: ClassicActorSystemProvider): GrpcClientSettings = {
val clientConfiguration: Config =
- actorSystem.classicSystem.settings.config.getConfig("akka.grpc.client").getConfig("\"*\"")
+ actorSystem.classicSystem.settings.config.getConfig("pekko.grpc.client").getConfig("\"*\"")
val resolveTimeout = clientConfiguration.getDuration("service-discovery.resolve-timeout").asScala
val discovery = Discovery.get(actorSystem).discovery
withConfigDefaults(serviceName, discovery, -1, resolveTimeout, clientConfiguration)
@@ -88,7 +88,7 @@ object GrpcClientSettings {
def usingServiceDiscovery(serviceName: String, discovery: ServiceDiscovery)(
implicit actorSystem: ClassicActorSystemProvider): GrpcClientSettings = {
val clientConfiguration: Config =
- actorSystem.classicSystem.settings.config.getConfig("akka.grpc.client").getConfig("\"*\"")
+ actorSystem.classicSystem.settings.config.getConfig("pekko.grpc.client").getConfig("\"*\"")
val resolveTimeout = clientConfiguration.getDuration("service-discovery.resolve-timeout").asScala
withConfigDefaults(serviceName, discovery, -1, resolveTimeout, clientConfiguration)
}
@@ -203,7 +203,7 @@ final class GrpcClientSettings private (
require(
if (sslContext.isDefined) sslProvider.forall(_ == SslProvider.JDK) else true,
"When sslContext is configured, sslProvider must not set to something different than JDK")
- require(backend == "netty" || backend == "akka-http", "backend should be 'netty' or 'akka-http'");
+ require(backend == "netty" || backend == "pekko-http", "backend should be 'netty' or 'pekko-http'");
/**
* If using ServiceDiscovery and no port is returned use this one.
diff --git a/runtime/src/main/scala/akka/grpc/GrpcProtocol.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala
similarity index 87%
rename from runtime/src/main/scala/akka/grpc/GrpcProtocol.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala
index a3ec6dca..5f94e76c 100644
--- a/runtime/src/main/scala/akka/grpc/GrpcProtocol.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala
@@ -2,18 +2,18 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
-
-import akka.NotUsed
-import akka.annotation.InternalApi
-import akka.annotation.InternalStableApi
-import akka.grpc.GrpcProtocol.{ GrpcProtocolReader, GrpcProtocolWriter }
-import akka.grpc.internal.{ Codec, Codecs, GrpcProtocolNative, GrpcProtocolWeb, GrpcProtocolWebText }
-import akka.http.javadsl.{ model => jmodel }
-import akka.http.scaladsl.model.{ ContentType, HttpHeader, HttpResponse, Trailer }
-import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart
-import akka.stream.scaladsl.Flow
-import akka.util.ByteString
+package org.apache.pekko.grpc
+
+import org.apache.pekko.NotUsed
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.annotation.InternalStableApi
+import org.apache.pekko.grpc.GrpcProtocol.{ GrpcProtocolReader, GrpcProtocolWriter }
+import org.apache.pekko.grpc.internal.{ Codec, Codecs, GrpcProtocolNative, GrpcProtocolWeb, GrpcProtocolWebText }
+import org.apache.pekko.http.javadsl.{ model => jmodel }
+import org.apache.pekko.http.scaladsl.model.{ ContentType, HttpHeader, HttpResponse, Trailer }
+import org.apache.pekko.http.scaladsl.model.HttpEntity.ChunkStreamPart
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.util.ByteString
import scala.collection.immutable
import scala.util.Try
diff --git a/runtime/src/main/scala/akka/grpc/GrpcServiceException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala
similarity index 89%
rename from runtime/src/main/scala/akka/grpc/GrpcServiceException.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala
index c78318b4..35a21f13 100644
--- a/runtime/src/main/scala/akka/grpc/GrpcServiceException.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala
@@ -2,12 +2,12 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
import io.grpc.{ Status, StatusRuntimeException }
-import akka.annotation.ApiMayChange
-import akka.grpc.scaladsl.{ Metadata, MetadataBuilder }
-import akka.grpc.internal.{ GrpcMetadataImpl, JavaMetadataImpl }
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.grpc.scaladsl.{ Metadata, MetadataBuilder }
+import org.apache.pekko.grpc.internal.{ GrpcMetadataImpl, JavaMetadataImpl }
import com.google.protobuf.any.Any
import io.grpc.protobuf.StatusProto
diff --git a/runtime/src/main/scala/akka/grpc/ProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala
similarity index 71%
rename from runtime/src/main/scala/akka/grpc/ProtobufSerializer.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala
index 45c44154..2f59c61c 100644
--- a/runtime/src/main/scala/akka/grpc/ProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
-import akka.grpc.internal.ByteStringUtils
-import akka.util.ByteString
+import org.apache.pekko.grpc.internal.ByteStringUtils
+import org.apache.pekko.util.ByteString
import java.io.InputStream
diff --git a/runtime/src/main/scala/akka/grpc/SSLContextUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala
similarity index 97%
rename from runtime/src/main/scala/akka/grpc/SSLContextUtils.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala
index e442088c..4b452a5e 100644
--- a/runtime/src/main/scala/akka/grpc/SSLContextUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
import java.io.{ BufferedInputStream, IOException, InputStream }
import java.security.KeyStore
diff --git a/runtime/src/main/scala/akka/grpc/ServiceDescription.scala b/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala
similarity index 74%
rename from runtime/src/main/scala/akka/grpc/ServiceDescription.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala
index 6f8da8cc..340f9634 100644
--- a/runtime/src/main/scala/akka/grpc/ServiceDescription.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala
@@ -2,9 +2,9 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
-import akka.annotation.ApiMayChange
+import org.apache.pekko.annotation.ApiMayChange
import com.google.protobuf.Descriptors.FileDescriptor;
diff --git a/runtime/src/main/scala/akka/grpc/Trailers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala
similarity index 73%
rename from runtime/src/main/scala/akka/grpc/Trailers.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala
index cbeabbac..50461ef9 100644
--- a/runtime/src/main/scala/akka/grpc/Trailers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
-import akka.annotation.ApiMayChange
+import org.apache.pekko.annotation.ApiMayChange
import io.grpc.Status
-import akka.grpc.internal.JavaMetadataImpl
-import akka.grpc.scaladsl.{ Metadata, MetadataBuilder }
-import akka.grpc.javadsl.{ Metadata => jMetadata }
+import org.apache.pekko.grpc.internal.JavaMetadataImpl
+import org.apache.pekko.grpc.scaladsl.{ Metadata, MetadataBuilder }
+import org.apache.pekko.grpc.javadsl.{ Metadata => jMetadata }
@ApiMayChange
class Trailers(val status: Status, val metadata: Metadata) {
diff --git a/runtime/src/main/scala/akka/grpc/internal/AbstractGrpcProtocol.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala
similarity index 87%
rename from runtime/src/main/scala/akka/grpc/internal/AbstractGrpcProtocol.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala
index 619d366c..8e1830a1 100644
--- a/runtime/src/main/scala/akka/grpc/internal/AbstractGrpcProtocol.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala
@@ -2,19 +2,19 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
-import akka.NotUsed
-import akka.grpc.GrpcProtocol
-import akka.grpc.GrpcProtocol.{ Frame, GrpcProtocolReader, GrpcProtocolWriter }
-import akka.http.javadsl.{ model => jmodel }
-import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart
-import akka.http.scaladsl.model.{ ContentType, HttpHeader, HttpResponse, MediaType, Trailer }
-import akka.stream.Attributes
-import akka.stream.impl.io.ByteStringParser
-import akka.stream.impl.io.ByteStringParser.{ ByteReader, ParseResult, ParseStep }
-import akka.stream.scaladsl.Flow
-import akka.stream.stage.GraphStageLogic
-import akka.util.{ ByteString, ByteStringBuilder }
+package org.apache.pekko.grpc.internal
+import org.apache.pekko.NotUsed
+import org.apache.pekko.grpc.GrpcProtocol
+import org.apache.pekko.grpc.GrpcProtocol.{ Frame, GrpcProtocolReader, GrpcProtocolWriter }
+import org.apache.pekko.http.javadsl.{ model => jmodel }
+import org.apache.pekko.http.scaladsl.model.HttpEntity.ChunkStreamPart
+import org.apache.pekko.http.scaladsl.model.{ ContentType, HttpHeader, HttpResponse, MediaType, Trailer }
+import org.apache.pekko.stream.Attributes
+import org.apache.pekko.stream.impl.io.ByteStringParser
+import org.apache.pekko.stream.impl.io.ByteStringParser.{ ByteReader, ParseResult, ParseStep }
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.stream.stage.GraphStageLogic
+import org.apache.pekko.util.{ ByteString, ByteStringBuilder }
import io.grpc.StatusException
import java.nio.ByteOrder
@@ -73,7 +73,7 @@ object AbstractGrpcProtocol {
})
.toContentType
- @deprecated("2.1.0", "In favor of overload that takes Booleans to specify flags")
+ @deprecated("In favor of overload that takes Booleans to specify flags", "akka-grpc 2.1.0")
def encodeFrameData(frameType: ByteString, data: ByteString): ByteString = {
val length = data.length
val encodedLength = ByteString.fromArrayUnsafe(
diff --git a/runtime/src/main/scala/akka/grpc/internal/ByteStringUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala
similarity index 78%
rename from runtime/src/main/scala/akka/grpc/internal/ByteStringUtils.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala
index dc6ab099..87be75c7 100644
--- a/runtime/src/main/scala/akka/grpc/internal/ByteStringUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.annotation.InternalApi
-import akka.util.ByteString
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.util.ByteString
import io.grpc.KnownLength
import java.io.{ ByteArrayOutputStream, InputStream }
@@ -25,11 +25,11 @@ private[grpc] object ByteStringUtils {
val nextByte = if (initialBytes < 0) -1 else stream.read() // Test for EOF
if (nextByte == -1) {
- if (initialBytes < 1) akka.util.ByteString.empty // EOF immediately
+ if (initialBytes < 1) org.apache.pekko.util.ByteString.empty // EOF immediately
else {
// WARNING: buffer is retained in full below,
// which could be problematic if ProtobufSerializer.deserialize keeps a reference to the ByteString
- akka.util.ByteString.fromArrayUnsafe(buffer, 0, initialBytes)
+ org.apache.pekko.util.ByteString.fromArrayUnsafe(buffer, 0, initialBytes)
}
} else {
val baos = new ByteArrayOutputStream(buffer.length * 2) // To avoid immediate resize
@@ -42,7 +42,7 @@ private[grpc] object ByteStringUtils {
bytesRead = stream.read(buffer)
}
- akka.util.ByteString.fromArrayUnsafe(baos.toByteArray)
+ org.apache.pekko.util.ByteString.fromArrayUnsafe(baos.toByteArray)
}
}
}
diff --git a/runtime/src/main/scala/akka/grpc/internal/CancellationBarrierGraphStage.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala
similarity index 85%
rename from runtime/src/main/scala/akka/grpc/internal/CancellationBarrierGraphStage.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala
index c2ca3bc3..7fce1692 100644
--- a/runtime/src/main/scala/akka/grpc/internal/CancellationBarrierGraphStage.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.stream.{ Attributes, FlowShape, Inlet, Outlet }
-import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler }
+import org.apache.pekko.stream.{ Attributes, FlowShape, Inlet, Outlet }
+import org.apache.pekko.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler }
/**
* 'barrier' that makes sure that, even when downstream is cancelled,
diff --git a/runtime/src/main/scala/akka/grpc/internal/ChannelUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala
similarity index 83%
rename from runtime/src/main/scala/akka/grpc/internal/ChannelUtils.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala
index 23745578..5514b241 100644
--- a/runtime/src/main/scala/akka/grpc/internal/ChannelUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala
@@ -2,14 +2,14 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.Done
+import org.apache.pekko.Done
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.InternalApi
-import akka.event.LoggingAdapter
-import akka.grpc.GrpcClientSettings
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.grpc.GrpcClientSettings
import io.grpc.{ ConnectivityState, ManagedChannel }
@@ -34,13 +34,13 @@ object ChannelUtils {
* INTERNAL API
*/
@InternalApi
- private[akka] def create(settings: GrpcClientSettings, log: LoggingAdapter)(
+ private[pekko] def create(settings: GrpcClientSettings, log: LoggingAdapter)(
implicit sys: ClassicActorSystemProvider): InternalChannel = {
settings.backend match {
case "netty" =>
NettyClientUtils.createChannel(settings, log)(sys.classicSystem.dispatcher)
- case "akka-http" =>
- AkkaHttpClientUtils.createChannel(settings, log)
+ case "pekko-http" =>
+ PekkoHttpClientUtils.createChannel(settings, log)
case _ => throw new IllegalArgumentException(s"Unexpected backend [${settings.backend}]")
}
}
@@ -58,7 +58,7 @@ object ChannelUtils {
* INTERNAL API
*/
@InternalApi
- private[akka] def monitorChannel(
+ private[pekko] def monitorChannel(
ready: Promise[Unit],
done: Promise[Done],
channel: ManagedChannel,
diff --git a/runtime/src/main/scala/akka/grpc/internal/ClientState.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala
similarity index 80%
rename from runtime/src/main/scala/akka/grpc/internal/ClientState.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala
index 5ee0bbc1..97484180 100644
--- a/runtime/src/main/scala/akka/grpc/internal/ClientState.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala
@@ -2,17 +2,17 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.util.concurrent.CompletionStage
import scala.concurrent.Future
-import akka.Done
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.event.LoggingAdapter
-import akka.grpc.{ GrpcChannel, GrpcClientSettings }
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.{ InternalApi, InternalStableApi }
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.grpc.{ GrpcChannel, GrpcClientSettings }
/**
* INTERNAL API
diff --git a/runtime/src/main/scala/akka/grpc/internal/Codec.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala
similarity index 86%
rename from runtime/src/main/scala/akka/grpc/internal/Codec.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala
index 606f7fc2..222cc624 100644
--- a/runtime/src/main/scala/akka/grpc/internal/Codec.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala
@@ -2,9 +2,9 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
abstract class Codec {
val name: String
diff --git a/runtime/src/main/scala/akka/grpc/internal/Codecs.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala
similarity index 89%
rename from runtime/src/main/scala/akka/grpc/internal/Codecs.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala
index b3a3215b..736d4291 100644
--- a/runtime/src/main/scala/akka/grpc/internal/Codecs.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala
@@ -2,12 +2,12 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.http.javadsl.{ model => jm }
-import akka.http.scaladsl.{ model => sm }
-import akka.grpc.GrpcServiceException
-import akka.grpc.scaladsl.headers.{ `Message-Accept-Encoding`, `Message-Encoding` }
+import org.apache.pekko.http.javadsl.{ model => jm }
+import org.apache.pekko.http.scaladsl.{ model => sm }
+import org.apache.pekko.grpc.GrpcServiceException
+import org.apache.pekko.grpc.scaladsl.headers.{ `Message-Accept-Encoding`, `Message-Encoding` }
import io.grpc.Status
import scala.collection.immutable
import scala.util.{ Failure, Success, Try }
diff --git a/runtime/src/main/scala/akka/grpc/internal/DecodeBase64.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala
similarity index 75%
rename from runtime/src/main/scala/akka/grpc/internal/DecodeBase64.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala
index b4cad26d..8d6dd37b 100644
--- a/runtime/src/main/scala/akka/grpc/internal/DecodeBase64.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala
@@ -2,19 +2,19 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.NotUsed
-import akka.annotation.InternalApi
-import akka.stream.scaladsl.Flow
-import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler }
-import akka.stream.{ Attributes, FlowShape, Inlet, Outlet }
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler }
+import org.apache.pekko.stream.{ Attributes, FlowShape, Inlet, Outlet }
+import org.apache.pekko.util.ByteString
/**
* INTERNAL API
*/
-@InternalApi private[akka] object DecodeBase64 {
+@InternalApi private[pekko] object DecodeBase64 {
def apply(): Flow[ByteString, ByteString, NotUsed] =
Flow[ByteString].via(new DecodeBase64)
}
@@ -22,7 +22,7 @@ import akka.util.ByteString
/**
* INTERNAL API
*/
-@InternalApi private[akka] class DecodeBase64 extends GraphStage[FlowShape[ByteString, ByteString]] {
+@InternalApi private[pekko] class DecodeBase64 extends GraphStage[FlowShape[ByteString, ByteString]] {
private val in = Inlet[ByteString]("DecodeBase64.in")
private val out = Outlet[ByteString]("DecodeBase64.out")
diff --git a/runtime/src/main/scala/akka/grpc/internal/GrpcEntityHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala
similarity index 77%
rename from runtime/src/main/scala/akka/grpc/internal/GrpcEntityHelpers.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala
index a90909a3..20f28aea 100644
--- a/runtime/src/main/scala/akka/grpc/internal/GrpcEntityHelpers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala
@@ -2,18 +2,18 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.NotUsed
-import akka.actor.{ ActorSystem, ClassicActorSystemProvider }
-import akka.annotation.InternalApi
-import akka.grpc.{ GrpcServiceException, ProtobufSerializer, Trailers }
-import akka.grpc.GrpcProtocol.{ DataFrame, Frame, GrpcProtocolWriter, TrailerFrame }
-import akka.grpc.scaladsl.{ headers, BytesEntry, Metadata, MetadataEntry, StringEntry }
-import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart
-import akka.http.scaladsl.model.HttpHeader
-import akka.http.scaladsl.model.headers.RawHeader
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.{ ActorSystem, ClassicActorSystemProvider }
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.grpc.{ GrpcServiceException, ProtobufSerializer, Trailers }
+import org.apache.pekko.grpc.GrpcProtocol.{ DataFrame, Frame, GrpcProtocolWriter, TrailerFrame }
+import org.apache.pekko.grpc.scaladsl.{ headers, BytesEntry, Metadata, MetadataEntry, StringEntry }
+import org.apache.pekko.http.scaladsl.model.HttpEntity.ChunkStreamPart
+import org.apache.pekko.http.scaladsl.model.HttpHeader
+import org.apache.pekko.http.scaladsl.model.headers.RawHeader
+import org.apache.pekko.stream.scaladsl.Source
import io.grpc.Status
/** INTERNAL API */
@@ -43,8 +43,8 @@ object GrpcEntityHelpers {
def apply[T](e: T)(implicit m: ProtobufSerializer[T], writer: GrpcProtocolWriter): Source[ChunkStreamPart, NotUsed] =
chunks(Source.single(e), Source.empty)
- import akka.stream._
- import akka.stream.scaladsl._
+ import org.apache.pekko.stream._
+ import org.apache.pekko.stream.scaladsl._
import scala.annotation.unchecked.uncheckedVariance
// A faster implementation of concat that does not allocate so much
private def concatCheap[U, Mat2](that: Graph[SourceShape[U], Mat2]): Graph[FlowShape[U @uncheckedVariance, U], Mat2] =
diff --git a/runtime/src/main/scala/akka/grpc/internal/GrpcProtocolNative.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala
similarity index 88%
rename from runtime/src/main/scala/akka/grpc/internal/GrpcProtocolNative.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala
index 473145e8..f6c93f37 100644
--- a/runtime/src/main/scala/akka/grpc/internal/GrpcProtocolNative.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala
@@ -2,11 +2,11 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.grpc.GrpcProtocol._
-import akka.http.scaladsl.model.HttpEntity.{ Chunk, ChunkStreamPart, LastChunk }
-import akka.http.scaladsl.model.{
+import org.apache.pekko.grpc.GrpcProtocol._
+import org.apache.pekko.http.scaladsl.model.HttpEntity.{ Chunk, ChunkStreamPart, LastChunk }
+import org.apache.pekko.http.scaladsl.model.{
AttributeKey,
AttributeKeys,
HttpEntity,
@@ -16,7 +16,7 @@ import akka.http.scaladsl.model.{
StatusCodes,
Trailer
}
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
import scala.annotation.nowarn
import scala.collection.immutable
diff --git a/runtime/src/main/scala/akka/grpc/internal/GrpcProtocolWeb.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala
similarity index 91%
rename from runtime/src/main/scala/akka/grpc/internal/GrpcProtocolWeb.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala
index c4429a6e..dddc63ff 100644
--- a/runtime/src/main/scala/akka/grpc/internal/GrpcProtocolWeb.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala
@@ -2,14 +2,14 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
-
-import akka.NotUsed
-import akka.grpc.GrpcProtocol._
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.HttpEntity.{ Chunk, ChunkStreamPart }
-import akka.stream.scaladsl.Flow
-import akka.util.{ ByteString, ByteStringBuilder }
+package org.apache.pekko.grpc.internal
+
+import org.apache.pekko.NotUsed
+import org.apache.pekko.grpc.GrpcProtocol._
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.model.HttpEntity.{ Chunk, ChunkStreamPart }
+import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko.util.{ ByteString, ByteStringBuilder }
import io.grpc.{ Status, StatusException }
import scala.collection.immutable
diff --git a/runtime/src/main/scala/akka/grpc/internal/GrpcRequestHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala
similarity index 62%
rename from runtime/src/main/scala/akka/grpc/internal/GrpcRequestHelpers.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala
index a724f7ea..647108ee 100644
--- a/runtime/src/main/scala/akka/grpc/internal/GrpcRequestHelpers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala
@@ -2,20 +2,20 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.grpc.{ ProtobufSerializer, Trailers }
-import akka.grpc.GrpcProtocol.GrpcProtocolWriter
-import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart
-import akka.stream.scaladsl.Source
-import akka.NotUsed
-import akka.annotation.InternalApi
-import akka.grpc.scaladsl.GrpcExceptionHandler
-import akka.grpc.scaladsl.headers._
-import akka.http.scaladsl.model
-import akka.http.scaladsl.model.{ HttpEntity, HttpHeader, HttpMethods, HttpRequest, TransferEncodings, Uri }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.grpc.{ ProtobufSerializer, Trailers }
+import org.apache.pekko.grpc.GrpcProtocol.GrpcProtocolWriter
+import org.apache.pekko.http.scaladsl.model.HttpEntity.ChunkStreamPart
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.grpc.scaladsl.GrpcExceptionHandler
+import org.apache.pekko.grpc.scaladsl.headers._
+import org.apache.pekko.http.scaladsl.model
+import org.apache.pekko.http.scaladsl.model.{ HttpEntity, HttpHeader, HttpMethods, HttpRequest, TransferEncodings, Uri }
import scala.collection.immutable
diff --git a/runtime/src/main/scala/akka/grpc/internal/GrpcResponseHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala
similarity index 83%
rename from runtime/src/main/scala/akka/grpc/internal/GrpcResponseHelpers.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala
index 7be5fc0f..102b1bb7 100644
--- a/runtime/src/main/scala/akka/grpc/internal/GrpcResponseHelpers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala
@@ -2,19 +2,19 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.NotUsed
-import akka.actor.{ ActorSystem, ClassicActorSystemProvider }
-import akka.annotation.InternalApi
-import akka.grpc.GrpcProtocol.{ GrpcProtocolWriter, TrailerFrame }
-import akka.grpc.scaladsl.{ headers, GrpcExceptionHandler }
-import akka.grpc.{ ProtobufSerializer, Trailers }
-import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart
-import akka.http.scaladsl.model.{ HttpEntity, HttpResponse, Trailer }
-import akka.stream.Materializer
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.{ ActorSystem, ClassicActorSystemProvider }
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.grpc.GrpcProtocol.{ GrpcProtocolWriter, TrailerFrame }
+import org.apache.pekko.grpc.scaladsl.{ headers, GrpcExceptionHandler }
+import org.apache.pekko.grpc.{ ProtobufSerializer, Trailers }
+import org.apache.pekko.http.scaladsl.model.HttpEntity.ChunkStreamPart
+import org.apache.pekko.http.scaladsl.model.{ HttpEntity, HttpResponse, Trailer }
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
import io.grpc.Status
import scala.collection.immutable
diff --git a/runtime/src/main/scala/akka/grpc/internal/Gzip.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala
similarity index 93%
rename from runtime/src/main/scala/akka/grpc/internal/Gzip.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala
index 10b2c7fa..0020d346 100644
--- a/runtime/src/main/scala/akka/grpc/internal/Gzip.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala
@@ -2,12 +2,12 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.io.{ ByteArrayInputStream, ByteArrayOutputStream }
import java.util.zip.{ GZIPInputStream, GZIPOutputStream }
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
object Gzip extends Codec {
override val name: String = "gzip"
diff --git a/runtime/src/main/scala/akka/grpc/internal/HardcodedServiceDiscovery.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala
similarity index 69%
rename from runtime/src/main/scala/akka/grpc/internal/HardcodedServiceDiscovery.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala
index a974d9e8..bc94518b 100644
--- a/runtime/src/main/scala/akka/grpc/internal/HardcodedServiceDiscovery.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.discovery.{ Lookup, ServiceDiscovery }
-import akka.discovery.ServiceDiscovery.Resolved
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.discovery.ServiceDiscovery.Resolved
import scala.concurrent.Future
import scala.concurrent.duration.FiniteDuration
diff --git a/runtime/src/main/scala/akka/grpc/internal/Identity.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala
similarity index 88%
rename from runtime/src/main/scala/akka/grpc/internal/Identity.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala
index 12e4f7d4..3f95768e 100644
--- a/runtime/src/main/scala/akka/grpc/internal/Identity.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala
@@ -2,9 +2,9 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
import io.grpc.{ Status, StatusException }
object Identity extends Codec {
diff --git a/runtime/src/main/scala/akka/grpc/internal/InternalChannel.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala
similarity index 77%
rename from runtime/src/main/scala/akka/grpc/internal/InternalChannel.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala
index 50e98b9d..e56f5846 100644
--- a/runtime/src/main/scala/akka/grpc/internal/InternalChannel.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import scala.concurrent.Future
-import akka.{ Done, NotUsed }
-import akka.annotation.InternalApi
-import akka.grpc.{ GrpcResponseMetadata, GrpcSingleResponse }
-import akka.stream.scaladsl.Source
+import org.apache.pekko.{ Done, NotUsed }
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.grpc.{ GrpcResponseMetadata, GrpcSingleResponse }
+import org.apache.pekko.stream.scaladsl.Source
import io.grpc.{ CallOptions, MethodDescriptor }
/**
diff --git a/runtime/src/main/scala/akka/grpc/internal/Marshallers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala
similarity index 89%
rename from runtime/src/main/scala/akka/grpc/internal/Marshallers.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala
index afe03981..5905f5f7 100644
--- a/runtime/src/main/scala/akka/grpc/internal/Marshallers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.io.{ ByteArrayInputStream, InputStream }
import io.grpc.KnownLength
-import akka.annotation.InternalStableApi
-import akka.grpc.ProtobufSerializer
+import org.apache.pekko.annotation.InternalStableApi
+import org.apache.pekko.grpc.ProtobufSerializer
/**
* INTERNAL API
diff --git a/runtime/src/main/scala/akka/grpc/internal/MetadataImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala
similarity index 93%
rename from runtime/src/main/scala/akka/grpc/internal/MetadataImpl.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala
index b566157f..cd5a27f9 100644
--- a/runtime/src/main/scala/akka/grpc/internal/MetadataImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala
@@ -2,21 +2,21 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.util.{ List => jList, Locale, Map => jMap, Optional }
import scala.collection.JavaConverters._
import scala.collection.immutable
import scala.compat.java8.OptionConverters._
-import akka.annotation.InternalApi
-import akka.http.scaladsl.model.HttpHeader
-import akka.japi.Pair
-import akka.util.ByteString
-import akka.grpc.scaladsl.{ BytesEntry, Metadata, MetadataEntry, StringEntry }
-import akka.grpc.javadsl
-
-@InternalApi private[akka] object MetadataImpl {
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.http.scaladsl.model.HttpHeader
+import org.apache.pekko.japi.Pair
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.grpc.scaladsl.{ BytesEntry, Metadata, MetadataEntry, StringEntry }
+import org.apache.pekko.grpc.javadsl
+
+@InternalApi private[pekko] object MetadataImpl {
val BINARY_SUFFIX: String = io.grpc.Metadata.BINARY_HEADER_SUFFIX
val empty = new MetadataImpl(List.empty)
@@ -53,7 +53,7 @@ import akka.grpc.javadsl
}
}
-@InternalApi private[akka] final class MetadataImpl(val entries: List[(String, MetadataEntry)]) {
+@InternalApi private[pekko] final class MetadataImpl(val entries: List[(String, MetadataEntry)]) {
def addEntry(key: String, value: String): MetadataImpl = {
if (key.endsWith(MetadataImpl.BINARY_SUFFIX))
throw new IllegalArgumentException(s"String header names must not end with '${MetadataImpl.BINARY_SUFFIX}'")
diff --git a/runtime/src/main/scala/akka/grpc/internal/MissingParameterException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala
similarity index 76%
rename from runtime/src/main/scala/akka/grpc/internal/MissingParameterException.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala
index 4e2a8a02..68d1c53b 100644
--- a/runtime/src/main/scala/akka/grpc/internal/MissingParameterException.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala
@@ -2,6 +2,6 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
class MissingParameterException extends Throwable
diff --git a/runtime/src/main/scala/akka/grpc/internal/NettyClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
similarity index 93%
rename from runtime/src/main/scala/akka/grpc/internal/NettyClientUtils.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
index dc34ba79..865cd39c 100644
--- a/runtime/src/main/scala/akka/grpc/internal/NettyClientUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.util.concurrent.TimeUnit
import javax.net.ssl.SSLContext
-import akka.{ Done, NotUsed }
-import akka.annotation.InternalApi
-import akka.event.LoggingAdapter
-import akka.grpc.{ GrpcClientSettings, GrpcResponseMetadata, GrpcSingleResponse }
-import akka.stream.scaladsl.{ Flow, Keep, Source }
+import org.apache.pekko.{ Done, NotUsed }
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.grpc.{ GrpcClientSettings, GrpcResponseMetadata, GrpcSingleResponse }
+import org.apache.pekko.stream.scaladsl.{ Flow, Keep, Source }
import io.grpc.{ CallOptions, MethodDescriptor }
import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts
import io.grpc.netty.shaded.io.grpc.netty.NegotiationType
@@ -45,7 +45,7 @@ object NettyClientUtils {
.flowControlWindow(NettyChannelBuilder.DEFAULT_FLOW_CONTROL_WINDOW)
// TODO avoid nameResolverFactory #1092, then 'nowarn' can be removed above
.nameResolverFactory(
- new AkkaDiscoveryNameResolverProvider(
+ new PekkoDiscoveryNameResolverProvider(
settings.serviceDiscovery,
settings.defaultPort,
settings.servicePortName,
@@ -159,7 +159,7 @@ object NettyClientUtils {
descriptor: MethodDescriptor[I, O],
streamingResponse: Boolean,
options: CallOptions): Flow[I, O, Future[GrpcResponseMetadata]] =
- Flow.fromGraph(new AkkaNettyGrpcClientGraphStage(descriptor, channel, options, streamingResponse, headers))
+ Flow.fromGraph(new PekkoNettyGrpcClientGraphStage(descriptor, channel, options, streamingResponse, headers))
}
}
@@ -200,7 +200,7 @@ object NettyClientUtils {
/**
* INTERNAL API
*/
- @InternalApi private[akka] def callOptionsWithDeadline(
+ @InternalApi private[pekko] def callOptionsWithDeadline(
defaultOptions: CallOptions,
settings: GrpcClientSettings): CallOptions =
settings.deadline match {
diff --git a/runtime/src/main/scala/akka/grpc/internal/AkkaDiscoveryNameResolver.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala
similarity index 86%
rename from runtime/src/main/scala/akka/grpc/internal/AkkaDiscoveryNameResolver.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala
index 733c3243..bcb29f17 100644
--- a/runtime/src/main/scala/akka/grpc/internal/AkkaDiscoveryNameResolver.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.net.{ InetAddress, InetSocketAddress, UnknownHostException }
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.discovery.{ Lookup, ServiceDiscovery }
-import akka.grpc.GrpcClientSettings
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.grpc.GrpcClientSettings
import io.grpc.{ Attributes, EquivalentAddressGroup, NameResolver, Status }
import io.grpc.NameResolver.Listener
@@ -16,7 +16,7 @@ import scala.concurrent.duration.FiniteDuration
import scala.concurrent.{ ExecutionContext, Promise }
import scala.util.{ Failure, Success }
-class AkkaDiscoveryNameResolver(
+class PekkoDiscoveryNameResolver(
discovery: ServiceDiscovery,
defaultPort: Int,
serviceName: String,
@@ -70,9 +70,9 @@ class AkkaDiscoveryNameResolver(
override def shutdown(): Unit = ()
}
-object AkkaDiscoveryNameResolver {
- def apply(settings: GrpcClientSettings)(implicit ec: ExecutionContext): AkkaDiscoveryNameResolver =
- new AkkaDiscoveryNameResolver(
+object PekkoDiscoveryNameResolver {
+ def apply(settings: GrpcClientSettings)(implicit ec: ExecutionContext): PekkoDiscoveryNameResolver =
+ new PekkoDiscoveryNameResolver(
settings.serviceDiscovery,
settings.defaultPort,
settings.serviceName,
diff --git a/runtime/src/main/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProvider.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala
similarity index 72%
rename from runtime/src/main/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProvider.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala
index bdc9528e..4f5c2163 100644
--- a/runtime/src/main/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProvider.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala
@@ -2,17 +2,17 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.net.URI
-import akka.discovery.ServiceDiscovery
+import org.apache.pekko.discovery.ServiceDiscovery
import io.grpc.{ NameResolver, NameResolverProvider }
import scala.concurrent.ExecutionContext
import scala.concurrent.duration.FiniteDuration
-class AkkaDiscoveryNameResolverProvider(
+class PekkoDiscoveryNameResolverProvider(
discovery: ServiceDiscovery,
defaultPort: Int,
portName: Option[String],
@@ -25,8 +25,8 @@ class AkkaDiscoveryNameResolverProvider(
override def getDefaultScheme: String = "http"
- override def newNameResolver(targetUri: URI, args: NameResolver.Args): AkkaDiscoveryNameResolver = {
+ override def newNameResolver(targetUri: URI, args: NameResolver.Args): PekkoDiscoveryNameResolver = {
require(targetUri.getAuthority != null, s"target uri should not have null authority, got [$targetUri]")
- new AkkaDiscoveryNameResolver(discovery, defaultPort, targetUri.getAuthority, portName, protocol, resolveTimeout)
+ new PekkoDiscoveryNameResolver(discovery, defaultPort, targetUri.getAuthority, portName, protocol, resolveTimeout)
}
}
diff --git a/runtime/src/main/scala/akka/grpc/internal/AkkaHttpClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
similarity index 88%
rename from runtime/src/main/scala/akka/grpc/internal/AkkaHttpClientUtils.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
index 8ce9721b..53143d29 100644
--- a/runtime/src/main/scala/akka/grpc/internal/AkkaHttpClientUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
@@ -2,25 +2,32 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.net.InetSocketAddress
import java.security.SecureRandom
import java.util.concurrent.CompletionStage
import scala.concurrent.duration._
-import akka.{ Done, NotUsed }
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.InternalApi
-import akka.event.LoggingAdapter
-import akka.grpc.GrpcProtocol.GrpcProtocolReader
-import akka.grpc.{ GrpcClientSettings, GrpcResponseMetadata, GrpcSingleResponse, ProtobufSerializer }
-import akka.http.scaladsl.model.HttpEntity.{ Chunk, Chunked, LastChunk, Strict }
-import akka.http.scaladsl.{ ClientTransport, ConnectionContext, Http }
-import akka.http.scaladsl.model.{ AttributeKey, HttpHeader, HttpRequest, HttpResponse, RequestResponseAssociation, Uri }
-import akka.http.scaladsl.settings.ClientConnectionSettings
-import akka.stream.{ Materializer, OverflowStrategy }
-import akka.stream.scaladsl.{ Keep, Sink, Source }
-import akka.util.ByteString
+import org.apache.pekko.{ Done, NotUsed }
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.grpc.GrpcProtocol.GrpcProtocolReader
+import org.apache.pekko.grpc.{ GrpcClientSettings, GrpcResponseMetadata, GrpcSingleResponse, ProtobufSerializer }
+import org.apache.pekko.http.scaladsl.model.HttpEntity.{ Chunk, Chunked, LastChunk, Strict }
+import org.apache.pekko.http.scaladsl.{ ClientTransport, ConnectionContext, Http }
+import org.apache.pekko.http.scaladsl.model.{
+ AttributeKey,
+ HttpHeader,
+ HttpRequest,
+ HttpResponse,
+ RequestResponseAssociation,
+ Uri
+}
+import org.apache.pekko.http.scaladsl.settings.ClientConnectionSettings
+import org.apache.pekko.stream.{ Materializer, OverflowStrategy }
+import org.apache.pekko.stream.scaladsl.{ Keep, Sink, Source }
+import org.apache.pekko.util.ByteString
import io.grpc.{ CallOptions, MethodDescriptor, Status, StatusRuntimeException }
import javax.net.ssl.{ KeyManager, SSLContext, TrustManager }
@@ -28,13 +35,13 @@ import scala.collection.immutable
import scala.compat.java8.FutureConverters.FutureOps
import scala.concurrent.{ ExecutionContext, Future, Promise }
import scala.util.{ Failure, Success }
-import akka.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.model.StatusCodes
/**
* INTERNAL API
*/
@InternalApi
-object AkkaHttpClientUtils {
+object PekkoHttpClientUtils {
/**
* INTERNAL API
@@ -233,18 +240,19 @@ object AkkaHttpClientUtils {
.map(deserializer.deserialize)
.mapMaterializedValue(_ =>
Future.successful(new GrpcResponseMetadata() {
- override def headers: akka.grpc.scaladsl.Metadata =
+ override def headers: org.apache.pekko.grpc.scaladsl.Metadata =
new HeaderMetadataImpl(response.headers)
- override def getHeaders(): akka.grpc.javadsl.Metadata =
+ override def getHeaders(): org.apache.pekko.grpc.javadsl.Metadata =
new JavaMetadataImpl(new HeaderMetadataImpl(response.headers))
- override def trailers: Future[akka.grpc.scaladsl.Metadata] =
+ override def trailers: Future[org.apache.pekko.grpc.scaladsl.Metadata] =
trailerPromise.future.map(new HeaderMetadataImpl(_))
- override def getTrailers(): CompletionStage[akka.grpc.javadsl.Metadata] =
+ override def getTrailers(): CompletionStage[org.apache.pekko.grpc.javadsl.Metadata] =
trailerPromise.future
- .map[akka.grpc.javadsl.Metadata](h => new JavaMetadataImpl(new HeaderMetadataImpl(h)))
+ .map[org.apache.pekko.grpc.javadsl.Metadata](h =>
+ new JavaMetadataImpl(new HeaderMetadataImpl(h)))
.toJava
}))
case Failure(e) =>
diff --git a/runtime/src/main/scala/akka/grpc/internal/AkkaNettyGrpcClientGraphStage.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala
similarity index 93%
rename from runtime/src/main/scala/akka/grpc/internal/AkkaNettyGrpcClientGraphStage.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala
index b388e52c..b2424553 100644
--- a/runtime/src/main/scala/akka/grpc/internal/AkkaNettyGrpcClientGraphStage.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala
@@ -2,21 +2,21 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
-
-import akka.annotation.InternalApi
-import akka.dispatch.ExecutionContexts
-import akka.grpc.GrpcResponseMetadata
-import akka.stream
-import akka.stream.{ Attributes => _, _ }
-import akka.stream.stage._
+package org.apache.pekko.grpc.internal
+
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.dispatch.ExecutionContexts
+import org.apache.pekko.grpc.GrpcResponseMetadata
+import org.apache.pekko.stream
+import org.apache.pekko.stream.{ Attributes => _, _ }
+import org.apache.pekko.stream.stage._
import io.grpc._
import scala.concurrent.{ Future, Promise }
import scala.compat.java8.FutureConverters._
@InternalApi
-private object AkkaNettyGrpcClientGraphStage {
+private object PekkoNettyGrpcClientGraphStage {
sealed trait ControlMessage
case object ReadyForSending extends ControlMessage
case class Closed(status: Status, trailer: Metadata) extends ControlMessage
@@ -37,7 +37,7 @@ private object AkkaNettyGrpcClientGraphStage {
* @param streamingResponse Do we expect a stream of responses or does more than 1 response mean a faulty server?
*/
@InternalApi
-private final class AkkaNettyGrpcClientGraphStage[I, O](
+private final class PekkoNettyGrpcClientGraphStage[I, O](
descriptor: MethodDescriptor[I, O],
channel: Channel,
options: CallOptions,
@@ -52,7 +52,7 @@ private final class AkkaNettyGrpcClientGraphStage[I, O](
def createLogicAndMaterializedValue(
inheritedAttributes: stream.Attributes): (GraphStageLogic, Future[GrpcResponseMetadata]) = {
- import AkkaNettyGrpcClientGraphStage._
+ import PekkoNettyGrpcClientGraphStage._
val matVal = Promise[GrpcResponseMetadata]()
val trailerPromise = Promise[Metadata]()
diff --git a/runtime/src/main/scala/akka/grpc/internal/RequestBuilderImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala
similarity index 92%
rename from runtime/src/main/scala/akka/grpc/internal/RequestBuilderImpl.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala
index 9ad055e2..7ebbfc29 100644
--- a/runtime/src/main/scala/akka/grpc/internal/RequestBuilderImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala
@@ -2,23 +2,23 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.util.concurrent.CompletionStage
-import akka.NotUsed
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.dispatch.ExecutionContexts
-import akka.grpc.{ GrpcResponseMetadata, GrpcSingleResponse }
-import akka.stream.Materializer
-import akka.stream.javadsl.{ Source => JavaSource }
-import akka.stream.scaladsl.{ Keep, Sink, Source }
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.annotation.{ InternalApi, InternalStableApi }
+import org.apache.pekko.dispatch.ExecutionContexts
+import org.apache.pekko.grpc.{ GrpcResponseMetadata, GrpcSingleResponse }
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.javadsl.{ Source => JavaSource }
+import org.apache.pekko.stream.scaladsl.{ Keep, Sink, Source }
+import org.apache.pekko.util.ByteString
import io.grpc._
import scala.compat.java8.FutureConverters._
import scala.concurrent.{ ExecutionContext, Future }
-import akka.grpc.GrpcClientSettings
+import org.apache.pekko.grpc.GrpcClientSettings
/**
* INTERNAL API
@@ -30,7 +30,7 @@ final class ScalaUnaryRequestBuilder[I, O](
defaultOptions: CallOptions,
settings: GrpcClientSettings,
val headers: MetadataImpl)(implicit ec: ExecutionContext)
- extends akka.grpc.scaladsl.SingleResponseRequestBuilder[I, O]
+ extends org.apache.pekko.grpc.scaladsl.SingleResponseRequestBuilder[I, O]
with MetadataOperations[ScalaUnaryRequestBuilder[I, O]] {
@InternalStableApi
def this(
@@ -63,7 +63,7 @@ final class JavaUnaryRequestBuilder[I, O](
defaultOptions: CallOptions,
settings: GrpcClientSettings,
val headers: MetadataImpl)(implicit ex: ExecutionContext)
- extends akka.grpc.javadsl.SingleResponseRequestBuilder[I, O]
+ extends org.apache.pekko.grpc.javadsl.SingleResponseRequestBuilder[I, O]
with MetadataOperations[JavaUnaryRequestBuilder[I, O]] {
private val delegate = new ScalaUnaryRequestBuilder[I, O](descriptor, channel, defaultOptions, settings, headers)
@@ -95,7 +95,7 @@ final class ScalaClientStreamingRequestBuilder[I, O](
defaultOptions: CallOptions,
settings: GrpcClientSettings,
val headers: MetadataImpl)(implicit mat: Materializer, ec: ExecutionContext)
- extends akka.grpc.scaladsl.SingleResponseRequestBuilder[Source[I, NotUsed], O]
+ extends org.apache.pekko.grpc.scaladsl.SingleResponseRequestBuilder[Source[I, NotUsed], O]
with MetadataOperations[ScalaClientStreamingRequestBuilder[I, O]] {
@InternalStableApi
@@ -162,7 +162,7 @@ final class JavaClientStreamingRequestBuilder[I, O](
defaultOptions: CallOptions,
settings: GrpcClientSettings,
val headers: MetadataImpl)(implicit mat: Materializer, ec: ExecutionContext)
- extends akka.grpc.javadsl.SingleResponseRequestBuilder[JavaSource[I, NotUsed], O]
+ extends org.apache.pekko.grpc.javadsl.SingleResponseRequestBuilder[JavaSource[I, NotUsed], O]
with MetadataOperations[JavaClientStreamingRequestBuilder[I, O]] {
@InternalStableApi
def this(
@@ -205,7 +205,7 @@ final class ScalaServerStreamingRequestBuilder[I, O](
defaultOptions: CallOptions,
settings: GrpcClientSettings,
val headers: MetadataImpl)(implicit ec: ExecutionContext)
- extends akka.grpc.scaladsl.StreamResponseRequestBuilder[I, O]
+ extends org.apache.pekko.grpc.scaladsl.StreamResponseRequestBuilder[I, O]
with MetadataOperations[ScalaServerStreamingRequestBuilder[I, O]] {
@InternalStableApi
def this(
@@ -248,7 +248,7 @@ final class JavaServerStreamingRequestBuilder[I, O](
defaultOptions: CallOptions,
settings: GrpcClientSettings,
val headers: MetadataImpl)(implicit ec: ExecutionContext)
- extends akka.grpc.javadsl.StreamResponseRequestBuilder[I, O]
+ extends org.apache.pekko.grpc.javadsl.StreamResponseRequestBuilder[I, O]
with MetadataOperations[JavaServerStreamingRequestBuilder[I, O]] {
@InternalStableApi
def this(
@@ -291,7 +291,7 @@ final class ScalaBidirectionalStreamingRequestBuilder[I, O](
defaultOptions: CallOptions,
settings: GrpcClientSettings,
val headers: MetadataImpl)(implicit ec: ExecutionContext)
- extends akka.grpc.scaladsl.StreamResponseRequestBuilder[Source[I, NotUsed], O]
+ extends org.apache.pekko.grpc.scaladsl.StreamResponseRequestBuilder[Source[I, NotUsed], O]
with MetadataOperations[ScalaBidirectionalStreamingRequestBuilder[I, O]] {
@InternalStableApi
@@ -335,7 +335,7 @@ final class JavaBidirectionalStreamingRequestBuilder[I, O](
defaultOptions: CallOptions,
settings: GrpcClientSettings,
val headers: MetadataImpl)(implicit ec: ExecutionContext)
- extends akka.grpc.javadsl.StreamResponseRequestBuilder[JavaSource[I, NotUsed], O]
+ extends org.apache.pekko.grpc.javadsl.StreamResponseRequestBuilder[JavaSource[I, NotUsed], O]
with MetadataOperations[JavaBidirectionalStreamingRequestBuilder[I, O]] {
@InternalStableApi
def this(
diff --git a/runtime/src/main/scala/akka/grpc/internal/ServerReflectionImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala
similarity index 96%
rename from runtime/src/main/scala/akka/grpc/internal/ServerReflectionImpl.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala
index 666f7130..5104de7e 100644
--- a/runtime/src/main/scala/akka/grpc/internal/ServerReflectionImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala
@@ -2,12 +2,12 @@
* Copyright (C) 2019-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import com.google.protobuf.Descriptors.FileDescriptor
-import akka.NotUsed
-import akka.annotation.InternalApi
-import akka.stream.scaladsl._
+import org.apache.pekko.NotUsed
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.stream.scaladsl._
import _root_.grpc.reflection.v1alpha.reflection._
import com.google.protobuf.ByteString
diff --git a/runtime/src/main/scala/akka/grpc/internal/ServiceDescriptionImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala
similarity index 67%
rename from runtime/src/main/scala/akka/grpc/internal/ServiceDescriptionImpl.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala
index 169e15e5..de650852 100644
--- a/runtime/src/main/scala/akka/grpc/internal/ServiceDescriptionImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import com.google.protobuf.Descriptors.FileDescriptor;
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
-import akka.grpc.ServiceDescription
+import org.apache.pekko.grpc.ServiceDescription
/**
* INTERNAL API
diff --git a/runtime/src/main/scala/akka/grpc/internal/SingleParameterSink.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala
similarity index 85%
rename from runtime/src/main/scala/akka/grpc/internal/SingleParameterSink.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala
index 75ed76e5..cc344bfa 100644
--- a/runtime/src/main/scala/akka/grpc/internal/SingleParameterSink.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala
@@ -2,14 +2,14 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.util.concurrent.CompletionStage
-import akka.annotation.InternalApi
-import akka.stream.scaladsl.Sink
-import akka.stream.{ javadsl, AbruptStageTerminationException, Attributes, Inlet, SinkShape }
-import akka.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue, InHandler }
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.{ javadsl, AbruptStageTerminationException, Attributes, Inlet, SinkShape }
+import org.apache.pekko.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue, InHandler }
import scala.concurrent.{ Future, Promise }
diff --git a/runtime/src/main/scala/akka/grpc/internal/TelemetrySpi.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala
similarity index 87%
rename from runtime/src/main/scala/akka/grpc/internal/TelemetrySpi.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala
index 0902a43c..c22d0f36 100644
--- a/runtime/src/main/scala/akka/grpc/internal/TelemetrySpi.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala
@@ -2,9 +2,9 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.actor.{
+import org.apache.pekko.actor.{
ActorSystem,
ClassicActorSystemProvider,
ExtendedActorSystem,
@@ -12,8 +12,8 @@ import akka.actor.{
ExtensionId,
ExtensionIdProvider
}
-import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.http.javadsl.model.HttpRequest
+import org.apache.pekko.annotation.{ InternalApi, InternalStableApi }
+import org.apache.pekko.http.javadsl.model.HttpRequest
import scala.annotation.nowarn
@@ -34,7 +34,7 @@ object TelemetryExtension extends ExtensionId[TelemetryExtensionImpl] with Exten
}
private[internal] object TelemetrySpi {
- private val ConfigKey = "akka.grpc.telemetry-class"
+ private val ConfigKey = "pekko.grpc.telemetry-class"
def apply(system: ClassicActorSystemProvider): TelemetrySpi = {
if (!system.classicSystem.settings.config.hasPath(ConfigKey)) NoOpTelemetry
else {
diff --git a/runtime/src/main/scala/akka/grpc/internal/UnaryCallAdapter.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala
similarity index 86%
rename from runtime/src/main/scala/akka/grpc/internal/UnaryCallAdapter.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala
index caf0927b..1e9a881b 100644
--- a/runtime/src/main/scala/akka/grpc/internal/UnaryCallAdapter.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala
@@ -2,14 +2,14 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.util.concurrent.CompletionStage
-import akka.annotation.InternalApi
-import akka.dispatch.ExecutionContexts
-import akka.grpc.GrpcSingleResponse
-import akka.util.OptionVal
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.dispatch.ExecutionContexts
+import org.apache.pekko.grpc.GrpcSingleResponse
+import org.apache.pekko.util.OptionVal
import io.grpc._
import scala.compat.java8.FutureConverters._
@@ -21,7 +21,7 @@ import scala.concurrent.{ Future, Promise }
* INTERNAL API
*/
@InternalApi
-private[akka] final class UnaryCallAdapter[Res] extends ClientCall.Listener[Res] {
+private[pekko] final class UnaryCallAdapter[Res] extends ClientCall.Listener[Res] {
private val responsePromise = Promise[Res]()
override def onMessage(message: Res): Unit =
@@ -52,7 +52,7 @@ private[akka] final class UnaryCallAdapter[Res] extends ClientCall.Listener[Res]
// needs to be a separate class because of CompletionStage error handling not bubbling
// exceptions like Scala Futures do ;( flip side is that it saves some garbage
@InternalApi
-private[akka] final class UnaryCallWithMetadataAdapter[Res] extends ClientCall.Listener[Res] {
+private[pekko] final class UnaryCallWithMetadataAdapter[Res] extends ClientCall.Listener[Res] {
private val responsePromise = Promise[GrpcSingleResponse[Res]]()
private var headers: OptionVal[Metadata] = OptionVal.None
private val trailerPromise = Promise[Metadata]()
@@ -72,9 +72,9 @@ private[akka] final class UnaryCallWithMetadataAdapter[Res] extends ClientCall.L
override def value: Res = message
override def getValue(): Res = message
- private lazy val sMetadata: akka.grpc.scaladsl.Metadata =
+ private lazy val sMetadata: org.apache.pekko.grpc.scaladsl.Metadata =
MetadataImpl.scalaMetadataFromGoogleGrpcMetadata(headersOnMessage)
- private lazy val jMetadata: akka.grpc.javadsl.Metadata =
+ private lazy val jMetadata: org.apache.pekko.grpc.javadsl.Metadata =
MetadataImpl.javaMetadataFromGoogleGrpcMetadata(headersOnMessage)
override def headers = sMetadata
override def getHeaders() = jMetadata
diff --git a/runtime/src/main/scala/akka/grpc/internal/WithProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala
similarity index 65%
rename from runtime/src/main/scala/akka/grpc/internal/WithProtobufSerializer.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala
index a9c9ea52..5cee6866 100644
--- a/runtime/src/main/scala/akka/grpc/internal/WithProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala
@@ -2,9 +2,9 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
-import akka.grpc.ProtobufSerializer
+import org.apache.pekko.grpc.ProtobufSerializer
trait WithProtobufSerializer[T] {
def protobufSerializer: ProtobufSerializer[T]
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/GoogleProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala
similarity index 81%
rename from runtime/src/main/scala/akka/grpc/javadsl/GoogleProtobufSerializer.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala
index 4cd52be6..22c51031 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/GoogleProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala
@@ -2,11 +2,11 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
-import akka.annotation.ApiMayChange
-import akka.grpc.ProtobufSerializer
-import akka.util.ByteString
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.grpc.ProtobufSerializer
+import org.apache.pekko.util.ByteString
import com.google.protobuf.Parser
import java.io.InputStream
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/GrpcExceptionHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
similarity index 75%
rename from runtime/src/main/scala/akka/grpc/javadsl/GrpcExceptionHandler.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
index ebb17fab..3e91d61f 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/GrpcExceptionHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
@@ -2,22 +2,22 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
import java.util.concurrent.CompletionException
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.ApiMayChange
-import akka.annotation.InternalApi
-import akka.grpc.{ GrpcServiceException, Trailers }
-import akka.grpc.GrpcProtocol.GrpcProtocolWriter
-import akka.grpc.internal.{ GrpcMetadataImpl, GrpcResponseHelpers, MissingParameterException }
-import akka.http.javadsl.model.HttpResponse
-import akka.japi.{ Function => jFunction }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.grpc.{ GrpcServiceException, Trailers }
+import org.apache.pekko.grpc.GrpcProtocol.GrpcProtocolWriter
+import org.apache.pekko.grpc.internal.{ GrpcMetadataImpl, GrpcResponseHelpers, MissingParameterException }
+import org.apache.pekko.http.javadsl.model.HttpResponse
+import org.apache.pekko.japi.{ Function => jFunction }
import io.grpc.{ Status, StatusRuntimeException }
import scala.concurrent.ExecutionException
-import akka.event.Logging
+import org.apache.pekko.event.Logging
@ApiMayChange
object GrpcExceptionHandler {
@@ -48,7 +48,7 @@ object GrpcExceptionHandler {
case e: UnsupportedOperationException => Trailers(Status.UNIMPLEMENTED.withDescription(e.getMessage))
case e: StatusRuntimeException => Trailers(e.getStatus, new GrpcMetadataImpl(e.getTrailers))
case other =>
- val log = Logging(system, "akka.grpc.javadsl.GrpcExceptionHandler")
+ val log = Logging(system, "org.apache.pekko.grpc.javadsl.GrpcExceptionHandler")
log.error(other, "Unhandled error: [{}]", other.getMessage)
INTERNAL
}
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/GrpcMarshalling.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala
similarity index 83%
rename from runtime/src/main/scala/akka/grpc/javadsl/GrpcMarshalling.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala
index 84ee4e40..07d563e5 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/GrpcMarshalling.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala
@@ -2,21 +2,21 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
import java.util.concurrent.{ CompletableFuture, CompletionStage }
import java.util.Optional
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.grpc._
-import akka.grpc.internal._
-import akka.grpc.GrpcProtocol.{ GrpcProtocolReader, GrpcProtocolWriter }
-import akka.http.javadsl.model.{ HttpEntity, HttpRequest, HttpResponse }
-import akka.japi.{ Function => JFunction }
-import akka.stream.Materializer
-import akka.stream.javadsl.Source
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.grpc._
+import org.apache.pekko.grpc.internal._
+import org.apache.pekko.grpc.GrpcProtocol.{ GrpcProtocolReader, GrpcProtocolWriter }
+import org.apache.pekko.http.javadsl.model.{ HttpEntity, HttpRequest, HttpResponse }
+import org.apache.pekko.japi.{ Function => JFunction }
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.javadsl.Source
+import org.apache.pekko.util.ByteString
import scala.annotation.nowarn
object GrpcMarshalling {
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/Metadata.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala
similarity index 85%
rename from runtime/src/main/scala/akka/grpc/javadsl/Metadata.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala
index cf711f48..282eaf2e 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/Metadata.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala
@@ -2,14 +2,14 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
import java.util.{ List, Map, Optional }
-import akka.annotation.{ ApiMayChange, DoNotInherit }
-import akka.util.ByteString
-import akka.japi.Pair
-import akka.grpc.scaladsl
+import org.apache.pekko.annotation.{ ApiMayChange, DoNotInherit }
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.japi.Pair
+import org.apache.pekko.grpc.scaladsl
/**
* Immutable representation of the metadata in a call
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/MetadataBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala
similarity index 82%
rename from runtime/src/main/scala/akka/grpc/javadsl/MetadataBuilder.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala
index 1503dbaf..1d9f66bd 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/MetadataBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala
@@ -2,19 +2,19 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
import java.lang.{ Iterable => jIterable }
-import akka.annotation.ApiMayChange
+import org.apache.pekko.annotation.ApiMayChange
import scala.collection.JavaConverters._
-import akka.http.javadsl.model.HttpHeader
-import akka.http.scaladsl.model.{ HttpHeader => sHttpHeader }
-import akka.http.scaladsl.model.headers.RawHeader
-import akka.util.ByteString
-import akka.grpc.scaladsl
-import akka.grpc.internal.JavaMetadataImpl
+import org.apache.pekko.http.javadsl.model.HttpHeader
+import org.apache.pekko.http.scaladsl.model.{ HttpHeader => sHttpHeader }
+import org.apache.pekko.http.scaladsl.model.headers.RawHeader
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.grpc.scaladsl
+import org.apache.pekko.grpc.internal.JavaMetadataImpl
/**
* This class provides an interface for constructing immutable Metadata instances.
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/MetadataEntry.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala
similarity index 74%
rename from runtime/src/main/scala/akka/grpc/javadsl/MetadataEntry.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala
index 11d7189d..5b9af70e 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/MetadataEntry.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
-import akka.annotation.{ ApiMayChange, DoNotInherit }
-import akka.util.ByteString
+import org.apache.pekko.annotation.{ ApiMayChange, DoNotInherit }
+import org.apache.pekko.util.ByteString
/**
* Represents metadata entry.
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/AkkaGrpcClient.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala
similarity index 57%
rename from runtime/src/main/scala/akka/grpc/javadsl/AkkaGrpcClient.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala
index 528fcf7e..16b58edc 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/AkkaGrpcClient.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
import java.util.concurrent.CompletionStage
-import akka.Done
-import akka.annotation.DoNotInherit
+import org.apache.pekko.Done
+import org.apache.pekko.annotation.DoNotInherit
-/** Common trait of all generated Akka gRPC clients. Not for user extension. */
+/** Common trait of all generated Apache Pekko gRPC clients. Not for user extension. */
@DoNotInherit
-trait AkkaGrpcClient {
+trait PekkoGrpcClient {
/**
* Initiates a shutdown in which preexisting and new calls are cancelled.
@@ -19,7 +19,7 @@ trait AkkaGrpcClient {
* This method is only valid for clients that use an internal channel. If the client was created
* with a shared, user-provided channel, the channel itself should be closed.
*
- * @throws akka.grpc.GrpcClientCloseException if client was created with a user-provided [[akka.grpc.GrpcChannel]].
+ * @throws org.apache.pekko.grpc.GrpcClientCloseException if client was created with a user-provided [[org.apache.pekko.grpc.GrpcChannel]].
*/
def close(): CompletionStage[Done]
def closed(): CompletionStage[Done]
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/RequestBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala
similarity index 90%
rename from runtime/src/main/scala/akka/grpc/javadsl/RequestBuilder.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala
index b8153d1e..c0635e3b 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/RequestBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala
@@ -2,15 +2,15 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
import java.util.concurrent.CompletionStage
-import akka.NotUsed
-import akka.annotation.{ ApiMayChange, DoNotInherit }
-import akka.grpc.{ GrpcResponseMetadata, GrpcSingleResponse }
-import akka.stream.javadsl.Source
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.annotation.{ ApiMayChange, DoNotInherit }
+import org.apache.pekko.grpc.{ GrpcResponseMetadata, GrpcSingleResponse }
+import org.apache.pekko.stream.javadsl.Source
+import org.apache.pekko.util.ByteString
/**
* Request builder for requests providing per call specific metadata capabilities in
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/ServerReflection.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala
similarity index 60%
rename from runtime/src/main/scala/akka/grpc/javadsl/ServerReflection.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala
index 33a9e8c7..0a708b36 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/ServerReflection.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
import java.util.Collection
import java.util.concurrent.CompletionStage
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.ApiMayChange
-import akka.grpc.ServiceDescription
-import akka.grpc.internal.ServerReflectionImpl
-import akka.http.javadsl.model.{ HttpRequest, HttpResponse }
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.grpc.ServiceDescription
+import org.apache.pekko.grpc.internal.ServerReflectionImpl
+import org.apache.pekko.http.javadsl.model.{ HttpRequest, HttpResponse }
import grpc.reflection.v1alpha.reflection.ServerReflectionHandler
@@ -20,7 +20,8 @@ object ServerReflection {
@ApiMayChange(issue = "https://github.com/akka/akka-grpc/issues/850")
def create(
objects: Collection[ServiceDescription],
- sys: ClassicActorSystemProvider): akka.japi.function.Function[HttpRequest, CompletionStage[HttpResponse]] = {
+ sys: ClassicActorSystemProvider)
+ : org.apache.pekko.japi.function.Function[HttpRequest, CompletionStage[HttpResponse]] = {
import scala.collection.JavaConverters._
val delegate = ServerReflectionHandler.apply(
ServerReflectionImpl(objects.asScala.map(_.descriptor).toSeq, objects.asScala.map(_.name).toList))(sys)
@@ -28,7 +29,7 @@ object ServerReflection {
implicit val ec = sys.classicSystem.dispatcher
request =>
delegate
- .apply(request.asInstanceOf[akka.http.scaladsl.model.HttpRequest])
+ .apply(request.asInstanceOf[org.apache.pekko.http.scaladsl.model.HttpRequest])
.map(_.asInstanceOf[HttpResponse])
.toJava
}
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/ServiceHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala
similarity index 86%
rename from runtime/src/main/scala/akka/grpc/javadsl/ServiceHandler.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala
index 77d31533..823c4447 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/ServiceHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala
@@ -2,14 +2,14 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
import java.util.concurrent.{ CompletableFuture, CompletionStage }
-import akka.annotation.ApiMayChange
-import akka.annotation.InternalApi
-import akka.http.javadsl.model.{ HttpRequest, HttpResponse, StatusCodes }
-import akka.japi.function.{ Function => JFunction }
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.http.javadsl.model.{ HttpRequest, HttpResponse, StatusCodes }
+import org.apache.pekko.japi.function.{ Function => JFunction }
import scala.annotation.varargs
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala
similarity index 68%
rename from runtime/src/main/scala/akka/grpc/javadsl/WebHandler.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala
index a734a6da..d3045c88 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/WebHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala
@@ -2,28 +2,28 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl
+package org.apache.pekko.grpc.javadsl
import java.util
import java.util.concurrent.CompletionStage
-import akka.NotUsed
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.ApiMayChange
-import akka.grpc.javadsl.ServiceHandler.{ concatOrNotFound, unsupportedMediaType }
-import akka.http.javadsl.marshalling.Marshaller
-import akka.http.javadsl.model.{ HttpRequest, HttpResponse }
-import akka.http.javadsl.server.Route
-import akka.http.javadsl.server.directives.RouteAdapter
-import akka.http.scaladsl.marshalling.{ Marshaller => sMarshaller, ToResponseMarshaller }
-import akka.grpc.scaladsl
-import akka.http.scaladsl.server.directives.MarshallingDirectives
-import akka.japi.function.{ Function => JFunction }
-import akka.stream.Materializer
-import akka.stream.javadsl.{ Keep, Sink, Source }
-import akka.util.ConstantFun
-import ch.megard.akka.http.cors.javadsl.settings.CorsSettings
-import ch.megard.akka.http.cors.javadsl.CorsDirectives
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.grpc.javadsl.ServiceHandler.{ concatOrNotFound, unsupportedMediaType }
+import org.apache.pekko.http.javadsl.marshalling.Marshaller
+import org.apache.pekko.http.javadsl.model.{ HttpRequest, HttpResponse }
+import org.apache.pekko.http.javadsl.server.Route
+import org.apache.pekko.http.javadsl.server.directives.RouteAdapter
+import org.apache.pekko.http.scaladsl.marshalling.{ Marshaller => sMarshaller, ToResponseMarshaller }
+import org.apache.pekko.grpc.scaladsl
+import org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives
+import org.apache.pekko.japi.function.{ Function => JFunction }
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.javadsl.{ Keep, Sink, Source }
+import org.apache.pekko.util.ConstantFun
+//import ch.megard.akka.http.cors.javadsl.settings.CorsSettings
+//import ch.megard.akka.http.cors.javadsl.CorsDirectives
@ApiMayChange
object WebHandler {
@@ -36,11 +36,11 @@ object WebHandler {
* - If the request s not a CORS pre-flight request, and has an invalid media type, then a _415: Unsupported Media Type_ response is produced.
* - Otherise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced.
*/
- def grpcWebHandler(
+ /*def grpcWebHandler(
handlers: util.List[JFunction[HttpRequest, CompletionStage[HttpResponse]]],
as: ClassicActorSystemProvider,
mat: Materializer): JFunction[HttpRequest, CompletionStage[HttpResponse]] =
- grpcWebHandler(handlers, as, mat, scaladsl.WebHandler.defaultCorsSettings)
+ grpcWebHandler(handlers, as, mat, scaladsl.WebHandler.defaultCorsSettings)*/
// Adapt Marshaller.futureMarshaller(fromResponse) to javadsl
private implicit val csResponseMarshaller: ToResponseMarshaller[CompletionStage[HttpResponse]] = {
@@ -63,15 +63,16 @@ object WebHandler {
def grpcWebHandler(
handlers: util.List[JFunction[HttpRequest, CompletionStage[HttpResponse]]],
as: ClassicActorSystemProvider,
- mat: Materializer,
- corsSettings: CorsSettings): JFunction[HttpRequest, CompletionStage[HttpResponse]] = {
+ mat: Materializer /*,
+ corsSettings: CorsSettings*/ ): JFunction[HttpRequest, CompletionStage[HttpResponse]] = {
import scala.collection.JavaConverters._
val servicesHandler = concatOrNotFound(handlers.asScala.toList: _*)
val servicesRoute = RouteAdapter(MarshallingDirectives.handleWith(servicesHandler.apply(_)))
- val handler = asyncHandler(CorsDirectives.cors(corsSettings, () => servicesRoute), as, mat)
+ val handler = asyncHandler(/*CorsDirectives.cors(corsSettings, () => */ servicesRoute /*)*/, as, mat)
(req: HttpRequest) =>
- if (scaladsl.ServiceHandler.isGrpcWebRequest(req) || scaladsl.WebHandler.isCorsPreflightRequest(req)) handler(req)
+ if (scaladsl.ServiceHandler.isGrpcWebRequest(req) /*|| scaladsl.WebHandler.isCorsPreflightRequest(req)*/ )
+ handler(req)
else unsupportedMediaType
}
diff --git a/runtime/src/main/scala/akka/grpc/javadsl/package.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala
similarity index 58%
rename from runtime/src/main/scala/akka/grpc/javadsl/package.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala
index a603a7e6..683988f9 100644
--- a/runtime/src/main/scala/akka/grpc/javadsl/package.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
package object javadsl {
/**
- * Helper for creating akka.japi.function.Function instances from Scala
+ * Helper for creating org.apache.pekko.japi.function.Function instances from Scala
* functions as Scala 2.11 does not know about SAMs.
*/
- def japiFunction[A, B](f: A => B): akka.japi.function.Function[A, B] =
- new akka.japi.function.Function[A, B]() {
+ def japiFunction[A, B](f: A => B): org.apache.pekko.japi.function.Function[A, B] =
+ new org.apache.pekko.japi.function.Function[A, B]() {
override def apply(a: A): B = f(a)
}
@@ -25,18 +25,18 @@ package object javadsl {
}
/**
- * Helper for creating Scala partial functions from [[akka.japi.Function]]
+ * Helper for creating Scala partial functions from [[org.apache.pekko.japi.Function]]
* instances as Scala 2.11 does not know about SAMs.
*/
- def scalaPartialFunction[A, B](f: akka.japi.Function[A, B]): PartialFunction[A, B] = {
+ def scalaPartialFunction[A, B](f: org.apache.pekko.japi.Function[A, B]): PartialFunction[A, B] = {
case a => f(a)
}
/**
- * Helper for creating Scala anonymous partial functions from [[akka.japi.Function]]
+ * Helper for creating Scala anonymous partial functions from [[org.apache.pekko.japi.Function]]
* instances as Scala 2.11 does not know about SAMs.
*/
def scalaAnonymousPartialFunction[A, B, C](
- f: akka.japi.Function[A, akka.japi.Function[B, C]]): A => PartialFunction[B, C] =
+ f: org.apache.pekko.japi.Function[A, org.apache.pekko.japi.Function[B, C]]): A => PartialFunction[B, C] =
a => scalaPartialFunction(f(a))
}
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/Grpc.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala
similarity index 82%
rename from runtime/src/main/scala/akka/grpc/scaladsl/Grpc.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala
index 9f84ece3..6fa347f5 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/Grpc.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala
@@ -2,18 +2,18 @@
* Copyright (C) 2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import scala.concurrent.Future
import scala.jdk.CollectionConverters._
-import akka.Done
-import akka.actor.{ CoordinatedShutdown, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
-import akka.annotation.InternalApi
+import org.apache.pekko.Done
+import org.apache.pekko.actor.{ CoordinatedShutdown, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
+import org.apache.pekko.annotation.InternalApi
import java.util.concurrent.ConcurrentHashMap
-import akka.event.Logging
-import akka.grpc.GrpcChannel
+import org.apache.pekko.event.Logging
+import org.apache.pekko.grpc.GrpcChannel
/** INTERNAL API */
@InternalApi
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/GrpcExceptionHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
similarity index 73%
rename from runtime/src/main/scala/akka/grpc/scaladsl/GrpcExceptionHandler.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
index e3dc431b..f048ebd2 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/GrpcExceptionHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
@@ -2,19 +2,19 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
-
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.{ ApiMayChange, InternalStableApi }
-import akka.grpc.{ GrpcServiceException, Trailers }
-import akka.grpc.GrpcProtocol.GrpcProtocolWriter
-import akka.grpc.internal.{ GrpcMetadataImpl, GrpcResponseHelpers, MissingParameterException }
-import akka.http.scaladsl.model.HttpResponse
+package org.apache.pekko.grpc.scaladsl
+
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.{ ApiMayChange, InternalStableApi }
+import org.apache.pekko.grpc.{ GrpcServiceException, Trailers }
+import org.apache.pekko.grpc.GrpcProtocol.GrpcProtocolWriter
+import org.apache.pekko.grpc.internal.{ GrpcMetadataImpl, GrpcResponseHelpers, MissingParameterException }
+import org.apache.pekko.http.scaladsl.model.HttpResponse
import io.grpc.{ Status, StatusRuntimeException }
import scala.concurrent.{ ExecutionException, Future }
-import akka.event.Logging
+import org.apache.pekko.event.Logging
@ApiMayChange
object GrpcExceptionHandler {
@@ -33,7 +33,7 @@ object GrpcExceptionHandler {
val meta = Option(e.getTrailers).getOrElse(new io.grpc.Metadata())
Trailers(e.getStatus, new GrpcMetadataImpl(meta))
case other =>
- val log = Logging(system, "akka.grpc.scaladsl.GrpcExceptionHandler")
+ val log = Logging(system, "org.apache.pekko.grpc.scaladsl.GrpcExceptionHandler")
log.error(other, "Unhandled error: [{}]", other.getMessage)
INTERNAL
}
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/GrpcMarshalling.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala
similarity index 86%
rename from runtime/src/main/scala/akka/grpc/scaladsl/GrpcMarshalling.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala
index 01ef2a92..a7c9e091 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/GrpcMarshalling.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import io.grpc.Status
@@ -10,17 +10,17 @@ import scala.annotation.nowarn
import scala.concurrent.Future
import scala.util.{ Failure, Success, Try }
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.InternalApi
-import akka.grpc._
-import akka.grpc.GrpcProtocol.{ GrpcProtocolReader, GrpcProtocolWriter }
-import akka.grpc.internal._
-import akka.http.scaladsl.model.{ HttpEntity, HttpRequest, HttpResponse, Uri }
-import akka.stream.Materializer
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.grpc._
+import org.apache.pekko.grpc.GrpcProtocol.{ GrpcProtocolReader, GrpcProtocolWriter }
+import org.apache.pekko.grpc.internal._
+import org.apache.pekko.http.scaladsl.model.{ HttpEntity, HttpRequest, HttpResponse, Uri }
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
object GrpcMarshalling {
def unmarshal[T](req: HttpRequest)(implicit u: ProtobufSerializer[T], mat: Materializer): Future[T] = {
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/Metadata.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala
similarity index 86%
rename from runtime/src/main/scala/akka/grpc/scaladsl/Metadata.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala
index 5b480077..d7698b41 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/Metadata.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
-import akka.annotation.{ ApiMayChange, DoNotInherit, InternalApi }
-import akka.util.ByteString
+import org.apache.pekko.annotation.{ ApiMayChange, DoNotInherit, InternalApi }
+import org.apache.pekko.util.ByteString
/**
* Immutable representation of the metadata in a call
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/MetadataBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala
similarity index 87%
rename from runtime/src/main/scala/akka/grpc/scaladsl/MetadataBuilder.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala
index da66d2e9..48b6a931 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/MetadataBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import scala.collection.immutable
-import akka.annotation.{ ApiMayChange, DoNotInherit }
-import akka.http.scaladsl.model.HttpHeader
-import akka.util.ByteString
-import akka.grpc.internal.{ EntryMetadataImpl, HeaderMetadataImpl, MetadataImpl }
+import org.apache.pekko.annotation.{ ApiMayChange, DoNotInherit }
+import org.apache.pekko.http.scaladsl.model.HttpHeader
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.grpc.internal.{ EntryMetadataImpl, HeaderMetadataImpl, MetadataImpl }
/**
* This class provides an interface for constructing immutable Metadata instances.
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/MetadataEntry.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala
similarity index 81%
rename from runtime/src/main/scala/akka/grpc/scaladsl/MetadataEntry.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala
index 1d7d6445..a133e8be 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/MetadataEntry.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala
@@ -2,11 +2,11 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
-import akka.annotation.ApiMayChange
-import akka.util.ByteString
-import akka.grpc.javadsl
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.grpc.javadsl
/**
* Represents a entry (value) in a collection of Metadata.
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/AkkaGrpcClient.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala
similarity index 63%
rename from runtime/src/main/scala/akka/grpc/scaladsl/AkkaGrpcClient.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala
index a0b19e66..0f303c3f 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/AkkaGrpcClient.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala
@@ -2,16 +2,16 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
import scala.concurrent.Future
-import akka.Done
-import akka.annotation.DoNotInherit
+import org.apache.pekko.Done
+import org.apache.pekko.annotation.DoNotInherit
-/** Common trait of all generated Akka gRPC clients. Not for user extension. */
+/** Common trait of all generated Apache Pekko gRPC clients. Not for user extension. */
@DoNotInherit
-trait AkkaGrpcClient {
+trait PekkoGrpcClient {
/**
* Initiates a shutdown in which preexisting and new calls are cancelled.
@@ -19,7 +19,7 @@ trait AkkaGrpcClient {
* This method is only valid for clients that use an internal channel. If the client was created
* with a shared user-provided channel, the channel itself should be closed.
*
- * @throws akka.grpc.GrpcClientCloseException if client was created with a user-provided [[akka.grpc.GrpcChannel]].
+ * @throws org.apache.pekko.grpc.GrpcClientCloseException if client was created with a user-provided [[org.apache.pekko.grpc.GrpcChannel]].
*/
def close(): Future[Done]
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/RequestBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala
similarity index 91%
rename from runtime/src/main/scala/akka/grpc/scaladsl/RequestBuilder.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala
index 642acb3d..f8fcd586 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/RequestBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
-import akka.NotUsed
-import akka.annotation.{ ApiMayChange, DoNotInherit }
-import akka.grpc.{ GrpcResponseMetadata, GrpcSingleResponse }
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.annotation.{ ApiMayChange, DoNotInherit }
+import org.apache.pekko.grpc.{ GrpcResponseMetadata, GrpcSingleResponse }
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
import scala.concurrent.Future
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/ScalapbProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala
similarity index 79%
rename from runtime/src/main/scala/akka/grpc/scaladsl/ScalapbProtobufSerializer.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala
index 15586b52..e57f4bc1 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/ScalapbProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala
@@ -2,11 +2,11 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
-import akka.annotation.ApiMayChange
-import akka.grpc.ProtobufSerializer
-import akka.util.ByteString
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.grpc.ProtobufSerializer
+import org.apache.pekko.util.ByteString
import com.google.protobuf.CodedInputStream
import scalapb.{ GeneratedMessage, GeneratedMessageCompanion }
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/ServerReflection.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala
similarity index 73%
rename from runtime/src/main/scala/akka/grpc/scaladsl/ServerReflection.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala
index 44c353a3..8a7698d2 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/ServerReflection.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.ApiMayChange
-import akka.grpc.ServiceDescription
-import akka.grpc.internal.ServerReflectionImpl
-import akka.http.scaladsl.model.{ HttpRequest, HttpResponse }
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.grpc.ServiceDescription
+import org.apache.pekko.grpc.internal.ServerReflectionImpl
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, HttpResponse }
import grpc.reflection.v1alpha.reflection.ServerReflectionHandler
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/ServiceHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala
similarity index 76%
rename from runtime/src/main/scala/akka/grpc/scaladsl/ServiceHandler.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala
index 5717f8b8..bb1ecc54 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/ServiceHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
-import akka.annotation.ApiMayChange
-import akka.grpc.GrpcProtocol
-import akka.grpc.internal.{ GrpcProtocolWeb, GrpcProtocolWebText }
-import akka.http.javadsl.{ model => jmodel }
-import akka.http.scaladsl.model.{ HttpRequest, HttpResponse, StatusCodes }
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.grpc.GrpcProtocol
+import org.apache.pekko.grpc.internal.{ GrpcProtocolWeb, GrpcProtocolWebText }
+import org.apache.pekko.http.javadsl.{ model => jmodel }
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, HttpResponse, StatusCodes }
import scala.concurrent.Future
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala
similarity index 64%
rename from runtime/src/main/scala/akka/grpc/scaladsl/WebHandler.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala
index bfd0a398..57281275 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/WebHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala
@@ -2,26 +2,26 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl
+package org.apache.pekko.grpc.scaladsl
-import scala.collection.immutable
+//import scala.collection.immutable
import scala.concurrent.Future
-import akka.actor.ClassicActorSystemProvider
-import akka.annotation.ApiMayChange
-import akka.http.javadsl.{ model => jmodel }
-import akka.http.scaladsl.model.{ HttpMethods, HttpRequest, HttpResponse }
-import akka.http.scaladsl.model.headers._
-import akka.http.scaladsl.server.Route
-import akka.http.scaladsl.server.directives.MarshallingDirectives.handleWith
-import ch.megard.akka.http.cors.scaladsl.CorsDirectives.cors
-import ch.megard.akka.http.cors.scaladsl.model.HttpHeaderRange
-import ch.megard.akka.http.cors.scaladsl.settings.CorsSettings
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.annotation.ApiMayChange
+//import org.apache.pekko.http.javadsl.{ model => jmodel }
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, HttpResponse }
+//import org.apache.pekko.http.scaladsl.model.headers._
+import org.apache.pekko.http.scaladsl.server.Route
+import org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives.handleWith
+//import ch.megard.akka.http.cors.scaladsl.CorsDirectives.cors
+//import ch.megard.akka.http.cors.scaladsl.model.HttpHeaderRange
+//import ch.megard.akka.http.cors.scaladsl.settings.CorsSettings
@ApiMayChange
object WebHandler {
/** Default CORS settings to use for grpc-web */
- val defaultCorsSettings: CorsSettings = CorsSettings.defaultSettings
+ /*val defaultCorsSettings: CorsSettings = CorsSettings.defaultSettings
.withAllowCredentials(true)
.withAllowedMethods(immutable.Seq(HttpMethods.POST, HttpMethods.OPTIONS))
.withExposedHeaders(immutable.Seq(headers.`Status`.name, headers.`Status-Message`.name, `Content-Encoding`.name))
@@ -37,7 +37,7 @@ object WebHandler {
private[grpc] def isCorsPreflightRequest(r: jmodel.HttpRequest): Boolean =
r.method == HttpMethods.OPTIONS && r.getHeader(classOf[Origin]).isPresent && r
.getHeader(classOf[`Access-Control-Request-Method`])
- .isPresent
+ .isPresent*/
/**
* Creates a `HttpRequest` to `HttpResponse` handler for gRPC services that can be used in
@@ -48,13 +48,13 @@ object WebHandler {
* - Otherise if the request is not handled by one of the provided handlers, a _404: Not Found_ response is produced.
*/
def grpcWebHandler(handlers: PartialFunction[HttpRequest, Future[HttpResponse]]*)(
- implicit as: ClassicActorSystemProvider,
- corsSettings: CorsSettings = defaultCorsSettings): HttpRequest => Future[HttpResponse] = {
+ implicit as: ClassicActorSystemProvider /*,
+ corsSettings: CorsSettings = defaultCorsSettings*/ ): HttpRequest => Future[HttpResponse] = {
implicit val system = as.classicSystem
val servicesHandler = ServiceHandler.concat(handlers: _*)
- Route.toFunction(cors(corsSettings) {
+ Route.toFunction /*cors(corsSettings)*/ {
handleWith(servicesHandler)
- })
+ }
}
}
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/headers/PercentEncoding.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/PercentEncoding.scala
similarity index 99%
rename from runtime/src/main/scala/akka/grpc/scaladsl/headers/PercentEncoding.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/PercentEncoding.scala
index 5a2711ec..5ad342ab 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/headers/PercentEncoding.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/PercentEncoding.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package akka.grpc.scaladsl.headers
+package org.apache.pekko.grpc.scaladsl.headers
import java.nio.ByteBuffer
import java.nio.charset.StandardCharsets
diff --git a/runtime/src/main/scala/akka/grpc/scaladsl/headers/headers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala
similarity index 91%
rename from runtime/src/main/scala/akka/grpc/scaladsl/headers/headers.scala
rename to runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala
index f22a25ac..955abd73 100644
--- a/runtime/src/main/scala/akka/grpc/scaladsl/headers/headers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala
@@ -2,12 +2,12 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.scaladsl.headers
+package org.apache.pekko.grpc.scaladsl.headers
-import akka.annotation.ApiMayChange
-import akka.http.scaladsl.model.HttpHeader
-import akka.http.scaladsl.model.headers.{ ModeledCustomHeader, ModeledCustomHeaderCompanion }
-import akka.http.javadsl.{ model => jm }
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.http.scaladsl.model.HttpHeader
+import org.apache.pekko.http.scaladsl.model.headers.{ ModeledCustomHeader, ModeledCustomHeaderCompanion }
+import org.apache.pekko.http.javadsl.{ model => jm }
import scala.collection.immutable
import scala.util.Try
diff --git a/runtime/src/test/java/jdocs/akka/grpc/client/GrpcClientSettingsCompileOnly.java b/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java
similarity index 84%
rename from runtime/src/test/java/jdocs/akka/grpc/client/GrpcClientSettingsCompileOnly.java
rename to runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java
index 553d68a5..727dd882 100644
--- a/runtime/src/test/java/jdocs/akka/grpc/client/GrpcClientSettingsCompileOnly.java
+++ b/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java
@@ -2,12 +2,12 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package jdocs.akka.grpc.client;
+package jdocs.org.apache.pekko.grpc.client;
-import akka.actor.ActorSystem;
-import akka.discovery.Discovery;
-import akka.discovery.ServiceDiscovery;
-import akka.grpc.GrpcClientSettings;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.discovery.Discovery;
+import org.apache.pekko.discovery.ServiceDiscovery;
+import org.apache.pekko.grpc.GrpcClientSettings;
import scala.Some;
import java.time.Duration;
diff --git a/runtime/src/test/java/akka/grpc/javadsl/ConcatOrNotFoundTest.java b/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java
similarity index 95%
rename from runtime/src/test/java/akka/grpc/javadsl/ConcatOrNotFoundTest.java
rename to runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java
index 5cee9156..ce39dda5 100644
--- a/runtime/src/test/java/akka/grpc/javadsl/ConcatOrNotFoundTest.java
+++ b/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java
@@ -2,11 +2,11 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.javadsl;
+package org.apache.pekko.grpc.javadsl;
-import akka.grpc.internal.GrpcProtocolNative;
-import akka.http.javadsl.model.*;
-import akka.util.ByteString;
+import org.apache.pekko.grpc.internal.GrpcProtocolNative;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.util.ByteString;
import org.junit.Test;
import org.scalatestplus.junit.JUnitSuite;
diff --git a/runtime/src/test/scala/docs/akka/grpc/client/GrpcClientSettingsCompileOnly.scala b/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala
similarity index 79%
rename from runtime/src/test/scala/docs/akka/grpc/client/GrpcClientSettingsCompileOnly.scala
rename to runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala
index 19f6b914..ef176e92 100644
--- a/runtime/src/test/scala/docs/akka/grpc/client/GrpcClientSettingsCompileOnly.scala
+++ b/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala
@@ -2,11 +2,11 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package docs.akka.grpc.client
+package docs.org.apache.pekko.grpc.client
-import akka.actor.ActorSystem
-import akka.discovery.{ Discovery, ServiceDiscovery }
-import akka.grpc.GrpcClientSettings
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.discovery.{ Discovery, ServiceDiscovery }
+import org.apache.pekko.grpc.GrpcClientSettings
import scala.concurrent.duration._
diff --git a/runtime/src/test/scala/akka/grpc/CodecsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala
similarity index 91%
rename from runtime/src/test/scala/akka/grpc/CodecsSpec.scala
rename to runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala
index 42d603cd..10e4c1dd 100644
--- a/runtime/src/test/scala/akka/grpc/CodecsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala
@@ -2,10 +2,10 @@
* Copyright (C) 2020-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
-import akka.grpc.internal.{ Codecs, Gzip, Identity }
-import akka.grpc.scaladsl.headers
-import akka.http.scaladsl.model.HttpRequest
+package org.apache.pekko.grpc
+import org.apache.pekko.grpc.internal.{ Codecs, Gzip, Identity }
+import org.apache.pekko.grpc.scaladsl.headers
+import org.apache.pekko.http.scaladsl.model.HttpRequest
import io.grpc.Status
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
diff --git a/runtime/src/test/scala/akka/grpc/GrpcClientSettingsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala
similarity index 92%
rename from runtime/src/test/scala/akka/grpc/GrpcClientSettingsSpec.scala
rename to runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala
index 430e93bc..39b53f1e 100644
--- a/runtime/src/test/scala/akka/grpc/GrpcClientSettingsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala
@@ -2,7 +2,7 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc
+package org.apache.pekko.grpc
import com.typesafe.config.ConfigFactory
@@ -10,10 +10,10 @@ import scala.concurrent.duration._
import scala.collection.{ immutable => im }
import scala.concurrent.Future
-import akka.actor.ActorSystem
-import akka.discovery.{ Lookup, ServiceDiscovery }
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.config.ConfigServiceDiscovery
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.config.ConfigServiceDiscovery
import org.scalatest.concurrent.ScalaFutures
import org.scalatest._
@@ -23,7 +23,7 @@ import org.scalatest.wordspec.AnyWordSpec
class GrpcClientSettingsSpec extends AnyWordSpec with Matchers with ScalaFutures with BeforeAndAfterAll {
val clientWithServiceDiscovery = ConfigFactory.parseString("""
//#config-service-discovery
- akka.grpc.client {
+ pekko.grpc.client {
"project.WithConfigServiceDiscovery" {
service-discovery {
mechanism = "config"
@@ -37,7 +37,7 @@ class GrpcClientSettingsSpec extends AnyWordSpec with Matchers with ScalaFutures
}
//#config-service-discovery
- akka.discovery.config.services = {
+ pekko.discovery.config.services = {
from-config {
endpoints = [
{
@@ -57,7 +57,7 @@ class GrpcClientSettingsSpec extends AnyWordSpec with Matchers with ScalaFutures
""")
val clientWithNoServiceName = ConfigFactory.parseString("""
- akka.grpc.client {
+ pekko.grpc.client {
"project.WithNoServiceName" {
service-discovery {
mechanism = "config"
@@ -72,7 +72,7 @@ class GrpcClientSettingsSpec extends AnyWordSpec with Matchers with ScalaFutures
ConfigFactory
.parseString("""
//#client-config
- akka.grpc.client {
+ pekko.grpc.client {
"project.WithSpecificConfiguration" {
service-discovery {
service-name = "my-service"
@@ -93,7 +93,7 @@ class GrpcClientSettingsSpec extends AnyWordSpec with Matchers with ScalaFutures
"The gRPC client settings spec" should {
def sysWithCert(certFileName: String) = {
val clientConfig = ConfigFactory.parseString(s"""
- akka.grpc.client {
+ pekko.grpc.client {
"project.WithSpecificConfiguration" {
service-discovery {
service-name = "my-service"
@@ -162,7 +162,7 @@ class GrpcClientSettingsSpec extends AnyWordSpec with Matchers with ScalaFutures
intercept[IllegalArgumentException] {
GrpcClientSettings.fromConfig("project.MissingConfiguration")
}.getMessage should be(
- "requirement failed: Config path `akka.grpc.client.project.MissingConfiguration` does not exist")
+ "requirement failed: Config path `pekko.grpc.client.project.MissingConfiguration` does not exist")
}
"fail fast if no service name" in {
@@ -180,7 +180,7 @@ class GrpcClientSettingsSpec extends AnyWordSpec with Matchers with ScalaFutures
// given an ActorSystem with a ServiceDiscovery method configured
val sdConfig =
s"""
- |akka.discovery {
+ |pekko.discovery {
| method = "fake-discovery"
| fake-discovery.class = "${classOf[FakeServiceDiscovery].getName}"
|}
diff --git a/runtime/src/test/scala/akka/grpc/internal/AlwaysTimingOutDiscovery.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala
similarity index 60%
rename from runtime/src/test/scala/akka/grpc/internal/AlwaysTimingOutDiscovery.scala
rename to runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala
index fe65d86f..3f96eff5 100644
--- a/runtime/src/test/scala/akka/grpc/internal/AlwaysTimingOutDiscovery.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala
@@ -2,15 +2,15 @@
* Copyright (C) 2019-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import scala.concurrent.Future
import scala.concurrent.duration.FiniteDuration
-import akka.discovery.Lookup
-import akka.discovery.ServiceDiscovery
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.pattern.AskTimeoutException
+import org.apache.pekko.discovery.Lookup
+import org.apache.pekko.discovery.ServiceDiscovery
+import org.apache.pekko.discovery.ServiceDiscovery.Resolved
+import org.apache.pekko.pattern.AskTimeoutException
class AlwaysTimingOutDiscovery extends ServiceDiscovery {
def lookup(lookup: Lookup, resolveTimeout: FiniteDuration): Future[Resolved] =
diff --git a/runtime/src/test/scala/akka/grpc/internal/ChannelUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala
similarity index 96%
rename from runtime/src/test/scala/akka/grpc/internal/ChannelUtilsSpec.scala
rename to runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala
index 6d5d8e01..0998fb50 100644
--- a/runtime/src/test/scala/akka/grpc/internal/ChannelUtilsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala
@@ -2,13 +2,13 @@
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.grpc.internal
+package org.apache.pekko.grpc.internal
import java.util.concurrent.TimeUnit
... 1928 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org