apply fix to copy-pasted method

apache · Oct 27, 2024 · ff0042f · ff0042f
1 parent 5d5b203
commit ff0042f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...rop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala b/...rop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
@@ -120,7 +120,8 @@ object PekkoHttpServerProviderScala extends PekkoHttpServerProvider with Directi
         case _ =>
           response
             .attribute(AttributeKeys.trailer)
-            .map(trailer => Trailer(f(trailer.headers.map((RawHeader.apply _).tupled))))
+            .map(trailer => f(trailer.headers.map((RawHeader.apply _).tupled)))
+            .flatMap(headers => if (headers.isEmpty) None else Some(Trailer(headers)))
             .fold(response)(response.addAttribute(AttributeKeys.trailer, _))
       })
 }
diff --git a/...st/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala b/...st/gen-scala-server/00-interop/src/test/scala/org/apache/pekko/grpc/GrpcInteropSpec.scala
@@ -74,12 +74,11 @@ object PekkoHttpServerProviderScala extends PekkoHttpServerProvider {
                   HttpEntity.LastChunk(last.extension, f(last.trailer))
               }))
         case _ =>
-          val origTrailers = response
+          response
             .attribute(AttributeKeys.trailer)
-            .map(_.headers)
-            .getOrElse(Vector.empty)
-            .map(e => RawHeader(e._1, e._2))
-          response.addAttribute(AttributeKeys.trailer, Trailer(f(origTrailers)))
+            .map(trailer => f(trailer.headers.map((RawHeader.apply _).tupled)))
+            .flatMap(headers => if (headers.isEmpty) None else Some(Trailer(headers)))
+            .fold(response)(response.addAttribute(AttributeKeys.trailer, _))
       })
 }