Merge pull request #11122 from xuwei-k/JavaConverters

use CollectionConverters instead of deprecated JavaConverters

cache/play-caffeine-cache/src/main/scala/play/api/cache/caffeine/CaffeineCacheApi.scala

@@ -60,7 +60,7 @@ trait CaffeineCacheComponents {
  */
 class CaffeineCacheModule
     extends SimpleModule((environment, configuration) => {
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
 
       val defaultCacheName = configuration.underlying.getString("play.cache.defaultCache")
       val bindCaches       = configuration.underlying.getStringList("play.cache.bindCaches").asScala

cache/play-caffeine-cache/src/main/scala/play/api/cache/caffeine/CaffeineCacheManager.scala

@@ -39,7 +39,7 @@ class CaffeineCacheManager(private val config: Config, private val actorSystem:
   }
 
   def cacheNames: Set[String] = {
-    scala.collection.JavaConverters.asScalaSet(cacheMap.keySet()).toSet
+    scala.jdk.CollectionConverters.SetHasAsScala(cacheMap.keySet()).asScala.toSet
   }
 
   private[caffeine] def getCacheBuilder(cacheName: String): Caffeine[_, _] = {

cache/play-caffeine-cache/src/test/scala/play/api/cache/caffeine/CaffeineCacheApiSpec.scala

@@ -72,7 +72,7 @@ class CaffeineCacheApiSpec extends PlaySpecification {
         "play.cache.bindCaches" -> Seq("custom")
       )
     ) {
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
       val caffeineCacheManager: CaffeineCacheManager = app.injector.instanceOf[CaffeineCacheManager]
       caffeineCacheManager.getCache("custom")
       caffeineCacheManager.getCache("custom-two")

cache/play-ehcache/src/main/scala/play/api/cache/ehcache/EhCacheApi.scala

@@ -63,7 +63,7 @@ trait EhCacheComponents {
  */
 class EhCacheModule
     extends SimpleModule((environment, configuration) => {
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
 
       val defaultCacheName  = configuration.underlying.getString("play.cache.defaultCache")
       val bindCaches        = configuration.underlying.getStringList("play.cache.bindCaches").asScala

core/play-guice/src/main/scala/play/api/inject/guice/GuiceApplicationBuilder.scala

@@ -202,7 +202,7 @@ final case class GuiceApplicationBuilder(
    * @return Returns true if one of the keys contains a deprecated value, otherwise false
    */
   def shouldDisplayLoggerDeprecationMessage(appConfiguration: Configuration): Boolean = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     import scala.collection.mutable
 
     val deprecatedValues = List("DEBUG", "WARN", "ERROR", "INFO", "TRACE", "OFF")

core/play-guice/src/main/scala/play/api/inject/guice/GuiceInjectorBuilder.scala

@@ -24,7 +24,7 @@ import play.api.Environment
 import play.api.Mode
 import play.api.PlayException
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.reflect.ClassTag
 
 class GuiceLoadException(message: String) extends RuntimeException(message)
@@ -169,7 +169,7 @@ abstract class GuiceBuilder[Self] protected (
    * Libraries like Guiceberry and Jukito that want to handle injector creation may find this helpful.
    */
   def createModule(): GuiceModule = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     val injectorModule = GuiceableModule.guice(
       Seq(
         bind[GuiceInjector].toSelf,

core/play-guice/src/test/scala/play/api/http/HttpErrorHandlerSpec.scala

@@ -34,7 +34,7 @@ import play.i18n.MessagesApi
 import scala.concurrent.duration.Duration
 import scala.concurrent.Await
 import scala.concurrent.Future
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.control.NoStackTrace
 
 class HttpErrorHandlerSpec extends Specification {

core/play-integration-test/src/it/scala/play/it/action/HeadActionSpec.scala

@@ -104,7 +104,7 @@ trait HeadActionSpec
       val getHeaders: HttpHeaders = responses(1).underlying[NettyResponse].getHeaders
 
       // Exclude `Date` header because it can vary between requests
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
       val firstHeaders  = headHeaders.remove(DATE)
       val secondHeaders = getHeaders.remove(DATE)
 

core/play-integration-test/src/it/scala/play/it/http/AkkaRequestTimeoutSpec.scala

@@ -20,7 +20,7 @@ import play.core.server._
 import scala.concurrent.duration._
 import scala.concurrent.ExecutionContext.Implicits._
 import scala.util.Random
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class AkkaRequestTimeoutSpec extends PlaySpecification with AkkaHttpIntegrationSpecification {
   "play.server.akka.requestTimeout configuration" should {

core/play-integration-test/src/it/scala/play/it/http/FlashCookieSpec.scala

@@ -18,7 +18,7 @@ import play.core.server.ServerEndpoint
 import play.it.test.EndpointIntegrationSpecification
 import play.it.test.OkHttpEndpointSupport
 
-import scala.collection.JavaConverters
+import scala.jdk.CollectionConverters
 
 class FlashCookieSpec
     extends PlaySpecification
@@ -64,7 +64,7 @@ class FlashCookieSpec
     def withAllCookieEndpoints[A: AsResult](block: CookieEndpoint => A): Fragment = {
       appFactory.withAllOkHttpEndpoints { (okEndpoint: OkHttpEndpoint) =>
         block(new CookieEndpoint {
-          import JavaConverters._
+          import CollectionConverters._
           def call(path: String, cookies: List[okhttp3.Cookie]): (okhttp3.Response, List[okhttp3.Cookie]) = {
             var responseCookies: List[okhttp3.Cookie] = null
             val cookieJar = new CookieJar {

core/play-integration-test/src/it/scala/play/it/http/JavaActionCompositionSpec.scala

@@ -47,7 +47,7 @@ class GuiceJavaActionCompositionSpec extends JavaActionCompositionSpec {
 
 class BuiltInComponentsJavaActionCompositionSpec extends JavaActionCompositionSpec {
   def context(initialSettings: Map[String, AnyRef]): play.ApplicationLoader.Context = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     play.ApplicationLoader.create(play.Environment.simple(), initialSettings.asJava)
   }
 

core/play-integration-test/src/it/scala/play/it/http/JavaActionSpec.scala

@@ -48,7 +48,7 @@ class GuiceJavaActionSpec extends JavaActionSpec {
 
 class BuiltInComponentsJavaActionSpec extends JavaActionSpec {
   def context(initialSettings: Map[String, AnyRef]): play.ApplicationLoader.Context = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     play.ApplicationLoader.create(play.Environment.simple(), initialSettings.asJava)
   }
 

core/play-integration-test/src/it/scala/play/it/http/JavaHttpErrorHandlingSpec.scala

@@ -43,7 +43,7 @@ class JavaHttpErrorHandlingSpec
   ): ApplicationFactory = new ApplicationFactory {
     override def create(): ScalaApplication = {
       val components = new BuiltInComponentsFromContext(applicationContext) with RoutingDslComponents {
-        import scala.collection.JavaConverters._
+        import scala.jdk.CollectionConverters._
         import scala.compat.java8.OptionConverters
 
         // Add the web command handler if it is available

core/play-integration-test/src/it/scala/play/it/http/JavaRequestsSpec.scala

@@ -14,7 +14,7 @@ import play.mvc.Http
 import play.mvc.Http.RequestBody
 import play.mvc.Http.RequestImpl
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class JavaRequestsSpec extends PlaySpecification with Mockito {
   "JavaHelpers" should {
@@ -39,7 +39,7 @@ class JavaRequestsSpec extends PlaySpecification with Mockito {
     }
 
     "create a request with a helper that can do cookies" in {
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
 
       val cookie1                      = Cookie("name1", "value1")
       val requestHeader: RequestHeader = FakeRequest().withCookies(cookie1)
@@ -54,7 +54,7 @@ class JavaRequestsSpec extends PlaySpecification with Mockito {
     }
 
     "create a request with a helper that can do cookies" in {
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
 
       val cookie1 = Cookie("name1", "value1")
 

core/play-integration-test/src/it/scala/play/it/http/JavaResultsHandlingSpec.scala

@@ -30,7 +30,7 @@ import play.mvc.Http.Flash
 import play.mvc.Http.Session
 import play.mvc._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class NettyJavaResultsHandlingSpec    extends JavaResultsHandlingSpec with NettyIntegrationSpecification
 class AkkaHttpJavaResultsHandlingSpec extends JavaResultsHandlingSpec with AkkaHttpIntegrationSpecification
@@ -499,7 +499,7 @@ trait JavaResultsHandlingSpec
         .withCookies(new Http.Cookie("bar", "KitKat", 1000, "/", "example.com", false, true, null))
         .withCookies(new Http.Cookie("bar", "Mars", 1000, "/", "example.com", false, true, null))
 
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
       val cookies      = result.cookies().iterator().asScala.toList
       val cookieValues = cookies.map(_.value)
       cookieValues must not contain ("KitKat")
@@ -558,7 +558,7 @@ trait JavaResultsHandlingSpec
 
     "chunk comet results from string" in makeRequest(new MockController {
       def action(request: Http.Request) = {
-        import scala.collection.JavaConverters._
+        import scala.jdk.CollectionConverters._
         val dataSource  = akka.stream.javadsl.Source.from(List("a", "b", "c").asJava)
         val cometSource = dataSource.via(Comet.string("callback"))
         Results.ok().chunked(cometSource)

core/play-integration-test/src/it/scala/play/it/http/SessionCookieSpec.scala

@@ -29,7 +29,7 @@ trait SessionCookieSpec extends PlaySpecification with ServerIntegrationSpecific
     Server.withApplicationFromContext() { context =>
       new BuiltInComponentsFromContext(context) with NoHttpFiltersComponents {
         import play.api.routing.sird.{ GET => SirdGet, _ }
-        import scala.collection.JavaConverters._
+        import scala.jdk.CollectionConverters._
 
         override def configuration: Configuration =
           Configuration(ConfigFactory.parseMap(additionalConfiguration.asJava)).withFallback(super.configuration)

core/play-integration-test/src/it/scala/play/it/http/parsing/FormBodyParserSpec.scala

@@ -22,7 +22,7 @@ import play.api.test.Injecting
 import play.api.test.PlaySpecification
 import play.api.test.WithApplication
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.Future
 
 class FormBodyParserSpec extends PlaySpecification {

core/play-integration-test/src/it/scala/play/it/http/websocket/WebSocketClient.scala

@@ -176,7 +176,7 @@ object WebSocketClient {
           val clientConnection =
             Flow.fromSinkAndSource(Sink.fromSubscriber(subscriber), Source.fromPublisher(publisher))
 
-          import scala.collection.JavaConverters._
+          import scala.jdk.CollectionConverters._
           val responseHeaders = resp.headers().entries().asScala.toList.map(entry => (entry.getKey, entry.getValue))
           onConnected(responseHeaders, webSocketProtocol(clientConnection))
 

core/play-integration-test/src/it/scala/play/it/http/websocket/WebSocketSpec.scala

@@ -344,7 +344,7 @@ trait WebSocketSpec
       import play.core.routing.HandlerInvokerFactory
       import play.core.routing.HandlerInvokerFactory._
 
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
 
       implicit def toHandler[J <: AnyRef](
           javaHandler: => J

core/play-integration-test/src/it/scala/play/it/libs/JavaFormSpec.scala

@@ -9,7 +9,7 @@ import play.data.validation.Constraints.Required
 
 import scala.annotation.meta.field
 import scala.beans.BeanProperty
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class JavaFormSpec extends PlaySpecification {
   "A Java form" should {

core/play-java/src/main/scala/play/routing/RouterBuilderHelper.scala

@@ -11,7 +11,7 @@ import play.mvc.Http.RequestBody
 import play.mvc.Result
 import play.utils.UriEncoding
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.compat.java8.FutureConverters
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future

core/play-java/src/test/scala/play/libs/XPathSpec.scala

@@ -5,7 +5,7 @@
 package play.libs
 
 import org.specs2.mutable.Specification
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class XPathSpec extends Specification {
   //XPathFactory.newInstance() used internally by XPath is not thread safe so forcing sequential execution

core/play-streams/src/test/scala/play/libs/streams/AccumulatorSpec.scala

@@ -23,7 +23,7 @@ import akka.japi.function.{ Function => JFn }
 import org.reactivestreams.Subscription
 
 class AccumulatorSpec extends org.specs2.mutable.Specification {
-  import scala.collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
 
   def withMaterializer[T](block: Materializer => T): T = {
     val system = ActorSystem("test")

core/play/src/main/scala/play/api/Configuration.scala

@@ -15,7 +15,7 @@ import com.typesafe.config._
 import play.twirl.api.utils.StringEscapeUtils
 import play.utils.PlayIO
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.duration.Duration
 import scala.concurrent.duration.FiniteDuration
 import scala.util.control.NonFatal

core/play/src/main/scala/play/api/Logger.scala

@@ -13,7 +13,7 @@ import org.slf4j.Marker
 
 import scala.collection.mutable
 import scala.language.implicitConversions
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * Typical logger interface.

core/play/src/main/scala/play/api/LoggerConfigurator.scala

@@ -72,7 +72,7 @@ object LoggerConfigurator {
       config: Configuration,
       optionalProperties: Map[String, String]
   ): Map[String, String] = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     val mutableMap = new scala.collection.mutable.HashMap[String, String]()
     mutableMap.put("application.home", env.rootPath.getAbsolutePath)
 

core/play/src/main/scala/play/api/http/HttpFilters.scala

@@ -17,7 +17,7 @@ import play.api.Logger
 import play.api.mvc.EssentialFilter
 import play.utils.Reflect
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * Provides filters to the [[play.api.http.HttpRequestHandler]].

core/play/src/main/scala/play/api/i18n/Langs.scala

@@ -14,7 +14,7 @@ import play.api.Logger
 
 import scala.util.Try
 import scala.util.control.NonFatal
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * A Lang supported by the application.

core/play/src/main/scala/play/api/i18n/Messages.scala

@@ -593,7 +593,7 @@ class DefaultMessagesApiProvider @Inject() (
   }
 
   protected def loadMessages(file: String): Map[String, String] = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
 
     environment.classLoader
       .getResources(joinPaths(messagesPrefix, file))

core/play/src/main/scala/play/api/mvc/Binders.scala

@@ -14,7 +14,7 @@ import java.util.OptionalLong
 import java.util.UUID
 import scala.annotation._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.compat.java8.OptionConverters._
 
 import reflect.ClassTag

core/play/src/main/scala/play/api/mvc/Cookie.scala

@@ -225,7 +225,7 @@ trait CookieHeaderEncoding {
   val SetCookieHeaderSeparator      = ";;"
   val SetCookieHeaderSeparatorRegex = SetCookieHeaderSeparator.r
 
-  import scala.collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
 
   // We use netty here but just as an API to handle cookies encoding
 
@@ -648,7 +648,7 @@ trait JWTCookieDataCodec extends CookieDataCodec {
   override def decode(encodedString: String): Map[String, String] = {
     import io.jsonwebtoken._
 
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
 
     try {
       // Get all the claims
@@ -722,7 +722,7 @@ object JWTCookieDataCodec {
       clock: java.time.Clock
   ) {
     import io.jsonwebtoken._
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
 
     private val jwtClock = new Clock {
       override def now(): Date = java.util.Date.from(clock.instant())

core/play/src/main/scala/play/api/mvc/Headers.scala

@@ -9,7 +9,7 @@ import java.util.Locale
 import play.api.http.HeaderNames
 import play.core.utils.CaseInsensitiveOrdered
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import scala.collection.immutable.TreeMap
 import scala.collection.immutable.TreeSet

core/play/src/main/scala/play/api/mvc/Results.scala

@@ -29,7 +29,7 @@ import play.api.libs.typedmap.TypedMap
 import play.core.utils.CaseInsensitiveOrdered
 import play.core.utils.HttpHeaderParameterEncoding
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.immutable.TreeMap
 import scala.concurrent.ExecutionContext
 

core/play/src/main/scala/play/api/templates/Templates.scala

@@ -8,7 +8,7 @@ import java.util.Optional
 
 import play.twirl.api.Html
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.compat.java8.OptionConverters._
 
 /** Defines a magic helper for Play templates. */

core/play/src/main/scala/play/core/j/JavaAction.scala

@@ -28,7 +28,7 @@ import play.libs.AnnotationUtils
 import play.mvc.Http.{ Request => JRequest }
 import play.mvc.Http.{ RequestImpl => JRequestImpl }
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 

core/play/src/main/scala/play/core/j/JavaHelpers.scala

@@ -36,7 +36,7 @@ import play.mvc.Http.{ RequestHeader => JRequestHeader }
 import play.mvc.Http.{ RequestImpl => JRequestImpl }
 import play.mvc.Http
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.compat.java8.OptionConverters
 
 /**