From 9a2b69119bf66070a873c83937f7641d1c77e45a Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Mon, 24 Jan 2022 14:31:07 +0900 Subject: [PATCH] use CollectionConverters instead of deprecated JavaConverters --- .../play/api/cache/caffeine/CaffeineCacheApi.scala | 2 +- .../api/cache/caffeine/CaffeineCacheManager.scala | 2 +- .../api/cache/caffeine/CaffeineCacheApiSpec.scala | 2 +- .../scala/play/api/cache/ehcache/EhCacheApi.scala | 2 +- .../api/inject/guice/GuiceApplicationBuilder.scala | 2 +- .../play/api/inject/guice/GuiceInjectorBuilder.scala | 4 ++-- .../scala/play/api/http/HttpErrorHandlerSpec.scala | 2 +- .../src/it/scala/play/it/action/HeadActionSpec.scala | 2 +- .../scala/play/it/http/AkkaRequestTimeoutSpec.scala | 2 +- .../src/it/scala/play/it/http/FlashCookieSpec.scala | 4 ++-- .../play/it/http/JavaActionCompositionSpec.scala | 2 +- .../src/it/scala/play/it/http/JavaActionSpec.scala | 2 +- .../play/it/http/JavaHttpErrorHandlingSpec.scala | 2 +- .../src/it/scala/play/it/http/JavaRequestsSpec.scala | 6 +++--- .../scala/play/it/http/JavaResultsHandlingSpec.scala | 6 +++--- .../it/scala/play/it/http/SessionCookieSpec.scala | 2 +- .../play/it/http/parsing/FormBodyParserSpec.scala | 2 +- .../play/it/http/websocket/WebSocketClient.scala | 2 +- .../scala/play/it/http/websocket/WebSocketSpec.scala | 2 +- .../src/it/scala/play/it/libs/JavaFormSpec.scala | 2 +- .../scala/play/routing/RouterBuilderHelper.scala | 2 +- .../src/test/scala/play/libs/XPathSpec.scala | 2 +- .../scala/play/libs/streams/AccumulatorSpec.scala | 2 +- .../play/src/main/scala/play/api/Configuration.scala | 2 +- core/play/src/main/scala/play/api/Logger.scala | 2 +- .../src/main/scala/play/api/LoggerConfigurator.scala | 2 +- .../src/main/scala/play/api/http/HttpFilters.scala | 2 +- core/play/src/main/scala/play/api/i18n/Langs.scala | 2 +- .../play/src/main/scala/play/api/i18n/Messages.scala | 2 +- core/play/src/main/scala/play/api/mvc/Binders.scala | 2 +- core/play/src/main/scala/play/api/mvc/Cookie.scala | 6 +++--- core/play/src/main/scala/play/api/mvc/Headers.scala | 2 +- core/play/src/main/scala/play/api/mvc/Results.scala | 2 +- .../main/scala/play/api/templates/Templates.scala | 2 +- .../play/src/main/scala/play/core/j/JavaAction.scala | 2 +- .../src/main/scala/play/core/j/JavaHelpers.scala | 2 +- .../src/main/scala/play/core/j/JavaParsers.scala | 2 +- .../src/main/scala/play/core/j/JavaResults.scala | 4 ++-- .../main/scala/play/core/j/JavaRouterAdapter.scala | 2 +- .../play/core/parsers/FormUrlEncodedParser.scala | 4 ++-- .../scala/play/core/routing/GeneratedRouter.scala | 2 +- core/play/src/main/scala/views/helper/Helpers.scala | 2 +- .../src/test/scala/play/api/ConfigurationSpec.scala | 2 +- .../scala/play/api/http/HttpConfigurationSpec.scala | 2 +- .../scala/play/api/templates/TemplatesSpec.scala | 2 +- .../scala/play/mvc/MaxLengthBodyParserSpec.scala | 2 +- .../src/test/scala/play/mvc/RequestHeaderSpec.scala | 2 +- .../src/test/scala/play/mvc/ResponseHeaderSpec.scala | 2 +- .../src/main/scala/play/api/db/HikariCPModule.scala | 2 +- .../scala/play/api/test/ServerEndpointRecipe.scala | 2 +- .../test/scala/play/api/libs/ws/ahc/AhcWSSpec.scala | 12 ++++++------ .../main/scala/play/core/server/NettyServer.scala | 2 +- .../play/core/server/netty/NettyHeadersWrapper.scala | 2 +- .../core/server/netty/NettyModelConversion.scala | 2 +- .../main/scala/play/core/server/DevServerStart.scala | 2 +- .../main/scala/play/filters/cors/CORSConfig.scala | 2 +- .../src/main/scala/play/filters/csp/CSPConfig.scala | 6 +++--- .../play/filters/hosts/AllowedHostsFilter.scala | 2 +- .../scala/play/filters/csp/CSPProcessorSpec.scala | 2 +- .../scala/play/filters/csp/JavaCSPReportSpec.scala | 2 +- .../play/filters/hosts/AllowedHostsFilterSpec.scala | 2 +- .../main/scala/play/core/PlayFormsMagicForJava.scala | 2 +- .../src/test/scala/play/data/DynamicFormSpec.scala | 2 +- .../src/test/scala/play/data/FormSpec.scala | 2 +- .../test/scala/play/data/PartialValidationSpec.scala | 2 +- .../scala/play/api/libs/openid/OpenIdClient.scala | 2 +- .../test/scala/play/api/libs/openid/package.scala | 2 +- 67 files changed, 84 insertions(+), 84 deletions(-) diff --git a/cache/play-caffeine-cache/src/main/scala/play/api/cache/caffeine/CaffeineCacheApi.scala b/cache/play-caffeine-cache/src/main/scala/play/api/cache/caffeine/CaffeineCacheApi.scala index bd5117a0c80..18a5f1c00cf 100644 --- a/cache/play-caffeine-cache/src/main/scala/play/api/cache/caffeine/CaffeineCacheApi.scala +++ b/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 diff --git a/cache/play-caffeine-cache/src/main/scala/play/api/cache/caffeine/CaffeineCacheManager.scala b/cache/play-caffeine-cache/src/main/scala/play/api/cache/caffeine/CaffeineCacheManager.scala index dfc71781cf3..65751903935 100644 --- a/cache/play-caffeine-cache/src/main/scala/play/api/cache/caffeine/CaffeineCacheManager.scala +++ b/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[_, _] = { diff --git a/cache/play-caffeine-cache/src/test/scala/play/api/cache/caffeine/CaffeineCacheApiSpec.scala b/cache/play-caffeine-cache/src/test/scala/play/api/cache/caffeine/CaffeineCacheApiSpec.scala index b6002c7b653..7bb8c3c21f3 100644 --- a/cache/play-caffeine-cache/src/test/scala/play/api/cache/caffeine/CaffeineCacheApiSpec.scala +++ b/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") diff --git a/cache/play-ehcache/src/main/scala/play/api/cache/ehcache/EhCacheApi.scala b/cache/play-ehcache/src/main/scala/play/api/cache/ehcache/EhCacheApi.scala index e8cb75364c0..abac7738256 100644 --- a/cache/play-ehcache/src/main/scala/play/api/cache/ehcache/EhCacheApi.scala +++ b/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 diff --git a/core/play-guice/src/main/scala/play/api/inject/guice/GuiceApplicationBuilder.scala b/core/play-guice/src/main/scala/play/api/inject/guice/GuiceApplicationBuilder.scala index 3864670ad98..181205f67a9 100644 --- a/core/play-guice/src/main/scala/play/api/inject/guice/GuiceApplicationBuilder.scala +++ b/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") diff --git a/core/play-guice/src/main/scala/play/api/inject/guice/GuiceInjectorBuilder.scala b/core/play-guice/src/main/scala/play/api/inject/guice/GuiceInjectorBuilder.scala index 537ba0daf68..1246360a847 100644 --- a/core/play-guice/src/main/scala/play/api/inject/guice/GuiceInjectorBuilder.scala +++ b/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, diff --git a/core/play-guice/src/test/scala/play/api/http/HttpErrorHandlerSpec.scala b/core/play-guice/src/test/scala/play/api/http/HttpErrorHandlerSpec.scala index baf37911828..e16ab36ff64 100644 --- a/core/play-guice/src/test/scala/play/api/http/HttpErrorHandlerSpec.scala +++ b/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 { diff --git a/core/play-integration-test/src/it/scala/play/it/action/HeadActionSpec.scala b/core/play-integration-test/src/it/scala/play/it/action/HeadActionSpec.scala index 3edb072f0ee..1ce61109449 100644 --- a/core/play-integration-test/src/it/scala/play/it/action/HeadActionSpec.scala +++ b/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) diff --git a/core/play-integration-test/src/it/scala/play/it/http/AkkaRequestTimeoutSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/AkkaRequestTimeoutSpec.scala index 862b25bb3e3..d3592802609 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/AkkaRequestTimeoutSpec.scala +++ b/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 { diff --git a/core/play-integration-test/src/it/scala/play/it/http/FlashCookieSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/FlashCookieSpec.scala index e4690d79cdc..048c54963ac 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/FlashCookieSpec.scala +++ b/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 { diff --git a/core/play-integration-test/src/it/scala/play/it/http/JavaActionCompositionSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/JavaActionCompositionSpec.scala index b6353e7b55a..8346728462f 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/JavaActionCompositionSpec.scala +++ b/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) } diff --git a/core/play-integration-test/src/it/scala/play/it/http/JavaActionSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/JavaActionSpec.scala index e449739b97d..431adf7c0fc 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/JavaActionSpec.scala +++ b/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) } diff --git a/core/play-integration-test/src/it/scala/play/it/http/JavaHttpErrorHandlingSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/JavaHttpErrorHandlingSpec.scala index 30a2eb779c3..6eba4ce7bcc 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/JavaHttpErrorHandlingSpec.scala +++ b/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 diff --git a/core/play-integration-test/src/it/scala/play/it/http/JavaRequestsSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/JavaRequestsSpec.scala index 446a3f2a340..5666f97dac0 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/JavaRequestsSpec.scala +++ b/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") diff --git a/core/play-integration-test/src/it/scala/play/it/http/JavaResultsHandlingSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/JavaResultsHandlingSpec.scala index f5c7681875f..d15407e50ac 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/JavaResultsHandlingSpec.scala +++ b/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) diff --git a/core/play-integration-test/src/it/scala/play/it/http/SessionCookieSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/SessionCookieSpec.scala index cae3876e5aa..2d2545a388d 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/SessionCookieSpec.scala +++ b/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) diff --git a/core/play-integration-test/src/it/scala/play/it/http/parsing/FormBodyParserSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/parsing/FormBodyParserSpec.scala index 0ee39a60e9f..bfcd8760fd5 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/parsing/FormBodyParserSpec.scala +++ b/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 { diff --git a/core/play-integration-test/src/it/scala/play/it/http/websocket/WebSocketClient.scala b/core/play-integration-test/src/it/scala/play/it/http/websocket/WebSocketClient.scala index 9555d186b11..495812f9423 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/websocket/WebSocketClient.scala +++ b/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)) diff --git a/core/play-integration-test/src/it/scala/play/it/http/websocket/WebSocketSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/websocket/WebSocketSpec.scala index ba5e8f4ec7e..83294415d58 100644 --- a/core/play-integration-test/src/it/scala/play/it/http/websocket/WebSocketSpec.scala +++ b/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 diff --git a/core/play-integration-test/src/it/scala/play/it/libs/JavaFormSpec.scala b/core/play-integration-test/src/it/scala/play/it/libs/JavaFormSpec.scala index e16e27d7b78..90fc70f1abe 100644 --- a/core/play-integration-test/src/it/scala/play/it/libs/JavaFormSpec.scala +++ b/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 { diff --git a/core/play-java/src/main/scala/play/routing/RouterBuilderHelper.scala b/core/play-java/src/main/scala/play/routing/RouterBuilderHelper.scala index 147472251c3..ef558f4928f 100644 --- a/core/play-java/src/main/scala/play/routing/RouterBuilderHelper.scala +++ b/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 diff --git a/core/play-java/src/test/scala/play/libs/XPathSpec.scala b/core/play-java/src/test/scala/play/libs/XPathSpec.scala index 3b7099a4084..f43745d9cbc 100644 --- a/core/play-java/src/test/scala/play/libs/XPathSpec.scala +++ b/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 diff --git a/core/play-streams/src/test/scala/play/libs/streams/AccumulatorSpec.scala b/core/play-streams/src/test/scala/play/libs/streams/AccumulatorSpec.scala index 6daf5cd42cc..b819f66ed8b 100644 --- a/core/play-streams/src/test/scala/play/libs/streams/AccumulatorSpec.scala +++ b/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") diff --git a/core/play/src/main/scala/play/api/Configuration.scala b/core/play/src/main/scala/play/api/Configuration.scala index a9c5cb065cf..87756c904ed 100644 --- a/core/play/src/main/scala/play/api/Configuration.scala +++ b/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 diff --git a/core/play/src/main/scala/play/api/Logger.scala b/core/play/src/main/scala/play/api/Logger.scala index 8d8380f6974..671f073584c 100644 --- a/core/play/src/main/scala/play/api/Logger.scala +++ b/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. diff --git a/core/play/src/main/scala/play/api/LoggerConfigurator.scala b/core/play/src/main/scala/play/api/LoggerConfigurator.scala index 259a5f50f5e..fc4af8a1fd3 100644 --- a/core/play/src/main/scala/play/api/LoggerConfigurator.scala +++ b/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) diff --git a/core/play/src/main/scala/play/api/http/HttpFilters.scala b/core/play/src/main/scala/play/api/http/HttpFilters.scala index ce900cce7f4..8269083c235 100644 --- a/core/play/src/main/scala/play/api/http/HttpFilters.scala +++ b/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]]. diff --git a/core/play/src/main/scala/play/api/i18n/Langs.scala b/core/play/src/main/scala/play/api/i18n/Langs.scala index 34596ab7c26..3961286bc37 100644 --- a/core/play/src/main/scala/play/api/i18n/Langs.scala +++ b/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. diff --git a/core/play/src/main/scala/play/api/i18n/Messages.scala b/core/play/src/main/scala/play/api/i18n/Messages.scala index d6a6d1264ed..2be14f20568 100644 --- a/core/play/src/main/scala/play/api/i18n/Messages.scala +++ b/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)) diff --git a/core/play/src/main/scala/play/api/mvc/Binders.scala b/core/play/src/main/scala/play/api/mvc/Binders.scala index 48482ff9e86..b27d0e142a5 100644 --- a/core/play/src/main/scala/play/api/mvc/Binders.scala +++ b/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 diff --git a/core/play/src/main/scala/play/api/mvc/Cookie.scala b/core/play/src/main/scala/play/api/mvc/Cookie.scala index 8eb3f89abd5..526a0affe42 100644 --- a/core/play/src/main/scala/play/api/mvc/Cookie.scala +++ b/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()) diff --git a/core/play/src/main/scala/play/api/mvc/Headers.scala b/core/play/src/main/scala/play/api/mvc/Headers.scala index 3742fb50207..01c0141cf45 100644 --- a/core/play/src/main/scala/play/api/mvc/Headers.scala +++ b/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 diff --git a/core/play/src/main/scala/play/api/mvc/Results.scala b/core/play/src/main/scala/play/api/mvc/Results.scala index 1ceb3056d14..7767ad5896c 100644 --- a/core/play/src/main/scala/play/api/mvc/Results.scala +++ b/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 diff --git a/core/play/src/main/scala/play/api/templates/Templates.scala b/core/play/src/main/scala/play/api/templates/Templates.scala index 9b39f208c57..1020acf27bd 100644 --- a/core/play/src/main/scala/play/api/templates/Templates.scala +++ b/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. */ diff --git a/core/play/src/main/scala/play/core/j/JavaAction.scala b/core/play/src/main/scala/play/core/j/JavaAction.scala index ef2468f34a0..62951331e11 100644 --- a/core/play/src/main/scala/play/core/j/JavaAction.scala +++ b/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 diff --git a/core/play/src/main/scala/play/core/j/JavaHelpers.scala b/core/play/src/main/scala/play/core/j/JavaHelpers.scala index 676c6a932de..dfa841334e5 100644 --- a/core/play/src/main/scala/play/core/j/JavaHelpers.scala +++ b/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 /** diff --git a/core/play/src/main/scala/play/core/j/JavaParsers.scala b/core/play/src/main/scala/play/core/j/JavaParsers.scala index c15c5dd0cb3..6b694c82b69 100644 --- a/core/play/src/main/scala/play/core/j/JavaParsers.scala +++ b/core/play/src/main/scala/play/core/j/JavaParsers.scala @@ -11,7 +11,7 @@ import play.api.libs.Files.TemporaryFile import akka.stream.Materializer -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import play.api.mvc._ import play.libs.Files.DelegateTemporaryFile import play.libs.Files.{ TemporaryFile => JTemporaryFile } diff --git a/core/play/src/main/scala/play/core/j/JavaResults.scala b/core/play/src/main/scala/play/core/j/JavaResults.scala index 4382fdf0f12..629154da610 100644 --- a/core/play/src/main/scala/play/core/j/JavaResults.scala +++ b/core/play/src/main/scala/play/core/j/JavaResults.scala @@ -7,13 +7,13 @@ package play.core.j import play.mvc.{ ResponseHeader => JResponseHeader } import scala.annotation.varargs -import scala.collection.JavaConverters +import scala.jdk.CollectionConverters import scala.language.reflectiveCalls object JavaResultExtractor { @varargs def withHeader(responseHeader: JResponseHeader, nameValues: String*): JResponseHeader = { - import JavaConverters._ + import CollectionConverters._ if (nameValues.length % 2 != 0) { throw new IllegalArgumentException( "Unmatched name - withHeaders must be invoked with an even number of string arguments" diff --git a/core/play/src/main/scala/play/core/j/JavaRouterAdapter.scala b/core/play/src/main/scala/play/core/j/JavaRouterAdapter.scala index 950ff048158..055d54beb76 100644 --- a/core/play/src/main/scala/play/core/j/JavaRouterAdapter.scala +++ b/core/play/src/main/scala/play/core/j/JavaRouterAdapter.scala @@ -9,7 +9,7 @@ import javax.inject.Inject import play.mvc.Http.RequestHeader import play.routing.Router.RouteDocumentation -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.compat.java8.OptionConverters._ /** diff --git a/core/play/src/main/scala/play/core/parsers/FormUrlEncodedParser.scala b/core/play/src/main/scala/play/core/parsers/FormUrlEncodedParser.scala index c74017827a7..0b5112e9647 100644 --- a/core/play/src/main/scala/play/core/parsers/FormUrlEncodedParser.scala +++ b/core/play/src/main/scala/play/core/parsers/FormUrlEncodedParser.scala @@ -44,7 +44,7 @@ object FormUrlEncodedParser { * @return A Map of keys to the sequence of values for that key */ def parseAsJava(data: String, encoding: String): java.util.Map[String, java.util.List[String]] = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ parse(data, encoding).map { case (key, values) => key -> values.asJava @@ -58,7 +58,7 @@ object FormUrlEncodedParser { * @return A Map of keys to the sequence of array values for that key */ def parseAsJavaArrayValues(data: String, encoding: String): java.util.Map[String, Array[String]] = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ parse(data, encoding).map { case (key, values) => key -> values.toArray diff --git a/core/play/src/main/scala/play/core/routing/GeneratedRouter.scala b/core/play/src/main/scala/play/core/routing/GeneratedRouter.scala index e7e1afd81b1..426cd9dfebc 100644 --- a/core/play/src/main/scala/play/core/routing/GeneratedRouter.scala +++ b/core/play/src/main/scala/play/core/routing/GeneratedRouter.scala @@ -14,7 +14,7 @@ import play.api.mvc._ import play.api.routing.HandlerDef import play.api.routing.Router -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * A route diff --git a/core/play/src/main/scala/views/helper/Helpers.scala b/core/play/src/main/scala/views/helper/Helpers.scala index 198bb704010..69046c03d69 100644 --- a/core/play/src/main/scala/views/helper/Helpers.scala +++ b/core/play/src/main/scala/views/helper/Helpers.scala @@ -6,7 +6,7 @@ import play.api.data.FormError import play.api.templates.PlayMagic.translate import play.twirl.api._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.language.implicitConversions package views.html.helper { diff --git a/core/play/src/test/scala/play/api/ConfigurationSpec.scala b/core/play/src/test/scala/play/api/ConfigurationSpec.scala index 917a3963367..e8cb910b76e 100644 --- a/core/play/src/test/scala/play/api/ConfigurationSpec.scala +++ b/core/play/src/test/scala/play/api/ConfigurationSpec.scala @@ -341,7 +341,7 @@ class ConfigurationSpec extends Specification { } "InMemoryResourceClassLoader should return one resource" in { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val cl = new InMemoryResourceClassLoader("reference.conf" -> "foo = ${bar}") val url = new URL(null, "bytes:///reference.conf", (_: URL) => throw new IOException) diff --git a/core/play/src/test/scala/play/api/http/HttpConfigurationSpec.scala b/core/play/src/test/scala/play/api/http/HttpConfigurationSpec.scala index e3710577a9e..99e7731f07b 100644 --- a/core/play/src/test/scala/play/api/http/HttpConfigurationSpec.scala +++ b/core/play/src/test/scala/play/api/http/HttpConfigurationSpec.scala @@ -20,7 +20,7 @@ import play.core.cookie.encoding.ServerCookieEncoder class HttpConfigurationSpec extends Specification { "HttpConfiguration" should { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ def properties = { Map( diff --git a/core/play/src/test/scala/play/api/templates/TemplatesSpec.scala b/core/play/src/test/scala/play/api/templates/TemplatesSpec.scala index b6dc5d4fffc..11f1d4fe808 100644 --- a/core/play/src/test/scala/play/api/templates/TemplatesSpec.scala +++ b/core/play/src/test/scala/play/api/templates/TemplatesSpec.scala @@ -20,7 +20,7 @@ import play.api.mvc.Results import play.mvc.{ Results => JResults } import play.twirl.api.Html -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class TemplatesSpec extends Specification { "toHtmlArgs" should { diff --git a/core/play/src/test/scala/play/mvc/MaxLengthBodyParserSpec.scala b/core/play/src/test/scala/play/mvc/MaxLengthBodyParserSpec.scala index 1180833a42f..9a097249c9a 100644 --- a/core/play/src/test/scala/play/mvc/MaxLengthBodyParserSpec.scala +++ b/core/play/src/test/scala/play/mvc/MaxLengthBodyParserSpec.scala @@ -25,7 +25,7 @@ import play.libs.streams.Accumulator import play.http.DefaultHttpErrorHandler import play.libs.F -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.compat.java8.OptionConverters._ class MaxLengthBodyParserSpec extends Specification with AfterAll with MustMatchers { diff --git a/core/play/src/test/scala/play/mvc/RequestHeaderSpec.scala b/core/play/src/test/scala/play/mvc/RequestHeaderSpec.scala index 62a9e7a7263..27446617139 100644 --- a/core/play/src/test/scala/play/mvc/RequestHeaderSpec.scala +++ b/core/play/src/test/scala/play/mvc/RequestHeaderSpec.scala @@ -15,7 +15,7 @@ import play.api.mvc.request.RequestTarget import play.mvc.Http.HeaderNames import scala.compat.java8.OptionConverters._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class RequestHeaderSpec extends Specification { private def requestHeader(headers: (String, String)*): RequestHeader = { diff --git a/core/play/src/test/scala/play/mvc/ResponseHeaderSpec.scala b/core/play/src/test/scala/play/mvc/ResponseHeaderSpec.scala index c1c4b1b8ea0..e027e16bd4f 100644 --- a/core/play/src/test/scala/play/mvc/ResponseHeaderSpec.scala +++ b/core/play/src/test/scala/play/mvc/ResponseHeaderSpec.scala @@ -5,7 +5,7 @@ package play.mvc import org.specs2.mutable.Specification -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.compat.java8.OptionConverters._ class ResponseHeaderSpec extends Specification { diff --git a/persistence/play-jdbc/src/main/scala/play/api/db/HikariCPModule.scala b/persistence/play-jdbc/src/main/scala/play/api/db/HikariCPModule.scala index ae0acdc0aee..ce56d633f40 100644 --- a/persistence/play-jdbc/src/main/scala/play/api/db/HikariCPModule.scala +++ b/persistence/play-jdbc/src/main/scala/play/api/db/HikariCPModule.scala @@ -114,7 +114,7 @@ private[db] class HikariCPConfig private ( dbConfig.username.foreach(hikariConfig.setUsername) dbConfig.password.foreach(hikariConfig.setPassword) - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val dataSourceConfig = config.get[Configuration]("dataSource") dataSourceConfig.underlying.root().keySet().asScala.foreach { key => diff --git a/testkit/play-test/src/main/scala/play/api/test/ServerEndpointRecipe.scala b/testkit/play-test/src/main/scala/play/api/test/ServerEndpointRecipe.scala index 13943c0295b..ae2d9719c4e 100644 --- a/testkit/play-test/src/main/scala/play/api/test/ServerEndpointRecipe.scala +++ b/testkit/play-test/src/main/scala/play/api/test/ServerEndpointRecipe.scala @@ -15,7 +15,7 @@ import play.core.server.ServerEndpoint import play.core.server.ServerEndpoints import play.core.server.ServerProvider -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * A recipe for making a [[ServerEndpoint]]. Recipes are often used diff --git a/transport/client/play-ahc-ws/src/test/scala/play/api/libs/ws/ahc/AhcWSSpec.scala b/transport/client/play-ahc-ws/src/test/scala/play/api/libs/ws/ahc/AhcWSSpec.scala index 66f8df64e67..cfd74d66588 100644 --- a/transport/client/play-ahc-ws/src/test/scala/play/api/libs/ws/ahc/AhcWSSpec.scala +++ b/transport/client/play-ahc-ws/src/test/scala/play/api/libs/ws/ahc/AhcWSSpec.scala @@ -52,7 +52,7 @@ class AhcWSSpec(implicit ee: ExecutionEnv) .asInstanceOf[AhcWSRequest] val req: AHCRequest = r.underlying.buildRequest() - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val paramsList: scala.collection.Seq[Param] = req.getQueryParams.asScala paramsList.exists(p => (p.getName == "foo") && (p.getValue == "foo1")) must beTrue paramsList.exists(p => (p.getName == "foo") && (p.getValue == "foo2")) must beTrue @@ -60,7 +60,7 @@ class AhcWSSpec(implicit ee: ExecutionEnv) } "support http headers" in { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val req: AHCRequest = makeAhcRequest("http://playframework.com/") .addHttpHeaders("key" -> "value1", "key" -> "value2") .asInstanceOf[AhcWSRequest] @@ -79,7 +79,7 @@ class AhcWSSpec(implicit ee: ExecutionEnv) } "not make Content-Type header if there is Content-Type in headers already" in { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val req: AHCRequest = makeAhcRequest("http://playframework.com/") .addHttpHeaders("content-type" -> "fake/contenttype; charset=utf-8") .withBody(value1) @@ -141,7 +141,7 @@ class AhcWSSpec(implicit ee: ExecutionEnv) } "Have form params on POST of content type application/x-www-form-urlencoded when signed" in { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val consumerKey = ConsumerKey("key", "secret") val requestToken = RequestToken("token", "secret") val calc = OAuthCalculator(consumerKey, requestToken) @@ -176,7 +176,7 @@ class AhcWSSpec(implicit ee: ExecutionEnv) } "Remove a user defined content length header if we are parsing body explicitly when signed" in { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val consumerKey = ConsumerKey("key", "secret") val requestToken = RequestToken("token", "secret") val calc = OAuthCalculator(consumerKey, requestToken) @@ -197,7 +197,7 @@ class AhcWSSpec(implicit ee: ExecutionEnv) } "Verify Content-Type header is passed through correctly" in { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val req: AHCRequest = makeAhcRequest("http://playframework.com/") .addHttpHeaders("Content-Type" -> "text/plain; charset=US-ASCII") .withBody("HELLO WORLD") diff --git a/transport/server/play-netty-server/src/main/scala/play/core/server/NettyServer.scala b/transport/server/play-netty-server/src/main/scala/play/core/server/NettyServer.scala index 8ea79329da7..92f201a9ef0 100644 --- a/transport/server/play-netty-server/src/main/scala/play/core/server/NettyServer.scala +++ b/transport/server/play-netty-server/src/main/scala/play/core/server/NettyServer.scala @@ -41,7 +41,7 @@ import play.core.server.netty._ import play.core.server.ssl.ServerSSLEngine import play.server.SSLEngineProvider -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.concurrent.duration.Duration import scala.concurrent.ExecutionContext import scala.concurrent.Future diff --git a/transport/server/play-netty-server/src/main/scala/play/core/server/netty/NettyHeadersWrapper.scala b/transport/server/play-netty-server/src/main/scala/play/core/server/netty/NettyHeadersWrapper.scala index 3f39babfdae..dcb6136bbe4 100644 --- a/transport/server/play-netty-server/src/main/scala/play/core/server/netty/NettyHeadersWrapper.scala +++ b/transport/server/play-netty-server/src/main/scala/play/core/server/netty/NettyHeadersWrapper.scala @@ -6,7 +6,7 @@ package play.core.server.netty import io.netty.handler.codec.http._ import play.api.mvc._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * An implementation of Play `Headers` that wraps the raw Netty headers and diff --git a/transport/server/play-netty-server/src/main/scala/play/core/server/netty/NettyModelConversion.scala b/transport/server/play-netty-server/src/main/scala/play/core/server/netty/NettyModelConversion.scala index 39f1209d951..8556c74ffc4 100644 --- a/transport/server/play-netty-server/src/main/scala/play/core/server/netty/NettyModelConversion.scala +++ b/transport/server/play-netty-server/src/main/scala/play/core/server/netty/NettyModelConversion.scala @@ -37,7 +37,7 @@ import play.core.server.common.ForwardedHeaderHandler import play.core.server.common.PathAndQueryParser import play.core.server.common.ServerResultUtils -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.concurrent.Future import scala.util.control.NonFatal import scala.util.Failure diff --git a/transport/server/play-server/src/main/scala/play/core/server/DevServerStart.scala b/transport/server/play-server/src/main/scala/play/core/server/DevServerStart.scala index 6f7469f903b..e225fe6ddfb 100644 --- a/transport/server/play-server/src/main/scala/play/core/server/DevServerStart.scala +++ b/transport/server/play-server/src/main/scala/play/core/server/DevServerStart.scala @@ -21,7 +21,7 @@ import play.utils.PlayIO import play.utils.Threads import java.util.concurrent.atomic.AtomicBoolean -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.concurrent.Future import scala.util.control.NonFatal import scala.util.Failure diff --git a/web/play-filters-helpers/src/main/scala/play/filters/cors/CORSConfig.scala b/web/play-filters-helpers/src/main/scala/play/filters/cors/CORSConfig.scala index 12de87893c6..a8833a0f134 100644 --- a/web/play-filters-helpers/src/main/scala/play/filters/cors/CORSConfig.scala +++ b/web/play-filters-helpers/src/main/scala/play/filters/cors/CORSConfig.scala @@ -81,7 +81,7 @@ case class CORSConfig( def withServeForbiddenOrigins(serveForbiddenOrigins: Boolean): CORSConfig = copy(serveForbiddenOrigins = serveForbiddenOrigins) - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ import scala.compat.java8.FunctionConverters._ import java.util.{ function => juf } diff --git a/web/play-filters-helpers/src/main/scala/play/filters/csp/CSPConfig.scala b/web/play-filters-helpers/src/main/scala/play/filters/csp/CSPConfig.scala index dc4881ec6f0..5f20006b0e7 100644 --- a/web/play-filters-helpers/src/main/scala/play/filters/csp/CSPConfig.scala +++ b/web/play-filters-helpers/src/main/scala/play/filters/csp/CSPConfig.scala @@ -45,12 +45,12 @@ case class CSPConfig( } def withHashes(hashes: java.util.List[CSPHashConfig]): CSPConfig = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ copy(hashes = hashes.asScala.toSeq) } def withDirectives(directives: java.util.List[CSPDirective]): CSPConfig = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ copy(directives = directives.asScala.toSeq) } } @@ -79,7 +79,7 @@ object CSPConfig { * @return a CSPConfig instance. */ def fromUnprefixedConfiguration(config: Configuration): CSPConfig = { - import collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val reportOnly = config.get[Boolean]("reportOnly") diff --git a/web/play-filters-helpers/src/main/scala/play/filters/hosts/AllowedHostsFilter.scala b/web/play-filters-helpers/src/main/scala/play/filters/hosts/AllowedHostsFilter.scala index bee04198c30..014c49b62bc 100644 --- a/web/play-filters-helpers/src/main/scala/play/filters/hosts/AllowedHostsFilter.scala +++ b/web/play-filters-helpers/src/main/scala/play/filters/hosts/AllowedHostsFilter.scala @@ -91,7 +91,7 @@ private[hosts] case class HostMatcher(pattern: String) { } case class AllowedHostsConfig(allowed: Seq[String], shouldProtect: RequestHeader => Boolean = _ => true) { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ import play.mvc.Http.{ RequestHeader => JRequestHeader } import scala.compat.java8.FunctionConverters._ diff --git a/web/play-filters-helpers/src/test/scala/play/filters/csp/CSPProcessorSpec.scala b/web/play-filters-helpers/src/test/scala/play/filters/csp/CSPProcessorSpec.scala index a671cdabe8f..22d10f6cad1 100644 --- a/web/play-filters-helpers/src/test/scala/play/filters/csp/CSPProcessorSpec.scala +++ b/web/play-filters-helpers/src/test/scala/play/filters/csp/CSPProcessorSpec.scala @@ -15,7 +15,7 @@ import com.shapesecurity.salvation.directiveValues.HashSource.HashAlgorithm import com.shapesecurity.salvation.directives.DirectiveValue import com.shapesecurity.salvation.directives.UpgradeInsecureRequestsDirective -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class CSPProcessorSpec extends PlaySpecification { "shouldFilterRequest" should { diff --git a/web/play-filters-helpers/src/test/scala/play/filters/csp/JavaCSPReportSpec.scala b/web/play-filters-helpers/src/test/scala/play/filters/csp/JavaCSPReportSpec.scala index 4cb0b202f48..0a092f50834 100644 --- a/web/play-filters-helpers/src/test/scala/play/filters/csp/JavaCSPReportSpec.scala +++ b/web/play-filters-helpers/src/test/scala/play/filters/csp/JavaCSPReportSpec.scala @@ -267,7 +267,7 @@ object JavaCSPReportSpec { class MyAction extends Controller { @BodyParser.Of(classOf[CSPReportBodyParser]) def cspReport(request: Http.Request): Result = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val cspReport: JavaCSPReport = request.body.as(classOf[JavaCSPReport]) val json = play.libs.Json.toJson(Map("violation" -> cspReport.violatedDirective).asJava) Results.ok(json).as(play.mvc.Http.MimeTypes.JSON) diff --git a/web/play-filters-helpers/src/test/scala/play/filters/hosts/AllowedHostsFilterSpec.scala b/web/play-filters-helpers/src/test/scala/play/filters/hosts/AllowedHostsFilterSpec.scala index 75b93c4b5bb..51014d79e32 100644 --- a/web/play-filters-helpers/src/test/scala/play/filters/hosts/AllowedHostsFilterSpec.scala +++ b/web/play-filters-helpers/src/test/scala/play/filters/hosts/AllowedHostsFilterSpec.scala @@ -26,7 +26,7 @@ import play.api.Application import play.api.Configuration import play.api.Environment -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration._ diff --git a/web/play-java-forms/src/main/scala/play/core/PlayFormsMagicForJava.scala b/web/play-java-forms/src/main/scala/play/core/PlayFormsMagicForJava.scala index bf9f68fd2b6..dc96c9a6347 100644 --- a/web/play-java-forms/src/main/scala/play/core/PlayFormsMagicForJava.scala +++ b/web/play-java-forms/src/main/scala/play/core/PlayFormsMagicForJava.scala @@ -6,7 +6,7 @@ package play.core.j /** Defines a magic helper for Play templates in a Java Forms context. */ object PlayFormsMagicForJava { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ import scala.compat.java8.OptionConverters import scala.language.implicitConversions diff --git a/web/play-java-forms/src/test/scala/play/data/DynamicFormSpec.scala b/web/play-java-forms/src/test/scala/play/data/DynamicFormSpec.scala index 68d2d549251..2dd5825f864 100644 --- a/web/play-java-forms/src/test/scala/play/data/DynamicFormSpec.scala +++ b/web/play-java-forms/src/test/scala/play/data/DynamicFormSpec.scala @@ -28,7 +28,7 @@ import play.mvc.Http.RequestBuilder import views.html.helper.FieldConstructor.defaultField import views.html.helper.inputText -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.compat.java8.OptionConverters._ /** diff --git a/web/play-java-forms/src/test/scala/play/data/FormSpec.scala b/web/play-java-forms/src/test/scala/play/data/FormSpec.scala index 6b69d161f97..ca3de93fdb3 100644 --- a/web/play-java-forms/src/test/scala/play/data/FormSpec.scala +++ b/web/play-java-forms/src/test/scala/play/data/FormSpec.scala @@ -45,7 +45,7 @@ import play.twirl.api.Html import javax.validation.constraints.Size import scala.beans.BeanProperty -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.compat.java8.OptionConverters._ class RuntimeDependencyInjectionFormSpec extends FormSpec { diff --git a/web/play-java-forms/src/test/scala/play/data/PartialValidationSpec.scala b/web/play-java-forms/src/test/scala/play/data/PartialValidationSpec.scala index cd16ba641a7..0f12270e16c 100644 --- a/web/play-java-forms/src/test/scala/play/data/PartialValidationSpec.scala +++ b/web/play-java-forms/src/test/scala/play/data/PartialValidationSpec.scala @@ -13,7 +13,7 @@ import play.data.validation.Constraints.Required import play.libs.typedmap.TypedMap import scala.beans.BeanProperty -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class PartialValidationSpec extends Specification { val messagesApi = new DefaultMessagesApi() diff --git a/web/play-openid/src/main/scala/play/api/libs/openid/OpenIdClient.scala b/web/play-openid/src/main/scala/play/api/libs/openid/OpenIdClient.scala index d24d397ca65..aef25bfcd4b 100644 --- a/web/play-openid/src/main/scala/play/api/libs/openid/OpenIdClient.scala +++ b/web/play-openid/src/main/scala/play/api/libs/openid/OpenIdClient.scala @@ -145,7 +145,7 @@ class WsOpenIdClient @Inject() (ws: WSClient, discovery: Discovery)(implicit ec: * For internal use */ def verifiedId(queryString: java.util.Map[String, Array[String]]): Future[UserInfo] = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ verifiedId(queryString.asScala.toMap.mapValues(_.toSeq).toMap) } diff --git a/web/play-openid/src/test/scala/play/api/libs/openid/package.scala b/web/play-openid/src/test/scala/play/api/libs/openid/package.scala index 21d242c09ad..831dfad2c98 100644 --- a/web/play-openid/src/test/scala/play/api/libs/openid/package.scala +++ b/web/play-openid/src/test/scala/play/api/libs/openid/package.scala @@ -9,7 +9,7 @@ import play.shaded.ahc.io.netty.handler.codec.http.QueryStringDecoder import java.net.MalformedURLException import java.net.URL import util.control.Exception._ -import collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.language.implicitConversions