http2: remove single use ByteStringInputStream (#833)

* http2: remove single use ByteStringInputStream

Also remove useless nesting / finally blocks, arrays do not need closing.

Fixes #553

* Remove unused import for ByteStringInputStream

* Create remove-bytestringinputstream.excludes

* Update HeaderDecompression.scala

---------

Co-authored-by: PJ Fanning <pjfanning@users.noreply.github.com>

Author: jrudolph

http-core/src/main/mima-filters/2.0.x.backwards.excludes/remove-bytestringinputstream.excludes

@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Remove ByteStringInputStream
+ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.http.impl.engine.http2.hpack.ByteStringInputStream")
+ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.http.impl.engine.http2.hpack.ByteStringInputStream$")

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

@@ -92,9 +92,9 @@ private[http2] final class HeaderDecompression(masterHeaderParser: HttpHeaderPar
             }
           }
         }
-        val bis = ByteStringInputStream(payload)
+        val stream = payload.compact.asInputStream
         try {
-          decoder.decode(bis, Receiver)
+          decoder.decode(stream, Receiver) // only compact ByteString supports InputStream with mark/reset
           decoder.endHeaderBlock() // TODO: do we have to check the result here?
 
           push(eventsOut, ParsedHeadersFrame(streamId, endStream, headers.result(), prioInfo))
@@ -104,7 +104,7 @@ private[http2] final class HeaderDecompression(masterHeaderParser: HttpHeaderPar
             fail(eventsOut,
               new Http2Compliance.Http2ProtocolException(ErrorCode.COMPRESSION_ERROR, "Decompression failed."))
         } finally {
-          bis.close()
+          stream.close()
         }
       }
 

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

@@ -16,7 +16,6 @@ package org.apache.pekko.http.impl.engine.http2
 import scala.collection.immutable.VectorBuilder
 
 import org.apache.pekko
-import pekko.http.impl.engine.http2.hpack.ByteStringInputStream
 import pekko.http.scaladsl.model._
 import pekko.http.scaladsl.model.headers.RawHeader
 import pekko.http.shaded.com.twitter.hpack._
@@ -60,16 +59,13 @@ trait Http2FrameHpackSupport extends Http2FrameProbeDelegator with Http2FrameSen
 
   def decodeHeaders(bytes: ByteString): Seq[(String, String)] = {
     val hs = new VectorBuilder[(String, String)]()
-    val bis = ByteStringInputStream(bytes)
-    try
-      decoder.decode(bis,
-        new HeaderListener {
-          def addHeader(name: String, value: String, parsedValue: AnyRef, sensitive: Boolean): AnyRef = {
-            hs += name -> value
-            parsedValue
-          }
-        })
-    finally bis.close()
+    decoder.decode(bytes.compact.asInputStream,
+      new HeaderListener {
+        def addHeader(name: String, value: String, parsedValue: AnyRef, sensitive: Boolean): AnyRef = {
+          hs += name -> value
+          parsedValue
+        }
+      })
     hs.result()
   }
   def decodeHeadersToResponse(bytes: ByteString): HttpResponse =