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 9bbea6451 update most option and collection converter code (#771)
9bbea6451 is described below
commit 9bbea6451ad30ec4f567d07a4a7b934b427c659f
Author: PJ Fanning <[email protected]>
AuthorDate: Sun Sep 14 09:38:52 2025 +0100
update most option and collection converter code (#771)
---
.../scala/docs/ApiMayChangeDocCheckerSpec.scala | 2 +-
.../main/scala/org/apache/pekko/BenchRunner.scala | 2 +-
.../org/apache/pekko/http/caching/LfuCache.scala | 2 +-
.../apache/pekko/http/caching/scaladsl/Cache.scala | 2 +-
.../java/org/apache/pekko/http/impl/util/Util.java | 3 +-
.../pekko/http/javadsl/model/RemoteAddress.java | 2 +-
.../javadsl/model/headers/CacheDirectives.java | 4 ++-
.../http/javadsl/model/headers/HttpChallenge.java | 3 +-
.../http/javadsl/model/headers/HttpCookie.java | 3 +-
.../http/javadsl/model/sse/ServerSentEvent.java | 3 +-
.../org/apache/pekko/http/ccompat/MapHelpers.scala | 2 +-
.../engine/client/pool/NewHostConnectionPool.scala | 2 +-
.../apache/pekko/http/impl/model/JavaQuery.scala | 2 +-
.../http/impl/settings/ParserSettingsImpl.scala | 10 +++----
.../http/impl/util/SettingsCompanionImpl.scala | 2 +-
.../apache/pekko/http/javadsl/ConnectHttp.scala | 3 +-
.../settings/ClientConnectionSettings.scala | 8 +++---
.../javadsl/settings/ConnectionPoolSettings.scala | 2 +-
.../http/javadsl/settings/ParserSettings.scala | 13 ++++-----
.../http/javadsl/settings/ServerSettings.scala | 2 +-
.../pekko/http/scaladsl/model/ContentRange.scala | 4 ++-
.../pekko/http/scaladsl/model/HttpEntity.scala | 2 +-
.../pekko/http/scaladsl/model/Multipart.scala | 33 +++++++++++-----------
.../http/scaladsl/model/headers/HttpCookie.scala | 3 +-
.../http/scaladsl/model/sse/ServerSentEvent.scala | 6 ++--
.../http/scaladsl/model/ws/WebSocketUpgrade.scala | 2 +-
.../scaladsl/settings/ConnectionPoolSettings.scala | 2 +-
.../http/scaladsl/settings/ParserSettings.scala | 6 ++--
.../http/scaladsl/settings/ServerSettings.scala | 6 ++--
.../pekko/http/javadsl/model/JavaApiSpec.scala | 2 +-
.../scala/org/apache/pekko/testkit/PekkoSpec.scala | 2 +-
.../pekko/http/cors/scaladsl/CorsRejection.scala | 2 +-
.../http/cors/scaladsl/settings/CorsSettings.scala | 5 ++--
.../http/javadsl/testkit/TestRouteResult.scala | 23 ++++++++-------
.../javadsl/testkit/WSTestRequestBuilding.scala | 9 +++---
.../pekko/remote/testkit/MultiNodeConfig.scala | 4 +--
.../pekko/http/scaladsl/server/RejectionSpec.scala | 2 +-
.../sse/EventStreamUnmarshallingSpec.scala | 3 +-
.../javadsl/server/JavaPathMatchers.scala.template | 2 +-
.../pekko/http/javadsl/server/PathMatchers.scala | 7 ++---
.../http/javadsl/server/RejectionHandler.scala | 8 +++---
.../pekko/http/javadsl/server/Rejections.scala | 16 +++++------
.../server/directives/AttributeDirectives.scala | 3 +-
.../server/directives/CodingDirectives.scala | 3 +-
.../server/directives/CookieDirectives.scala | 4 +--
.../server/directives/DebuggingDirectives.scala | 2 +-
.../directives/FileAndResourceDirectives.scala | 6 ++--
.../javadsl/server/directives/HostDirectives.scala | 2 +-
.../javadsl/server/directives/MiscDirectives.scala | 2 +-
.../server/directives/ParameterDirectives.scala | 4 +--
.../server/directives/SecurityDirectives.scala | 2 +-
.../server/directives/WebSocketDirectives.scala | 2 +-
.../http/javadsl/unmarshalling/Unmarshaller.scala | 4 +--
.../pekko/http/scaladsl/server/Rejection.scala | 4 +--
.../pekko/http/scaladsl/server/RouteResult.scala | 2 +-
.../directives/FileAndResourceDirectives.scala | 17 ++++++-----
56 files changed, 143 insertions(+), 135 deletions(-)
diff --git a/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala
b/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala
index d45ff1719..829ed12bb 100644
--- a/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala
+++ b/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala
@@ -21,9 +21,9 @@ import org.reflections.scanners.{ MethodAnnotationsScanner,
Scanners, TypeAnnota
import org.reflections.util.{ ClasspathHelper, ConfigurationBuilder }
import org.scalatest.Assertion
-import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.io.Source
+import scala.jdk.CollectionConverters._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
b/http-bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
index 5fc820f3a..33a7cb26c 100644
--- a/http-bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
+++ b/http-bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
@@ -20,7 +20,7 @@ import org.openjdk.jmh.runner.options.CommandLineOptions
object BenchRunner {
def main(args: Array[String]): Unit = {
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
// @formatter:off
val args2 = args.toList.flatMap {
diff --git
a/http-caching/src/main/scala/org/apache/pekko/http/caching/LfuCache.scala
b/http-caching/src/main/scala/org/apache/pekko/http/caching/LfuCache.scala
index 9ea73de70..bb0606ad5 100755
--- a/http-caching/src/main/scala/org/apache/pekko/http/caching/LfuCache.scala
+++ b/http-caching/src/main/scala/org/apache/pekko/http/caching/LfuCache.scala
@@ -16,9 +16,9 @@ package org.apache.pekko.http.caching
import java.util.concurrent.{ CompletableFuture, Executor, TimeUnit }
import java.util.function.BiFunction
-import scala.collection.JavaConverters._
import scala.concurrent.duration.Duration
import scala.concurrent.{ ExecutionContext, Future }
+import scala.jdk.CollectionConverters._
import com.github.benmanes.caffeine.cache.{ AsyncCache, Caffeine }
import org.apache.pekko
diff --git
a/http-caching/src/main/scala/org/apache/pekko/http/caching/scaladsl/Cache.scala
b/http-caching/src/main/scala/org/apache/pekko/http/caching/scaladsl/Cache.scala
index b5e3005bc..1a740292f 100755
---
a/http-caching/src/main/scala/org/apache/pekko/http/caching/scaladsl/Cache.scala
+++
b/http-caching/src/main/scala/org/apache/pekko/http/caching/scaladsl/Cache.scala
@@ -21,9 +21,9 @@ import pekko.annotation.{ ApiMayChange, DoNotInherit }
import pekko.japi.function.{ Creator, Procedure }
import pekko.util.FutureConverters._
-import scala.collection.JavaConverters._
import scala.collection.immutable
import scala.concurrent.{ ExecutionContext, Future, Promise }
+import scala.jdk.CollectionConverters._
/**
* API MAY CHANGE
diff --git a/http-core/src/main/java/org/apache/pekko/http/impl/util/Util.java
b/http-core/src/main/java/org/apache/pekko/http/impl/util/Util.java
index 4cb47cda0..254ead19e 100644
--- a/http-core/src/main/java/org/apache/pekko/http/impl/util/Util.java
+++ b/http-core/src/main/java/org/apache/pekko/http/impl/util/Util.java
@@ -16,9 +16,10 @@ package org.apache.pekko.http.impl.util;
import scala.None$;
import scala.collection.immutable.Map$;
import scala.collection.immutable.Seq;
+import scala.jdk.javaapi.OptionConverters;
+
import org.apache.pekko.stream.scaladsl.Source;
import org.apache.pekko.http.ccompat.MapHelpers;
-import org.apache.pekko.util.OptionConverters;
import java.util.Arrays;
import java.util.Map;
diff --git
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/RemoteAddress.java
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/RemoteAddress.java
index e5d2ebf0e..c747064d6 100644
---
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/RemoteAddress.java
+++
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/RemoteAddress.java
@@ -17,7 +17,7 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.Optional;
-import org.apache.pekko.util.OptionConverters;
+import scala.jdk.javaapi.OptionConverters;
public abstract class RemoteAddress {
public abstract boolean isUnknown();
diff --git
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/CacheDirectives.java
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/CacheDirectives.java
index 73430bff4..7249ae791 100644
---
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/CacheDirectives.java
+++
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/CacheDirectives.java
@@ -15,8 +15,10 @@ package org.apache.pekko.http.javadsl.model.headers;
import java.util.Optional;
import java.util.OptionalLong;
+
+import scala.jdk.javaapi.OptionConverters;
+
import org.apache.pekko.http.impl.util.Util;
-import org.apache.pekko.util.OptionConverters;
public final class CacheDirectives {
private CacheDirectives() {}
diff --git
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpChallenge.java
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpChallenge.java
index b9a8428ba..761dddc51 100644
---
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpChallenge.java
+++
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpChallenge.java
@@ -14,12 +14,13 @@
package org.apache.pekko.http.javadsl.model.headers;
import org.apache.pekko.http.impl.util.Util;
-import org.apache.pekko.util.OptionConverters;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
+import scala.jdk.javaapi.OptionConverters;
+
public abstract class HttpChallenge {
public abstract String scheme();
diff --git
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpCookie.java
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpCookie.java
index 5b28c16af..a053a2571 100644
---
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpCookie.java
+++
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpCookie.java
@@ -16,11 +16,12 @@ package org.apache.pekko.http.javadsl.model.headers;
import org.apache.pekko.annotation.DoNotInherit;
import org.apache.pekko.http.javadsl.model.DateTime;
import org.apache.pekko.http.impl.util.Util;
-import org.apache.pekko.util.OptionConverters;
import java.util.Optional;
import java.util.OptionalLong;
+import scala.jdk.javaapi.OptionConverters;
+
@DoNotInherit
public abstract class HttpCookie {
public abstract String name();
diff --git
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEvent.java
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEvent.java
index ffeb9101e..fd71c54e0 100644
---
a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEvent.java
+++
b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEvent.java
@@ -19,8 +19,9 @@ package org.apache.pekko.http.javadsl.model.sse;
import java.util.Optional;
import java.util.OptionalInt;
-import org.apache.pekko.util.OptionConverters;
import scala.Option;
+import scala.jdk.javaapi.OptionConverters;
+
import org.apache.pekko.http.impl.util.Util;
/**
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/ccompat/MapHelpers.scala
b/http-core/src/main/scala/org/apache/pekko/http/ccompat/MapHelpers.scala
index 456f01754..747ec6ab5 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/ccompat/MapHelpers.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/ccompat/MapHelpers.scala
@@ -15,7 +15,7 @@ package org.apache.pekko.http.ccompat
object MapHelpers {
def convertMapToScala[K, V](jmap: java.util.Map[K, V]):
scala.collection.immutable.Map[K, V] = {
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
Map.empty.concat(jmap.asScala)
}
}
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/pool/NewHostConnectionPool.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/pool/NewHostConnectionPool.scala
index 6327bf1a4..7b0bcb191 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/pool/NewHostConnectionPool.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/pool/NewHostConnectionPool.scala
@@ -33,9 +33,9 @@ import pekko.stream._
import pekko.stream.scaladsl.{ Flow, Keep, Sink, Source }
import pekko.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler
}
-import scala.collection.JavaConverters._
import scala.concurrent.Future
import scala.concurrent.duration._
+import scala.jdk.CollectionConverters._
import scala.util.control.{ NoStackTrace, NonFatal }
import scala.util.{ Failure, Random, Success, Try }
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/model/JavaQuery.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/model/JavaQuery.scala
index 945445ce1..81f460f2c 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/impl/model/JavaQuery.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/impl/model/JavaQuery.scala
@@ -27,7 +27,7 @@ import pekko.http.scaladsl.{ model => sm }
import pekko.japi.Pair
import org.parboiled2.CharPredicate
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import pekko.http.impl.util.JavaMapping.Implicits._
/** INTERNAL API */
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/settings/ParserSettingsImpl.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/settings/ParserSettingsImpl.scala
index c8999d0ce..f6958dc0f 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/impl/settings/ParserSettingsImpl.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/impl/settings/ParserSettingsImpl.scala
@@ -13,8 +13,10 @@
package org.apache.pekko.http.impl.settings
+import com.typesafe.config.Config
import org.apache.pekko
import pekko.annotation.InternalApi
+import pekko.http.impl.util._
import pekko.http.scaladsl.settings.ParserSettings.{
ConflictingContentTypeHeaderProcessingMode,
CookieParsingMode,
@@ -22,13 +24,11 @@ import pekko.http.scaladsl.settings.ParserSettings.{
IllegalResponseHeaderNameProcessingMode,
IllegalResponseHeaderValueProcessingMode
}
-import pekko.util.ConstantFun
-import com.typesafe.config.Config
-
-import scala.collection.JavaConverters._
import pekko.http.scaladsl.model._
-import pekko.http.impl.util._
import pekko.http.scaladsl.settings.ParserSettings
+import pekko.util.ConstantFun
+
+import scala.jdk.CollectionConverters._
/** INTERNAL API */
@InternalApi
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/util/SettingsCompanionImpl.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/util/SettingsCompanionImpl.scala
index 8987b0fa5..c4272a862 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/impl/util/SettingsCompanionImpl.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/impl/util/SettingsCompanionImpl.scala
@@ -20,7 +20,7 @@ import com.typesafe.config.ConfigFactory._
import scala.util.control.NonFatal
import scala.collection.immutable.ListMap
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.pekko
import pekko.actor.{ ActorRefFactory, ActorSystem }
import pekko.annotation.InternalApi
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/ConnectHttp.scala
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/ConnectHttp.scala
index 7191d0182..5aa18dd8e 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/javadsl/ConnectHttp.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/javadsl/ConnectHttp.scala
@@ -16,10 +16,11 @@ package org.apache.pekko.http.javadsl
import java.util.Locale
import java.util.Optional
+import scala.jdk.OptionConverters._
+
import org.apache.pekko
import pekko.annotation.{ DoNotInherit, InternalApi }
import pekko.http.javadsl.model.Uri
-import pekko.util.OptionConverters._
@DoNotInherit
abstract class ConnectHttp {
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ClientConnectionSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ClientConnectionSettings.scala
index 8c4eba6b9..17f8c35aa 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ClientConnectionSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ClientConnectionSettings.scala
@@ -17,6 +17,7 @@ import java.net.InetSocketAddress
import java.util.function.Supplier
import java.util.{ Optional, Random }
+import com.typesafe.config.Config
import org.apache.pekko
import pekko.actor.ActorSystem
import pekko.annotation.ApiMayChange
@@ -24,13 +25,12 @@ import pekko.annotation.DoNotInherit
import pekko.http.impl.settings.ClientConnectionSettingsImpl
import pekko.http.javadsl.ClientTransport
import pekko.http.javadsl.model.headers.UserAgent
-import pekko.io.Inet.SocketOption
-import com.typesafe.config.Config
import pekko.http.impl.util.JavaMapping.Implicits._
-import pekko.util.OptionConverters._
+import pekko.io.Inet.SocketOption
-import scala.collection.JavaConverters._
import scala.concurrent.duration.{ Duration, FiniteDuration }
+import scala.jdk.CollectionConverters._
+import scala.jdk.OptionConverters._
/**
* Public API but not intended for subclassing
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ConnectionPoolSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ConnectionPoolSettings.scala
index 4b125947f..178b69d09 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ConnectionPoolSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ConnectionPoolSettings.scala
@@ -51,7 +51,7 @@ abstract class ConnectionPoolSettings private[pekko] () {
self: ConnectionPoolSe
@ApiMayChange
def withHostOverrides(hostOverrides: java.util.List[(String,
ConnectionPoolSettings)]): ConnectionPoolSettings = {
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
self.copy(hostOverrides = hostOverrides.asScala.toList.map { case (h, s) =>
ConnectionPoolSettingsImpl.hostRegex(h) -> s.asScala
})
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ParserSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ParserSettings.scala
index 6eaa2aded..81d48dd48 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ParserSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ParserSettings.scala
@@ -13,23 +13,22 @@
package org.apache.pekko.http.javadsl.settings
+import java.{ util => ju }
import java.util.Optional
import org.apache.pekko
import pekko.actor.{ ActorSystem, ClassicActorSystemProvider }
+import pekko.annotation.DoNotInherit
import pekko.http.impl.engine.parsing.BodyPartParser
import pekko.http.impl.settings.ParserSettingsImpl
-import java.{ util => ju }
-
-import pekko.annotation.DoNotInherit
import pekko.http.impl.util.JavaMapping.Implicits._
-
-import scala.annotation.varargs
-import scala.collection.JavaConverters._
import pekko.http.javadsl.model.{ HttpMethod, MediaType, StatusCode, Uri }
-import scala.annotation.nowarn
import com.typesafe.config.Config
+import scala.annotation.nowarn
+import scala.annotation.varargs
+import scala.jdk.CollectionConverters._
+
/**
* Public API but not intended for subclassing
*/
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ServerSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ServerSettings.scala
index c1a48dfa2..9fde49dc0 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ServerSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/ServerSettings.scala
@@ -26,7 +26,7 @@ import pekko.http.impl.util.JavaMapping.Implicits._
import pekko.util.OptionConverters._
import com.typesafe.config.Config
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import scala.concurrent.duration.{ Duration, FiniteDuration }
/**
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/ContentRange.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/ContentRange.scala
index 37ba9e2ec..27b266ecb 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/ContentRange.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/ContentRange.scala
@@ -14,10 +14,12 @@
package org.apache.pekko.http.scaladsl.model
import java.util.{ Optional, OptionalLong }
+
import org.apache.pekko
import pekko.http.impl.util.{ Rendering, ValueRenderable }
import pekko.http.javadsl.{ model => jm }
-import pekko.util.OptionConverters._
+
+import scala.jdk.OptionConverters._
sealed trait ContentRange extends jm.ContentRange with ValueRenderable {
// default implementations to override
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpEntity.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpEntity.scala
index f1deb0671..953cbe66d 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpEntity.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/HttpEntity.scala
@@ -24,6 +24,7 @@ import scala.annotation.nowarn
import scala.concurrent.Future
import scala.concurrent.duration._
import scala.collection.immutable
+import scala.jdk.OptionConverters._
import scala.util.control.NonFatal
import org.apache.pekko
@@ -39,7 +40,6 @@ import pekko.http.javadsl.{ model => jm }
import pekko.http.impl.util.{ JavaMapping, StreamUtils }
import pekko.http.impl.util.JavaMapping.Implicits._
import pekko.util.FutureConverters._
-import pekko.util.OptionConverters._
/**
* Models the entity (aka "body" or "content") of an HTTP message.
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/Multipart.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/Multipart.scala
index 3fdade542..2b24fa455 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/Multipart.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/Multipart.scala
@@ -12,35 +12,34 @@
*/
package org.apache.pekko.http.scaladsl.model
+
import java.io.File
import java.nio.file.Path
import java.util.Optional
+import java.util.concurrent.CompletionStage
import org.apache.pekko
-import pekko.http.impl.util.{ DefaultNoLogging, Util }
-
-import scala.concurrent.duration.FiniteDuration
-import scala.concurrent.Future
-import scala.collection.immutable
-import scala.collection.JavaConverters._
-import scala.util.{ Failure, Success, Try }
+import pekko.annotation.InternalApi
import pekko.event.LoggingAdapter
-import pekko.util.ConstantFun
-import pekko.stream.Materializer
-import pekko.stream.javadsl.{ Source => JSource }
-import pekko.stream.scaladsl._
import pekko.http.ccompat._
-import pekko.http.scaladsl.util.FastFuture
-import pekko.http.scaladsl.model.headers._
import pekko.http.impl.engine.rendering.BodyPartRenderer
+import pekko.http.impl.util.{ DefaultNoLogging, Util }
+import pekko.http.impl.util.JavaMapping.Implicits._
import pekko.http.javadsl.{ model => jm }
+import pekko.http.scaladsl.util.FastFuture
+import pekko.http.scaladsl.model.headers._
import FastFuture._
-import pekko.http.impl.util.JavaMapping.Implicits._
+import pekko.stream.Materializer
+import pekko.stream.javadsl.{ Source => JSource }
+import pekko.stream.scaladsl._
+import pekko.util.ConstantFun
import pekko.util.FutureConverters._
-import java.util.concurrent.CompletionStage
-
-import pekko.annotation.InternalApi
+import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.Future
+import scala.collection.immutable
+import scala.jdk.CollectionConverters._
+import scala.util.{ Failure, Success, Try }
/**
* The model of multipart content for media-types `multipart/\*` (general
multipart content),
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/headers/HttpCookie.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/headers/HttpCookie.scala
index 539a937c5..903292ce3 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/headers/HttpCookie.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/headers/HttpCookie.scala
@@ -21,9 +21,10 @@ import pekko.http.impl.util._
import pekko.http.impl.util.JavaMapping.Implicits._
import pekko.http.javadsl.{ model => jm }
import pekko.http.scaladsl.model.DateTime
-import pekko.util.OptionConverters._
import org.parboiled2.CharPredicate
+import scala.jdk.OptionConverters._
+
/**
* for a full definition of the http cookie header fields, see
* http://tools.ietf.org/html/rfc6265
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/sse/ServerSentEvent.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/sse/ServerSentEvent.scala
index 93789e3da..5a7e8e884 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/sse/ServerSentEvent.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/sse/ServerSentEvent.scala
@@ -16,12 +16,14 @@ package scaladsl
package model
package sse
+import java.nio.charset.StandardCharsets.UTF_8
+
import org.apache.pekko
import pekko.http.javadsl.model
import pekko.util.ByteString
-import pekko.util.OptionConverters._
-import java.nio.charset.StandardCharsets.UTF_8
+
import scala.annotation.tailrec
+import scala.jdk.OptionConverters._
object ServerSentEvent {
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/ws/WebSocketUpgrade.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/ws/WebSocketUpgrade.scala
index 460d7f4b3..52ac5f17d 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/ws/WebSocketUpgrade.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/ws/WebSocketUpgrade.scala
@@ -68,7 +68,7 @@ trait WebSocketUpgrade extends jm.ws.WebSocketUpgrade {
subprotocol: Option[String] = None): HttpResponse =
handleMessages(scaladsl.Flow.fromSinkAndSource(inSink, outSource),
subprotocol)
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
/**
* Java API
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ConnectionPoolSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ConnectionPoolSettings.scala
index bbae31a9e..f77c728cb 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ConnectionPoolSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ConnectionPoolSettings.scala
@@ -105,7 +105,7 @@ abstract class ConnectionPoolSettings extends
js.ConnectionPoolSettings { self:
object ConnectionPoolSettings extends
SettingsCompanion[ConnectionPoolSettings] {
override def apply(config: Config): ConnectionPoolSettingsImpl = {
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
val hostOverrides =
config.getConfigList("pekko.http.host-connection-pool.per-host-override").asScala.toList.map
{ cfg =>
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ParserSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ParserSettings.scala
index 82b919b98..874027ccd 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ParserSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ParserSettings.scala
@@ -17,6 +17,7 @@ import java.util
import java.util.Optional
import java.util.function.Function
+import com.typesafe.config.Config
import org.apache.pekko
import pekko.actor.ClassicActorSystemProvider
import pekko.annotation.DoNotInherit
@@ -25,10 +26,9 @@ import pekko.http.impl.util._
import pekko.http.javadsl.model
import pekko.http.scaladsl.model._
import pekko.http.scaladsl.{ settings => js }
-import pekko.util.OptionConverters._
-import com.typesafe.config.Config
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
+import scala.jdk.OptionConverters._
/**
* Public API but not intended for subclassing
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ServerSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ServerSettings.scala
index d95f734f6..a655e8448 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ServerSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ServerSettings.scala
@@ -13,6 +13,7 @@
package org.apache.pekko.http.scaladsl.settings
+import com.typesafe.config.Config
import org.apache.pekko
import pekko.actor.ActorSystem
import pekko.annotation.{ DoNotInherit, InternalApi }
@@ -24,12 +25,11 @@ import pekko.http.javadsl.{ settings => js }
import pekko.http.scaladsl.model.HttpResponse
import pekko.http.scaladsl.model.headers.{ Host, Server }
import pekko.io.Inet.SocketOption
-import pekko.util.OptionConverters._
-import com.typesafe.config.Config
-import scala.collection.JavaConverters._
import scala.collection.immutable
import scala.concurrent.duration.{ Duration, FiniteDuration }
+import scala.jdk.CollectionConverters._
+import scala.jdk.OptionConverters._
import scala.language.implicitConversions
/**
diff --git
a/http-core/src/test/scala/org/apache/pekko/http/javadsl/model/JavaApiSpec.scala
b/http-core/src/test/scala/org/apache/pekko/http/javadsl/model/JavaApiSpec.scala
index 65bbb3b99..3861bc123 100644
---
a/http-core/src/test/scala/org/apache/pekko/http/javadsl/model/JavaApiSpec.scala
+++
b/http-core/src/test/scala/org/apache/pekko/http/javadsl/model/JavaApiSpec.scala
@@ -17,8 +17,8 @@ import java.util.Optional
import org.apache.pekko.japi.Pair
-import scala.collection.JavaConverters._
import scala.collection.mutable
+import scala.jdk.CollectionConverters._
import org.scalatest.freespec.AnyFreeSpec
import org.scalatest.matchers.must.Matchers
diff --git a/http-core/src/test/scala/org/apache/pekko/testkit/PekkoSpec.scala
b/http-core/src/test/scala/org/apache/pekko/testkit/PekkoSpec.scala
index 5d3d1cd80..a146c0850 100644
--- a/http-core/src/test/scala/org/apache/pekko/testkit/PekkoSpec.scala
+++ b/http-core/src/test/scala/org/apache/pekko/testkit/PekkoSpec.scala
@@ -51,7 +51,7 @@ object PekkoSpec {
""")
def mapToConfig(map: Map[String, Any]): Config = {
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
ConfigFactory.parseMap(map.asJava)
}
diff --git
a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala
b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala
index 2f1cb5106..f2ff5615b 100644
---
a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala
+++
b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala
@@ -25,8 +25,8 @@ import pekko.http.scaladsl.server.Rejection
import pekko.http.cors.javadsl
import java.util
-import scala.collection.JavaConverters._
import scala.collection.immutable.Seq
+import scala.jdk.CollectionConverters._
/**
* Rejection created by the CORS directives. Signal the CORS request was
rejected. The reason of the rejection is
diff --git
a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala
b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala
index ea4276e5f..c5ed997b9 100644
---
a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala
+++
b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala
@@ -19,6 +19,7 @@ package org.apache.pekko.http.cors.scaladsl.settings
import java.util.OptionalLong
import java.util.concurrent.TimeUnit
+
import org.apache.pekko
import pekko.actor.ActorSystem
import pekko.annotation.DoNotInherit
@@ -29,12 +30,12 @@ import pekko.http.impl.util.SettingsCompanionImpl
import pekko.http.javadsl.{ model => jmmodel }
import pekko.http.scaladsl.model.headers.HttpOrigin
import pekko.http.scaladsl.model.{ HttpHeader, HttpMethod, HttpMethods }
-import pekko.util.OptionConverters._
import com.typesafe.config.ConfigException.{ Missing, WrongType }
import com.typesafe.config.Config
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import scala.collection.immutable.Seq
+import scala.jdk.OptionConverters._
import scala.util.Try
/**
diff --git
a/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/TestRouteResult.scala
b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/TestRouteResult.scala
index 263bcf689..0822da98e 100644
---
a/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/TestRouteResult.scala
+++
b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/TestRouteResult.scala
@@ -14,25 +14,24 @@
package org.apache.pekko.http.javadsl.testkit
import org.apache.pekko
+import pekko.http.impl.util._
+import pekko.http.impl.util.JavaMapping.Implicits._
+import pekko.http.javadsl.model._
import pekko.http.javadsl.server.RouteResult
+import pekko.http.javadsl.server.{ Rejection, RoutingJavaMapping }
import pekko.http.javadsl.unmarshalling.Unmarshaller
-
-import scala.reflect.ClassTag
-import scala.concurrent.{ ExecutionContext, Future }
-import scala.concurrent.duration.FiniteDuration
-import pekko.util.ByteString
-import pekko.stream.Materializer
+import RoutingJavaMapping._
import pekko.http.scaladsl
import pekko.http.scaladsl.unmarshalling.Unmarshal
import pekko.http.scaladsl.model.HttpResponse
-import pekko.http.impl.util._
-import pekko.http.impl.util.JavaMapping.Implicits._
-import pekko.http.javadsl.server.{ Rejection, RoutingJavaMapping }
-import RoutingJavaMapping._
-import pekko.http.javadsl.model._
+import pekko.stream.Materializer
+import pekko.util.ByteString
-import scala.collection.JavaConverters._
import scala.annotation.varargs
+import scala.concurrent.{ ExecutionContext, Future }
+import scala.concurrent.duration.FiniteDuration
+import scala.jdk.CollectionConverters._
+import scala.reflect.ClassTag
/**
* A wrapper for route results.
diff --git
a/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/WSTestRequestBuilding.scala
b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/WSTestRequestBuilding.scala
index c46e90bf9..224b5b83c 100644
---
a/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/WSTestRequestBuilding.scala
+++
b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/WSTestRequestBuilding.scala
@@ -14,16 +14,15 @@
package org.apache.pekko.http.javadsl.testkit
import org.apache.pekko
+import pekko.http.impl.util.JavaMapping.Implicits._
import pekko.http.javadsl.model.ws.Message
import pekko.http.javadsl.model.{ HttpRequest, Uri }
import pekko.http.scaladsl.{ model => sm }
-import pekko.stream.javadsl.Flow
-
import pekko.http.scaladsl.{ testkit => st }
-
-import pekko.http.impl.util.JavaMapping.Implicits._
-import scala.collection.JavaConverters._
import pekko.stream.{ scaladsl, Materializer }
+import pekko.stream.javadsl.Flow
+
+import scala.jdk.CollectionConverters._
trait WSTestRequestBuilding {
diff --git
a/http-tests/src/multi-jvm/scala/org/apache/pekko/remote/testkit/MultiNodeConfig.scala
b/http-tests/src/multi-jvm/scala/org/apache/pekko/remote/testkit/MultiNodeConfig.scala
index 50ec1be3e..c17a9adfe 100644
---
a/http-tests/src/multi-jvm/scala/org/apache/pekko/remote/testkit/MultiNodeConfig.scala
+++
b/http-tests/src/multi-jvm/scala/org/apache/pekko/remote/testkit/MultiNodeConfig.scala
@@ -242,7 +242,7 @@ object MultiNodeSpec {
""")
private def mapToConfig(map: Map[String, Any]): Config = {
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
ConfigFactory.parseMap(map.asJava)
}
@@ -446,7 +446,7 @@ abstract class MultiNodeSpec(val myself: RoleName, _system:
ActorSystem, _roles:
base.replace(tag, replaceWith)
}
}
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
ConfigFactory.parseString(deployString).root.asScala.foreach {
case (key, value: ConfigObject) => deployer.parseConfig(key,
value.toConfig).foreach(deployer.deploy)
case (key, x) =>
diff --git
a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/RejectionSpec.scala
b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/RejectionSpec.scala
index 8b3ccd3e8..aa569174c 100644
---
a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/RejectionSpec.scala
+++
b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/RejectionSpec.scala
@@ -14,7 +14,7 @@
package org.apache.pekko.http.scaladsl.server
import org.apache.pekko
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
class RejectionSpec extends RoutingSpec {
diff --git
a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/EventStreamUnmarshallingSpec.scala
b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/EventStreamUnmarshallingSpec.scala
index 98f33342a..a9e163741 100644
---
a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/EventStreamUnmarshallingSpec.scala
+++
b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/EventStreamUnmarshallingSpec.scala
@@ -25,7 +25,6 @@ import pekko.http.scaladsl.settings.ServerSentEventSettings
import pekko.stream.scaladsl.{ Sink, Source }
import java.util.{ List => JList }
-import scala.collection.JavaConverters
import scala.collection.immutable.Seq
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AsyncWordSpec
@@ -37,7 +36,7 @@ object EventStreamUnmarshallingSpec {
// Also used by EventStreamUnmarshallingTest.java
val eventsAsJava: JList[javadsl.model.sse.ServerSentEvent] = {
- import JavaConverters._
+ import scala.jdk.CollectionConverters._
events.map(_.asInstanceOf[javadsl.model.sse.ServerSentEvent]).asJava
}
diff --git
a/http/src/main/boilerplate/org/apache/pekko/http/javadsl/server/JavaPathMatchers.scala.template
b/http/src/main/boilerplate/org/apache/pekko/http/javadsl/server/JavaPathMatchers.scala.template
index 0c9c3043c..2948646cf 100644
---
a/http/src/main/boilerplate/org/apache/pekko/http/javadsl/server/JavaPathMatchers.scala.template
+++
b/http/src/main/boilerplate/org/apache/pekko/http/javadsl/server/JavaPathMatchers.scala.template
@@ -18,7 +18,7 @@ import pekko.http.scaladsl.server.{ PathMatcher =>
SPathMatcher }
import pekko.http.scaladsl.server.{ PathMatchers => SPathMatchers }
import java.util.{ List => JList }
import java.util.function.{ Function => JFunction }
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
object JavaPathMatchers {
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/PathMatchers.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/PathMatchers.scala
index ab953b511..a65be956c 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/PathMatchers.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/PathMatchers.scala
@@ -17,13 +17,12 @@ import java.util.UUID
import java.util.regex.Pattern
import org.apache.pekko
+import pekko.http.javadsl.common.RegexConverters.toScala
import pekko.http.scaladsl.model.Uri.Path
-
-import scala.collection.JavaConverters._
-
import pekko.http.scaladsl.server.{ PathMatcher => SPathMatcher }
import pekko.http.scaladsl.server.{ PathMatchers => SPathMatchers }
-import pekko.http.javadsl.common.RegexConverters.toScala
+
+import scala.jdk.CollectionConverters._
final class PathMatchers
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/RejectionHandler.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/RejectionHandler.scala
index b51ed2409..cba1d503c 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/RejectionHandler.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/RejectionHandler.scala
@@ -13,15 +13,15 @@
package org.apache.pekko.http.javadsl.server
-import org.apache.pekko
-import pekko.http.scaladsl.server
-import pekko.http.impl.util.JavaMapping
import java.util.function
+import org.apache.pekko
+import pekko.http.impl.util.JavaMapping
import pekko.http.javadsl.model.HttpResponse
+import pekko.http.scaladsl.server
import scala.reflect.ClassTag
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
object RejectionHandler {
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/Rejections.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/Rejections.scala
index 7580861aa..b4fbe9d33 100644
--- a/http/src/main/scala/org/apache/pekko/http/javadsl/server/Rejections.scala
+++ b/http/src/main/scala/org/apache/pekko/http/javadsl/server/Rejections.scala
@@ -13,24 +13,24 @@
package org.apache.pekko.http.javadsl.server
-import org.apache.pekko
-import pekko.http.impl.util.JavaMapping
-import pekko.http.scaladsl.server.ContentNegotiator.Alternative
-import pekko.http.scaladsl.server._
-import pekko.http.javadsl.model._
-import pekko.http.javadsl.model.headers.{ ByteRange, HttpChallenge,
HttpEncoding }
import java.util.Optional
import java.util.function.{ Function => JFunction }
import java.lang.{ Iterable => JIterable }
+import org.apache.pekko
import pekko.annotation.DoNotInherit
+import pekko.http.impl.util.JavaMapping
+import pekko.http.javadsl.model._
+import pekko.http.javadsl.model.headers.{ ByteRange, HttpChallenge,
HttpEncoding }
import pekko.http.scaladsl
+import pekko.http.scaladsl.server.ContentNegotiator.Alternative
+import pekko.http.scaladsl.server._
import pekko.http.impl.util.Util
import pekko.pattern.CircuitBreakerOpenException
-import pekko.util.OptionConverters._
import scala.collection.immutable
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
+import scala.jdk.OptionConverters._
/**
* A rejection encapsulates a specific reason why a Route was not able to
handle a request. Rejections are gathered
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/AttributeDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/AttributeDirectives.scala
index 76f6ed782..4c7562706 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/AttributeDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/AttributeDirectives.scala
@@ -19,7 +19,8 @@ import org.apache.pekko
import pekko.http.javadsl.model.AttributeKey
import pekko.http.javadsl.server.Route
import pekko.http.scaladsl.server.directives.{ AttributeDirectives => D }
-import pekko.util.OptionConverters._
+
+import scala.jdk.OptionConverters._
abstract class AttributeDirectives extends HeaderDirectives {
import pekko.http.impl.util.JavaMapping._
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/CodingDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/CodingDirectives.scala
index 008e22b00..b85924939 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/CodingDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/CodingDirectives.scala
@@ -16,7 +16,8 @@ package directives
import java.util.function.Supplier
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
+
import org.apache.pekko
import pekko.http.impl.util.JavaMapping.Implicits._
import pekko.http.javadsl.coding.Coder
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/CookieDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/CookieDirectives.scala
index 6c3a46342..cb0d5c2d2 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/CookieDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/CookieDirectives.scala
@@ -18,10 +18,10 @@ import java.util.Optional
import java.util.function.{ Function => JFunction }
import java.util.function.Supplier
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
+
import org.apache.pekko
import pekko.http.impl.util.JavaMapping.Implicits._
-
import pekko.http.javadsl.model.headers.HttpCookie
import pekko.http.javadsl.model.headers.HttpCookiePair
import pekko.http.javadsl.server.Route
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/DebuggingDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/DebuggingDirectives.scala
index 8cabc18bd..8d70d467e 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/DebuggingDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/DebuggingDirectives.scala
@@ -25,7 +25,7 @@ import pekko.http.scaladsl
import pekko.http.scaladsl.server.directives.LoggingMagnet
import pekko.http.scaladsl.server.{ Directives => D, RouteResult }
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
abstract class DebuggingDirectives extends CookieDirectives {
import pekko.http.impl.util.JavaMapping.Implicits._
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/FileAndResourceDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/FileAndResourceDirectives.scala
index 41448f218..630722405 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/FileAndResourceDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/FileAndResourceDirectives.scala
@@ -17,14 +17,14 @@ import java.io.File
import org.apache.pekko
import pekko.http.javadsl.marshalling.Marshaller
-
-import scala.annotation.varargs
-import scala.collection.JavaConverters._
import pekko.http.javadsl.model.ContentType
import pekko.http.javadsl.model.RequestEntity
import pekko.http.javadsl.server.{ Route, RoutingJavaMapping }
import pekko.http.scaladsl.server.{ Directives => D }
+import scala.annotation.varargs
+import scala.jdk.CollectionConverters._
+
abstract class DirectoryListing {
def getPath: String
def isRoot: Boolean
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/HostDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/HostDirectives.scala
index 61721ccbe..356bcf1d8 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/HostDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/HostDirectives.scala
@@ -20,7 +20,7 @@ import java.util.function.Predicate
import java.util.function.Supplier
import java.util.regex.Pattern
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.pekko
import pekko.http.javadsl.common.RegexConverters.toScala
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/MiscDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/MiscDirectives.scala
index 415536ccd..ce4bf0141 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/MiscDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/MiscDirectives.scala
@@ -19,7 +19,7 @@ import java.util.function.BooleanSupplier
import java.util.function.{ Function => JFunction }
import java.util.function.Supplier
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
import org.apache.pekko
import pekko.http.javadsl.model.RemoteAddress
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/ParameterDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/ParameterDirectives.scala
index 40bd044b1..c0fd3b188 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/ParameterDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/ParameterDirectives.scala
@@ -22,9 +22,9 @@ import pekko.http.javadsl.server.Route
import pekko.http.javadsl.unmarshalling.Unmarshaller
import pekko.http.scaladsl.server.directives.ParameterDirectives._
import pekko.http.scaladsl.server.directives.{ ParameterDirectives => D }
-import pekko.util.OptionConverters._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
+import scala.jdk.OptionConverters._
abstract class ParameterDirectives extends MiscDirectives {
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/SecurityDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/SecurityDirectives.scala
index 34cefda0e..1f28cbdc5 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/SecurityDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/SecurityDirectives.scala
@@ -25,9 +25,9 @@ import pekko.http.javadsl.server.{ RequestContext, Route }
import pekko.http.scaladsl
import pekko.http.scaladsl.server.{ Directives => D }
import pekko.util.FutureConverters._
-import pekko.util.OptionConverters._
import scala.concurrent.{ ExecutionContextExecutor, Future }
+import scala.jdk.OptionConverters._
object SecurityDirectives {
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/WebSocketDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/WebSocketDirectives.scala
index fa3a746e1..c8fa4a472 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/WebSocketDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/WebSocketDirectives.scala
@@ -45,7 +45,7 @@ abstract class WebSocketDirectives extends SecurityDirectives
{
* this is a WebSocket request. Rejects with an
[[ExpectedWebSocketRequestRejection]], otherwise.
*/
def extractOfferedWsProtocols(inner: JFunction[JList[String], Route]): Route
= RouteAdapter {
- import scala.collection.JavaConverters._
+ import scala.jdk.CollectionConverters._
D.extractOfferedWsProtocols { (list: Seq[String]) =>
inner.apply(list.asJava).delegate
}
diff --git
a/http/src/main/scala/org/apache/pekko/http/javadsl/unmarshalling/Unmarshaller.scala
b/http/src/main/scala/org/apache/pekko/http/javadsl/unmarshalling/Unmarshaller.scala
index 187083e51..0b150f179 100644
---
a/http/src/main/scala/org/apache/pekko/http/javadsl/unmarshalling/Unmarshaller.scala
+++
b/http/src/main/scala/org/apache/pekko/http/javadsl/unmarshalling/Unmarshaller.scala
@@ -32,9 +32,9 @@ import pekko.http.scaladsl.util.FastFuture
import pekko.stream.{ Materializer, SystemMaterializer }
import pekko.util.ByteString
import pekko.util.FutureConverters._
-import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import scala.annotation.nowarn
+import scala.jdk.CollectionConverters._
import scala.concurrent.ExecutionContext
object Unmarshaller extends pekko.http.javadsl.unmarshalling.Unmarshallers {
diff --git
a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/Rejection.scala
b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/Rejection.scala
index cb6ca2826..1742a51fe 100644
--- a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/Rejection.scala
+++ b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/Rejection.scala
@@ -27,10 +27,10 @@ import pekko.http.impl.util.JavaMapping.Implicits._
import pekko.pattern.CircuitBreakerOpenException
import pekko.http.javadsl.model.headers.{ HttpOrigin => JHttpOrigin }
import pekko.http.scaladsl.model.headers.{ HttpOrigin => SHttpOrigin }
-import pekko.util.OptionConverters._
-import scala.collection.JavaConverters._
import scala.collection.immutable
+import scala.jdk.CollectionConverters._
+import scala.jdk.OptionConverters._
import scala.runtime.AbstractFunction1
/**
diff --git
a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/RouteResult.scala
b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/RouteResult.scala
index 408dc195a..1f11d3bd5 100644
---
a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/RouteResult.scala
+++
b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/RouteResult.scala
@@ -20,9 +20,9 @@ import pekko.http.javadsl
import pekko.http.scaladsl.model.{ HttpRequest, HttpResponse }
import pekko.stream.scaladsl.Flow
-import scala.collection.JavaConverters._
import scala.collection.immutable
import scala.concurrent.Future
+import scala.jdk.CollectionConverters._
/**
* The result of handling a request.
diff --git
a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala
b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala
index 955f9ede7..b2fc3224b 100644
---
a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala
+++
b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala
@@ -18,21 +18,20 @@ import java.io.File
import java.net.{ URI, URL }
import org.apache.pekko
-import pekko.http.javadsl.{ marshalling, model }
-import pekko.stream.scaladsl.{ FileIO, StreamConverters }
-
-import scala.annotation.tailrec
import pekko.actor.ActorSystem
import pekko.event.LoggingAdapter
-import pekko.http.scaladsl.marshalling.{ Marshaller, ToEntityMarshaller }
-import pekko.http.scaladsl.model._
-import pekko.http.scaladsl.model.headers._
import pekko.http.impl.util._
import pekko.http.javadsl
-
-import scala.collection.JavaConverters._
+import pekko.http.javadsl.{ marshalling, model }
import JavaMapping.Implicits._
import pekko.http.javadsl.server.RoutingJavaMapping
+import pekko.http.scaladsl.marshalling.{ Marshaller, ToEntityMarshaller }
+import pekko.http.scaladsl.model._
+import pekko.http.scaladsl.model.headers._
+import pekko.stream.scaladsl.{ FileIO, StreamConverters }
+
+import scala.annotation.tailrec
+import scala.jdk.CollectionConverters._
/**
* @groupname fileandresource File and resource directives
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
