use Scala converters in more places (#774)

* add more use of scala conversions

* Update JavaMapping.scala

* Update FormFieldDirectives.scala

Author: pjfanning

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
   }
 

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)

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
     }

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 {

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
   }
 }

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

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
   }
 

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

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 {
 

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 }