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-http.git
The following commit(s) were added to refs/heads/main by this push:
new 86d81cf2e use Scala converters in more places (#774)
86d81cf2e is described below
commit 86d81cf2e70f18c420bc3b87133636ed20d87f62
Author: PJ Fanning <[email protected]>
AuthorDate: Sun Sep 14 11:53:53 2025 +0100
use Scala converters in more places (#774)
* add more use of scala conversions
* Update JavaMapping.scala
* Update FormFieldDirectives.scala
---
.../scala/org/apache/pekko/http/impl/model/JavaUri.scala | 2 +-
.../org/apache/pekko/http/impl/model/UriJavaAccessor.scala | 2 +-
.../scala/org/apache/pekko/http/impl/util/JavaMapping.scala | 12 ++++++------
.../pekko/http/javadsl/settings/Http2ServerSettings.scala | 3 ++-
.../org/apache/pekko/http/scaladsl/model/HttpCharset.scala | 2 +-
.../org/apache/pekko/http/scaladsl/model/HttpMessage.scala | 2 +-
.../org/apache/pekko/http/scaladsl/model/MediaRange.scala | 2 +-
.../pekko/http/scaladsl/settings/Http2ServerSettings.scala | 2 +-
.../http/javadsl/server/directives/FormFieldDirectives.scala | 10 ++++------
.../http/javadsl/server/directives/HeaderDirectives.scala | 2 +-
.../pekko/http/scaladsl/unmarshalling/Unmarshaller.scala | 2 +-
11 files changed, 20 insertions(+), 21 deletions(-)
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/model/JavaUri.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/model/JavaUri.scala
index cbf281e51..826ca9ae9 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/impl/model/JavaUri.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/impl/model/JavaUri.scala
@@ -52,7 +52,7 @@ private[http] case class JavaUri(uri: sm.Uri) extends jm.Uri {
case Segment(head, tail) => head :: gatherSegments(tail)
case Slash(tail) => gatherSegments(tail)
}
- import collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
gatherSegments(uri.path).asJava
}
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/model/UriJavaAccessor.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/model/UriJavaAccessor.scala
index 42190bc7c..890b15e54 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/impl/model/UriJavaAccessor.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/impl/model/UriJavaAccessor.scala
@@ -30,7 +30,7 @@ private[http] abstract class UriJavaAccessor
*/
@InternalApi
private[http] object UriJavaAccessor {
- import collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
def hostApply(string: String): Host = Uri.Host(string)
def hostApply(string: String, mode: Uri.ParsingMode): Host =
Uri.Host(string, mode = mode)
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/util/JavaMapping.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/util/JavaMapping.scala
index 6b4bc0e23..fdceec204 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/impl/util/JavaMapping.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/impl/util/JavaMapping.scala
@@ -22,8 +22,6 @@ import org.apache.pekko
import pekko.japi.Pair
import pekko.stream.{ javadsl, scaladsl, FlowShape, Graph }
-import scala.collection.immutable
-import scala.reflect.ClassTag
import pekko.NotUsed
import pekko.annotation.InternalApi
import pekko.http.impl.model.{ JavaQuery, JavaUri }
@@ -37,9 +35,11 @@ import pekko.http.javadsl.{
import pekko.http.{ javadsl => jdsl, scaladsl => sdsl }
import pekko.http.scaladsl.{ model => sm }
import pekko.util.FutureConverters._
-import pekko.util.OptionConverters._
+import scala.collection.immutable
import scala.concurrent.{ ExecutionContext, Future }
+import scala.jdk.OptionConverters._
+import scala.reflect.ClassTag
import scala.util.Try
/** INTERNAL API */
@@ -122,15 +122,15 @@ private[http] object JavaMapping {
implicit def iterableMapping[_J, _S](
implicit mapping: JavaMapping[_J, _S]): JavaMapping[jl.Iterable[_J],
immutable.Seq[_S]] =
new JavaMapping[jl.Iterable[_J], immutable.Seq[_S]] {
- import collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
def toJava(scalaObject: immutable.Seq[_S]): jl.Iterable[_J] =
scalaObject.map(mapping.toJava).asJavaCollection
def toScala(javaObject: jl.Iterable[_J]): immutable.Seq[_S] =
-
Implicits.convertSeqToScala(iterableAsScalaIterableConverter(javaObject).asScala.toSeq)
+ Implicits.convertSeqToScala(javaObject.asScala.toSeq)
}
implicit def map[K, V]: JavaMapping[ju.Map[K, V], immutable.Map[K, V]] =
new JavaMapping[ju.Map[K, V], immutable.Map[K, V]] {
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
def toScala(javaObject: ju.Map[K, V]): immutable.Map[K, V] =
javaObject.asScala.toMap
def toJava(scalaObject: immutable.Map[K, V]): ju.Map[K, V] =
scalaObject.asJava
}
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/Http2ServerSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/Http2ServerSettings.scala
index a7539298e..16731745c 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/Http2ServerSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/Http2ServerSettings.scala
@@ -18,9 +18,10 @@ import java.time.Duration
import org.apache.pekko
import pekko.annotation.DoNotInherit
import pekko.http.scaladsl
-import pekko.util.ccompat.JavaConverters._
import com.typesafe.config.Config
+
import scala.concurrent.duration._
+import scala.jdk.CollectionConverters._
@DoNotInherit
trait Http2ServerSettings {
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpCharset.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpCharset.scala
index c74ec3384..749ee3b29 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpCharset.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpCharset.scala
@@ -89,7 +89,7 @@ final case class HttpCharset private[http] (override val
value: String)(val alia
/** Java API */
def getAliases: JIterable[String] = {
- import collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
aliases.asJava
}
}
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpMessage.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpMessage.scala
index 43b307b3e..59e877b5b 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpMessage.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpMessage.scala
@@ -210,7 +210,7 @@ sealed trait HttpMessage extends jm.HttpMessage {
def transformEntityDataBytes[M](transformer: Graph[FlowShape[ByteString,
ByteString], M]): Self
- import collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
/** Java API */
def getHeaders: JIterable[jm.HttpHeader] = (headers:
immutable.Seq[jm.HttpHeader]).asJava
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/MediaRange.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/MediaRange.scala
index 96ce4ce4d..f4b12ab21 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/MediaRange.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/MediaRange.scala
@@ -47,7 +47,7 @@ sealed abstract class MediaRange extends jm.MediaRange with
Renderable with With
/** Java API */
def getParams: util.Map[String, String] = {
- import collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
params.asJava
}
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala
index 692fbd462..a239f0d5f 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala
@@ -19,11 +19,11 @@ import pekko.annotation.DoNotInherit
import pekko.annotation.InternalApi
import pekko.http.impl.util._
import pekko.http.javadsl
-import pekko.util.ccompat.JavaConverters._
import com.typesafe.config.Config
import scala.concurrent.duration.Duration
import scala.concurrent.duration.FiniteDuration
+import scala.jdk.CollectionConverters._
/**
* INTERNAL API
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/FormFieldDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/FormFieldDirectives.scala
index 14fe0378b..066f97598 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/FormFieldDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/FormFieldDirectives.scala
@@ -20,15 +20,13 @@ import java.util.function.{ Function => JFunction }
import org.apache.pekko
import pekko.http.javadsl.unmarshalling.Unmarshaller
-
-import scala.collection.JavaConverters._
-import pekko.http.impl.util.JavaMapping.Implicits._
-
import pekko.http.javadsl.server.Route
-
import pekko.http.scaladsl.server.{ Directives => D }
import pekko.http.scaladsl.server.directives.ParameterDirectives._
-import pekko.util.OptionConverters._
+
+import scala.jdk.CollectionConverters._
+import pekko.http.impl.util.JavaMapping.Implicits._
+import scala.jdk.OptionConverters._
abstract class FormFieldDirectives extends FileUploadDirectives {
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/HeaderDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/HeaderDirectives.scala
index 9524834ec..160fee5c3 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/HeaderDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/HeaderDirectives.scala
@@ -25,8 +25,8 @@ import pekko.http.javadsl.model.HttpHeader
import pekko.http.javadsl.server.Route
import pekko.http.scaladsl.model.headers.{ ModeledCustomHeader,
ModeledCustomHeaderCompanion }
import pekko.http.scaladsl.server.directives.{ HeaderDirectives => D,
HeaderMagnet }
-import pekko.util.OptionConverters._
+import scala.jdk.OptionConverters._
import scala.reflect.ClassTag
import scala.util.{ Failure, Success }
diff --git
a/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/Unmarshaller.scala
b/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/Unmarshaller.scala
index 2c26b17b5..6cd4a0947 100644
---
a/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/Unmarshaller.scala
+++
b/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/Unmarshaller.scala
@@ -23,7 +23,7 @@ import pekko.http.impl.util.JavaMapping.Implicits._
import pekko.stream.Materializer
import pekko.util.OptionConverters._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import scala.concurrent.{ ExecutionContext, Future }
import scala.util.control.{ NoStackTrace, NonFatal }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
