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/pekko-grpc.git
commit 0f0fff7f5162da363fea1285c1dde92c23779dbb Author: Scala Steward <[email protected]> AuthorDate: Sat Jan 17 16:23:47 2026 +0000 Reformat with scalafmt 3.10.4 Executed command: scalafmt --non-interactive --- build.sbt | 44 ++++++++------ .../scaladsl/ScalaMarshallersCodeGenerator.scala | 3 +- project/Common.scala | 67 +++++++++++----------- .../pekko/grpc/internal/GrpcProtocolNative.scala | 9 +-- .../pekko/grpc/internal/PekkoHttpClientUtils.scala | 3 +- .../apache/pekko/grpc/internal/TelemetrySpi.scala | 7 +-- .../apache/pekko/grpc/scaladsl/WebHandler.scala | 3 +- .../sbt-test/gen-java/01-gen-basic-java/build.sbt | 3 +- .../gen-java/04-crash-on-keywords/build.sbt | 3 +- .../apache/pekko/grpc/PekkoGrpcClientTester.scala | 7 +-- 10 files changed, 73 insertions(+), 76 deletions(-) diff --git a/build.sbt b/build.sbt index e1e928ef..984eeebb 100644 --- a/build.sbt +++ b/build.sbt @@ -217,20 +217,21 @@ lazy val interopTests = Project(id = "interop-tests", base = file("interop-tests .settings(inConfig(Test)(Seq( reStart / mainClass := (Test / run / mainClass).value, { import spray.revolver.Actions._ - reStart := Def - .inputTask { - restartApp( - streams.value, - reLogTag.value, - thisProjectRef.value, - reForkOptions.value, - (reStart / mainClass).value, - (reStart / fullClasspath).value, - reStartArgs.value, - startArgsParser.parsed) - } - .dependsOn(Compile / products) - .evaluated + reStart := + Def + .inputTask { + restartApp( + streams.value, + reLogTag.value, + thisProjectRef.value, + reForkOptions.value, + (reStart / mainClass).value, + (reStart / fullClasspath).value, + reStartArgs.value, + startArgsParser.parsed) + } + .dependsOn(Compile / products) + .evaluated }))).enablePlugins(NoPublish) lazy val benchmarks = Project(id = "benchmarks", base = file("benchmarks")) @@ -270,12 +271,17 @@ lazy val docs = Project(id = "docs", base = file("docs")) "scaladoc.scala.base_url" -> "https://www.scala-lang.org/api/current/";, // Apache Pekko "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/${Dependencies.Versions.pekkoBinary}/%s";, - "scaladoc.org.apache.pekko.base_url" -> s"https://pekko.apache.org/api/pekko/${Dependencies.Versions.pekkoBinary}/";, - "javadoc.org.apache.pekko.base_url" -> s"https://pekko.apache.org/japi/pekko/${Dependencies.Versions.pekkoBinary}/";, + "scaladoc.org.apache.pekko.base_url" -> + s"https://pekko.apache.org/api/pekko/${Dependencies.Versions.pekkoBinary}/";, + "javadoc.org.apache.pekko.base_url" -> + s"https://pekko.apache.org/japi/pekko/${Dependencies.Versions.pekkoBinary}/";, // Apache Pekko HTTP - "extref.pekko-http.base_url" -> s"https://pekko.apache.org/docs/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/%s";, - "scaladoc.org.apache.pekko.http.base_url" -> s"https://pekko.apache.org/api/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/";, - "javadoc.org.apache.pekko.http.base_url" -> s"https://pekko.apache.org/japi/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/";, + "extref.pekko-http.base_url" -> + s"https://pekko.apache.org/docs/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/%s";, + "scaladoc.org.apache.pekko.http.base_url" -> + s"https://pekko.apache.org/api/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/";, + "javadoc.org.apache.pekko.http.base_url" -> + s"https://pekko.apache.org/japi/pekko-http/${Dependencies.Versions.pekkoHttpBinary}/";, // Apache Pekko gRPC "scaladoc.org.apache.pekko.grpc.base_url" -> s"/${(Preprocess / siteSubdirName).value}/", "javadoc.org.apache.pekko.grpc.base_url" -> "" // @apidoc links to Scaladoc diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala index 57442e18..2f89bde7 100644 --- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala +++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala @@ -31,7 +31,8 @@ trait ScalaMarshallersCodeGenerator extends ScalaCodeGenerator { override def suggestedDependencies = (scalaBinaryVersion: CodeGenerator.ScalaBinaryVersion) => - Artifact("org.apache.pekko", s"pekko-http_${scalaBinaryVersion.prefix}", BuildInfo.pekkoHttpVersion) +: super + Artifact("org.apache.pekko", s"pekko-http_${scalaBinaryVersion.prefix}", BuildInfo.pekkoHttpVersion) +: + super .suggestedDependencies(scalaBinaryVersion) def generateMarshalling( diff --git a/project/Common.scala b/project/Common.scala index 0f4fd476..82ba63cc 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -38,41 +38,44 @@ object Common extends AutoPlugin { "Contributors", "[email protected]", url("https://github.com/apache/pekko-grpc/graphs/contributors";)), - description := "Apache Pekko gRPC - Support for building streaming gRPC servers and clients on top of Pekko Streams.") + description := + "Apache Pekko gRPC - Support for building streaming gRPC servers and clients on top of Pekko Streams.") override lazy val projectSettings = Seq( projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value), - scalacOptions ++= (if (!isScala3.value) - Seq( - "-unchecked", - "-deprecation", - "-language:_", - "-Xfatal-warnings", - "-Ywarn-unused", - "-encoding", - "UTF-8") - else - Seq( - "-unchecked", - "-deprecation", - "-language:_", - "-Xfatal-warnings", - "-Wunused:imports", - "-encoding", - "UTF-8")), - Compile / scalacOptions ++= (if (!isScala3.value) - Seq( - // Generated code for methods/fields marked 'deprecated' - "-Wconf:msg=Marked as deprecated in proto file:silent", - // ignore imports in templates (FIXME why is that trailing .* needed?) - "-Wconf:src=.*.txt.*:silent", - "-Wconf:cat=unused-nowarn:silent") - else - Seq( - // Generated code for methods/fields marked 'deprecated' - "-Wconf:msg=Marked as deprecated in proto file:silent", - "-Wconf:msg=unused import:silent", - "-Wconf:cat=feature:silent")), + scalacOptions ++= + (if (!isScala3.value) + Seq( + "-unchecked", + "-deprecation", + "-language:_", + "-Xfatal-warnings", + "-Ywarn-unused", + "-encoding", + "UTF-8") + else + Seq( + "-unchecked", + "-deprecation", + "-language:_", + "-Xfatal-warnings", + "-Wunused:imports", + "-encoding", + "UTF-8")), + Compile / scalacOptions ++= + (if (!isScala3.value) + Seq( + // Generated code for methods/fields marked 'deprecated' + "-Wconf:msg=Marked as deprecated in proto file:silent", + // ignore imports in templates (FIXME why is that trailing .* needed?) + "-Wconf:src=.*.txt.*:silent", + "-Wconf:cat=unused-nowarn:silent") + else + Seq( + // Generated code for methods/fields marked 'deprecated' + "-Wconf:msg=Marked as deprecated in proto file:silent", + "-Wconf:msg=unused import:silent", + "-Wconf:cat=feature:silent")), Compile / console / scalacOptions ~= (_.filterNot(consoleDisabledOptions.contains)), javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation"), Compile / compile / javacOptions ++= Seq("--release", "17"), diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala index b5c34865..3d4085ff 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala @@ -17,14 +17,7 @@ import org.apache.pekko import pekko.grpc.GrpcProtocol._ import pekko.http.scaladsl.model.HttpEntity.{ Chunk, ChunkStreamPart, LastChunk } import pekko.http.scaladsl.model.{ - AttributeKey, - AttributeKeys, - HttpEntity, - HttpHeader, - HttpProtocols, - HttpResponse, - StatusCodes, - Trailer + AttributeKey, AttributeKeys, HttpEntity, HttpHeader, HttpProtocols, HttpResponse, StatusCodes, Trailer } import pekko.util.ByteString diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala index cc685115..508ba6e3 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala @@ -181,7 +181,8 @@ object PekkoHttpClientUtils { val scheme = if (settings.useTls) "https" else "http" val httpRequest = GrpcRequestHelpers( Uri( - s"${scheme}://${settings.overrideAuthority.getOrElse(settings.serviceName)}/" + descriptor.getFullMethodName), + s"${scheme}://${settings.overrideAuthority.getOrElse(settings.serviceName)}/" + + descriptor.getFullMethodName), GrpcEntityHelpers.metadataHeaders(headers.entries), source) responseToSource(singleRequest(httpRequest), deserializer) diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala index 67d5fa15..dab9c4c9 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala @@ -15,12 +15,7 @@ package org.apache.pekko.grpc.internal import org.apache.pekko import pekko.actor.{ - ActorSystem, - ClassicActorSystemProvider, - ExtendedActorSystem, - Extension, - ExtensionId, - ExtensionIdProvider + ActorSystem, ClassicActorSystemProvider, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } import pekko.annotation.{ InternalApi, InternalStableApi } import pekko.http.javadsl.model.HttpRequest diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala index 933a0240..97240dda 100644 --- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala +++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala @@ -46,7 +46,8 @@ object WebHandler { `Accept-Encoding`.name)) private[grpc] def isCorsPreflightRequest(r: jmodel.HttpRequest): Boolean = - r.method == HttpMethods.OPTIONS && r.getHeader(classOf[Origin]).isPresent && r + r.method == HttpMethods.OPTIONS && r.getHeader(classOf[Origin]).isPresent && + r .getHeader(classOf[`Access-Control-Request-Method`]) .isPresent diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt index 5109d391..72db2d1d 100644 --- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt @@ -17,5 +17,6 @@ javacOptions += "-Xdoclint:all" pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java) -libraryDependencies += "com.google.protobuf" % "protobuf-java" % org.apache.pekko.grpc.gen.BuildInfo +libraryDependencies += "com.google.protobuf" % "protobuf-java" % +org.apache.pekko.grpc.gen.BuildInfo .googleProtobufJavaVersion % "protobuf" diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt index 5109d391..72db2d1d 100644 --- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt @@ -17,5 +17,6 @@ javacOptions += "-Xdoclint:all" pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java) -libraryDependencies += "com.google.protobuf" % "protobuf-java" % org.apache.pekko.grpc.gen.BuildInfo +libraryDependencies += "com.google.protobuf" % "protobuf-java" % +org.apache.pekko.grpc.gen.BuildInfo .googleProtobufJavaVersion % "protobuf" diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/PekkoGrpcClientTester.scala b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/PekkoGrpcClientTester.scala index 1d11cbb8..356f1ac8 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/PekkoGrpcClientTester.scala +++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/PekkoGrpcClientTester.scala @@ -18,12 +18,7 @@ import pekko.actor.ActorSystem import pekko.stream.scaladsl.{ Keep, Sink, Source } import com.google.protobuf.ByteString import io.grpc.testing.integration.messages.{ - Payload, - ResponseParameters, - SimpleRequest, - StreamingOutputCallRequest, - StreamingOutputCallResponse, - _ + Payload, ResponseParameters, SimpleRequest, StreamingOutputCallRequest, StreamingOutputCallResponse, _ } import io.grpc.testing.integration.empty.Empty import io.grpc.testing.integration2.{ ChannelBuilder, ClientTester, Settings } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
