You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by jr...@apache.org on 2022/11/03 11:23:47 UTC
[incubator-pekko-http] 17/47: core: provide broken stub entries for header parsing for Scala 3
This is an automated email from the ASF dual-hosted git repository.
jrudolph pushed a commit to branch scala-3
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
commit 44d1c28bda1421d36053ea7d6bfcfd2fdba5720f
Author: Johannes Rudolph <jo...@gmail.com>
AuthorDate: Mon Mar 21 14:59:32 2022 +0100
core: provide broken stub entries for header parsing for Scala 3
But at least make it compile for Scala 3
---
.../main/{scala => scala-2}/akka/http/scaladsl/model/HttpHeader.scala | 0
.../akka/http/scaladsl/model/headers/ProductVersion.scala | 0
.../main/{scala => scala-3}/akka/http/scaladsl/model/HttpHeader.scala | 4 ++--
.../akka/http/scaladsl/model/headers/ProductVersion.scala | 4 ++--
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpHeader.scala b/akka-http-core/src/main/scala-2/akka/http/scaladsl/model/HttpHeader.scala
similarity index 100%
copy from akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpHeader.scala
copy to akka-http-core/src/main/scala-2/akka/http/scaladsl/model/HttpHeader.scala
diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ProductVersion.scala b/akka-http-core/src/main/scala-2/akka/http/scaladsl/model/headers/ProductVersion.scala
similarity index 100%
copy from akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ProductVersion.scala
copy to akka-http-core/src/main/scala-2/akka/http/scaladsl/model/headers/ProductVersion.scala
diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpHeader.scala b/akka-http-core/src/main/scala-3/akka/http/scaladsl/model/HttpHeader.scala
similarity index 98%
rename from akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpHeader.scala
rename to akka-http-core/src/main/scala-3/akka/http/scaladsl/model/HttpHeader.scala
index cacba0619..458019c51 100644
--- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpHeader.scala
+++ b/akka-http-core/src/main/scala-3/akka/http/scaladsl/model/HttpHeader.scala
@@ -76,7 +76,7 @@ object HttpHeader {
def parse(name: String, value: String, settings: HeaderParser.Settings = HeaderParser.DefaultSettings): ParsingResult =
if (name.forall(c => CharacterClasses.tchar(c))) {
import akka.parboiled2.Parser.DeliveryScheme.Try
- val parser = new HeaderParser(value, settings)
+ /*val parser = new HeaderParser(value, settings)
parser.`header-field-value`.run() match {
case Success(preProcessedValue) =>
HeaderParser.parseFull(name.toLowerCase, preProcessedValue, settings) match {
@@ -92,7 +92,7 @@ object HttpHeader {
case e => parser.failure(e)
}).info
ParsingResult.Error(info.withSummaryPrepended(s"Illegal HTTP header value"))
- }
+ }*/ ???
} else ParsingResult.Error(ErrorInfo(s"Illegal HTTP header name", name))
/** INTERNAL API */
diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ProductVersion.scala b/akka-http-core/src/main/scala-3/akka/http/scaladsl/model/headers/ProductVersion.scala
similarity index 98%
rename from akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ProductVersion.scala
rename to akka-http-core/src/main/scala-3/akka/http/scaladsl/model/headers/ProductVersion.scala
index 8921ffcfb..6720dfa7d 100644
--- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/ProductVersion.scala
+++ b/akka-http-core/src/main/scala-3/akka/http/scaladsl/model/headers/ProductVersion.scala
@@ -27,7 +27,7 @@ object ProductVersion {
implicit val productsRenderer: Renderer[immutable.Seq[ProductVersion]] = Renderer.seqRenderer[ProductVersion](separator = " ")
/** parses a string of multiple ProductVersions */
- def parseMultiple(string: String): immutable.Seq[ProductVersion] = {
+ def parseMultiple(string: String): immutable.Seq[ProductVersion] = ??? /*{
val parser = new HeaderParser(string)
def fail(msg: String) = throw new IllegalArgumentException(s"'$string' is not a legal sequence of ProductVersions: $msg")
parser.products.run() match {
@@ -35,5 +35,5 @@ object ProductVersion {
case Failure(e: ParseError) => fail(parser.formatError(e))
case Failure(e) => fail(e.getMessage)
}
- }
+ }*/
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org