Fix partial match

http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/HttpMessageRendering.scala

@@ -99,7 +99,7 @@ private[http2] sealed abstract class MessageRendering[R <: HttpMessage] extends
       r.attribute(AttributeKeys.trailer) match {
         case Some(trailer) if trailer.headers.nonEmpty =>
           OptionVal.Some(ParsedHeadersFrame(streamId, endStream = true, trailer.headers, None))
-        case None => OptionVal.None
+        case _ => OptionVal.None
       }
 
     Http2SubStream(r.entity, headersFrame, trailingHeadersFrame,

http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/HttpMessageRenderingSpec.scala

@@ -13,14 +13,14 @@
 
 package org.apache.pekko.http.impl.engine.http2
 
+import com.typesafe.config.ConfigFactory
 import java.time.format.DateTimeFormatter
 import org.apache.pekko
+import pekko.http.scaladsl.settings.{ ClientConnectionSettings, ServerSettings }
 import pekko.event.NoLogging
 import pekko.http.impl.engine.rendering.DateHeaderRendering
 import pekko.http.scaladsl.model.headers._
-import pekko.http.scaladsl.model.{ ContentTypes, DateTime, HttpHeader, TransferEncodings }
-
-import scala.collection.immutable.Seq
+import pekko.http.scaladsl.model._
 import scala.collection.immutable.VectorBuilder
 import scala.util.Try
 import org.scalatest.matchers.should.Matchers
@@ -47,7 +47,7 @@
         ETag("tagetitag"),
         RawHeader("raw", "whatever"),
         new MyCustomHeader("whatever", renderInResponses = true))
       renderServerHeaders(headers, builder)
       val out = builder.result()
       out.exists(_._1 == "etag") shouldBe true
       out.exists(_._1 == "raw") shouldBe true
@@ -56,7 +56,7 @@
 
     "add a date header when none is present" in {
       val builder = new VectorBuilder[(String, String)]
       renderServerHeaders(Seq.empty, builder)
       val date = builder.result().collectFirst {
         case ("date", str) => str
       }
@@ -70,7 +70,7 @@
     "keep the date header if it already is present" in {
       val builder = new VectorBuilder[(String, String)]
       val originalDateTime = DateTime(1981, 3, 6, 20, 30, 24)
       renderServerHeaders(Seq(Date(originalDateTime)), builder)
       val date = builder.result().collectFirst {
         case ("date", str) => str
       }
@@ -80,14 +80,14 @@
 
     "add server header if default provided (in server mode)" in {
       val builder = new VectorBuilder[(String, String)]
       renderServerHeaders(Seq.empty, builder, Some(("server", "default server")))
       val result = builder.result().find(_._1 == "server").map(_._2)
       result shouldEqual Some("default server")
     }
 
     "keep server header if explicitly provided (in server mode)" in {
       val builder = new VectorBuilder[(String, String)]
       renderServerHeaders(Seq(Server("explicit server")), builder, Some(("server", "default server")))
       val result = builder.result().find(_._1 == "server").map(_._2)
       result shouldEqual Some("explicit server")
     }
@@ -99,7 +99,7 @@
         `Content-Length`(42L),
         `Content-Type`(ContentTypes.`application/json`),
         `Transfer-Encoding`(TransferEncodings.gzip))
       renderServerHeaders(invalidExplicitHeaders, builder)
       builder.result().exists(_._1 != "date") shouldBe false
     }
 
@@ -108,7 +108,7 @@
       val shouldNotBeRendered = Seq(
         Host("example.com", 80),
         new MyCustomHeader("whatever", renderInResponses = false))
       renderServerHeaders(shouldNotBeRendered, builder)
       val value1 = builder.result()
       value1.exists(_._1 != "date") shouldBe false
     }
@@ -118,21 +118,21 @@
       val invalidRawHeaders = Seq(
         "connection", "content-length", "content-type", "transfer-encoding", "date", "server").map(name =>
         RawHeader(name, "whatever"))
       renderServerHeaders(invalidRawHeaders, builder)
       builder.result().exists(_._1 != "date") shouldBe false
     }
 
     // Client-specific tests
     "add user-agent header if default provided (in client mode)" in {
       val builder = new VectorBuilder[(String, String)]
       renderClientHeaders(Seq(`User-Agent`("fancy browser")), builder)
       val result = builder.result().find(_._1 == "user-agent").map(_._2)
       result shouldEqual Some("fancy browser")
     }
 
     "keep user-agent header if explicitly provided (in client mode)" in {
       val builder = new VectorBuilder[(String, String)]
       renderClientHeaders(Seq(`User-Agent`("fancier client")), builder, Some(("user-agent", "fancy browser")))
       val result = builder.result().find(_._1 == "user-agent").map(_._2)
       result shouldEqual Some("fancier client")
     }
@@ -147,21 +147,39 @@
       value1.exists(_._1 == "date") shouldBe false
     }
 
+    "handle empty trailer" in {
+      val config = ConfigFactory.load("reference.conf")
+      Try {
+        val rendering = new RequestRendering(ClientConnectionSettings(config), NoLogging)
+        rendering(HttpRequest().withAttributes(Map(AttributeKeys.trailer -> Trailer())))
+      }.isSuccess shouldBe true
+      Try {
+        val rendering = new ResponseRendering(ServerSettings(config), NoLogging, dateHeaderRendering)
+        rendering(
+          HttpResponse().withAttributes(
+            Map(
+              AttributeKeys.trailer -> Trailer(),
+              Http2.streamId -> 0)))
+      }.isSuccess shouldBe true
+    }
+
   }
 
   private def renderClientHeaders(headers: immutable.Seq[HttpHeader], builder: VectorBuilder[(String, String)],
       peerIdHeader: Option[(String, String)] = None): Unit =
     HttpMessageRendering.renderHeaders(headers, builder, peerIdHeader, NoLogging, isServer = false,
       shouldRenderAutoHeaders = true, dateHeaderRendering = DateHeaderRendering.Unavailable)
 
   private def renderServerHeaders(headers: immutable.Seq[HttpHeader], builder: VectorBuilder[(String, String)],
       peerIdHeader: Option[(String, String)] = None): Unit =
     HttpMessageRendering.renderHeaders(headers, builder, peerIdHeader, NoLogging, isServer = true,
       shouldRenderAutoHeaders = true,
-      dateHeaderRendering = new DateHeaderRendering {
-        // fake date rendering
-        override def renderHeaderPair(): (String, String) = "date" -> DateTime.now.toRfc1123DateTimeString
-        override def renderHeaderBytes(): Array[Byte] = ???
-        override def renderHeaderValue(): String = ???
-      })
+      dateHeaderRendering = dateHeaderRendering)
+
+  private lazy val dateHeaderRendering: DateHeaderRendering = new DateHeaderRendering {
+    // fake date rendering
+    override def renderHeaderPair(): (String, String) = "date" -> DateTime.now.toRfc1123DateTimeString
+    override def renderHeaderBytes(): Array[Byte] = ???
+    override def renderHeaderValue(): String = ???
+  }
 }