From 5bfc3dc45a31e1e75c69baa8bfbfda2aefb86bd9 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sat, 11 Jun 2022 07:06:19 +0900 Subject: [PATCH] use CollectionConverters instead of deprecated JavaConverters --- core/play/src/main/java/play/i18n/MessagesApi.java | 6 ++---- core/play/src/main/java/play/inject/Module.java | 4 ++-- core/play/src/main/java/play/libs/Scala.java | 12 +++++------- core/play/src/main/java/play/mvc/BodyParser.java | 7 +++---- core/play/src/main/java/play/mvc/Results.java | 4 ++-- .../app/controllers/Application.scala | 1 - .../distribution/app/controllers/Application.scala | 1 - .../detailed/filters/csp/MyDynamicCSPAction.java | 5 ++--- 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/core/play/src/main/java/play/i18n/MessagesApi.java b/core/play/src/main/java/play/i18n/MessagesApi.java index 5e7a99e643f..bd0ca55adc0 100644 --- a/core/play/src/main/java/play/i18n/MessagesApi.java +++ b/core/play/src/main/java/play/i18n/MessagesApi.java @@ -46,9 +46,7 @@ public play.api.i18n.MessagesApi asScala() { * @return scala type for message processing */ private static Seq convertArgsToScalaBuffer(final Object... args) { - return scala.collection.JavaConverters.asScalaBufferConverter(wrapArgsToListIfNeeded(args)) - .asScala() - .toList(); + return scala.jdk.javaapi.CollectionConverters.asScala(wrapArgsToListIfNeeded(args)).toList(); } /** @@ -99,7 +97,7 @@ public String get(play.api.i18n.Lang lang, String key, Object... args) { * @return the formatted message or a default rendering if the key wasn't defined */ public String get(play.api.i18n.Lang lang, List keys, Object... args) { - Buffer keyArgs = scala.collection.JavaConverters.asScalaBufferConverter(keys).asScala(); + Buffer keyArgs = scala.jdk.javaapi.CollectionConverters.asScala(keys); Seq scalaArgs = convertArgsToScalaBuffer(args); return messages.apply(keyArgs.toSeq(), scalaArgs, lang); } diff --git a/core/play/src/main/java/play/inject/Module.java b/core/play/src/main/java/play/inject/Module.java index 04a422693bb..d08683a3cdf 100644 --- a/core/play/src/main/java/play/inject/Module.java +++ b/core/play/src/main/java/play/inject/Module.java @@ -6,7 +6,7 @@ import com.typesafe.config.Config; import play.Environment; -import scala.collection.JavaConverters; +import scala.jdk.javaapi.CollectionConverters; import scala.collection.immutable.Seq; import java.util.List; @@ -54,7 +54,7 @@ public final Seq> bindings( bindings(environment.asJava(), configuration.underlying()).stream() .map(Binding::asScala) .collect(Collectors.toList()); - return JavaConverters.collectionAsScalaIterableConverter(list).asScala().toList(); + return CollectionConverters.asScala(list).toList(); } /** Create a binding key for the given class. */ diff --git a/core/play/src/main/java/play/libs/Scala.java b/core/play/src/main/java/play/libs/Scala.java index d61b9202bce..1cf52ba46f2 100644 --- a/core/play/src/main/java/play/libs/Scala.java +++ b/core/play/src/main/java/play/libs/Scala.java @@ -26,7 +26,7 @@ public class Scala { * @param the element type. */ public static scala.collection.immutable.Seq toSeq(java.util.List list) { - return scala.collection.JavaConverters.asScalaBufferConverter(list).asScala().toList(); + return scala.jdk.javaapi.CollectionConverters.asScala(list).toList(); } /** @@ -90,7 +90,7 @@ public static T orElse(scala.Option opt, T defaultValue) { * @return the java map. */ public static java.util.Map asJava(scala.collection.Map scalaMap) { - return scala.collection.JavaConverters.mapAsJavaMapConverter(scalaMap).asJava(); + return scala.jdk.javaapi.CollectionConverters.asJava(scalaMap); } /** @@ -103,7 +103,7 @@ public static java.util.Map asJava(scala.collection.Map scala */ public static scala.collection.immutable.Map asScala(Map javaMap) { return play.utils.Conversions.newMap( - scala.collection.JavaConverters.mapAsScalaMapConverter(javaMap).asScala().toSeq()); + scala.jdk.javaapi.CollectionConverters.asScala(javaMap).toSeq()); } /** @@ -117,9 +117,7 @@ public static scala.collection.immutable.Map asScala(Map java public static scala.collection.immutable.Seq asScala( Collection javaCollection) { final scala.collection.immutable.List as = - scala.collection.JavaConverters.collectionAsScalaIterableConverter(javaCollection) - .asScala() - .toList(); + scala.jdk.javaapi.CollectionConverters.asScala(javaCollection).toList(); @SuppressWarnings("unchecked") // covariance: List <: List iff A <: B, given List is covariant in A final scala.collection.immutable.List bs = (scala.collection.immutable.List) as; @@ -179,7 +177,7 @@ public scala.concurrent.Future apply() { * @param the return type. */ public static java.util.List asJava(scala.collection.Seq scalaList) { - return scala.collection.JavaConverters.seqAsJavaListConverter(scalaList).asJava(); + return scala.jdk.javaapi.CollectionConverters.asJava(scalaList); } /** diff --git a/core/play/src/main/java/play/mvc/BodyParser.java b/core/play/src/main/java/play/mvc/BodyParser.java index 9aeaaedf8d7..2cb60b9c31b 100644 --- a/core/play/src/main/java/play/mvc/BodyParser.java +++ b/core/play/src/main/java/play/mvc/BodyParser.java @@ -30,7 +30,7 @@ import play.libs.streams.Accumulator; import play.mvc.Http.Status; import scala.Option; -import scala.collection.JavaConverters; +import scala.jdk.javaapi.CollectionConverters; import scala.compat.java8.FutureConverters; import scala.compat.java8.OptionConverters; import scala.concurrent.Future; @@ -54,7 +54,6 @@ import java.util.stream.Collectors; import static java.nio.charset.StandardCharsets.*; -import static scala.collection.JavaConverters.seqAsJavaListConverter; /** A body parser parses the HTTP request body content. */ public interface BodyParser { @@ -826,7 +825,7 @@ private class DelegatingMultipartFormData extends Http.MultipartFormData { @Override public Map asFormUrlEncoded() { // TODO have this transformations in Scala is easier. - return JavaConverters.mapAsJavaMap(scalaFormData.asFormUrlEncoded()).entrySet().stream() + return CollectionConverters.asJava(scalaFormData.asFormUrlEncoded()).entrySet().stream() .collect( Collectors.toMap( Map.Entry::getKey, entry -> Scala.asArray(String.class, entry.getValue()))); @@ -834,7 +833,7 @@ public Map asFormUrlEncoded() { @Override public List> getFiles() { - return seqAsJavaListConverter(scalaFormData.files()).asJava().stream() + return CollectionConverters.asJava(scalaFormData.files()).stream() .map(DelegatingMultipartFormDataBodyParser.this::toJava) .collect(Collectors.toList()); } diff --git a/core/play/src/main/java/play/mvc/Results.java b/core/play/src/main/java/play/mvc/Results.java index a6b94a6b961..41f99d7009a 100644 --- a/core/play/src/main/java/play/mvc/Results.java +++ b/core/play/src/main/java/play/mvc/Results.java @@ -19,7 +19,7 @@ import play.core.j.JavaHelpers; import play.http.HttpEntity; import play.twirl.api.Content; -import scala.collection.JavaConverters; +import scala.jdk.javaapi.CollectionConverters; import scala.compat.java8.OptionConverters; import static play.mvc.Http.HeaderNames.LOCATION; @@ -47,7 +47,7 @@ public class Results { */ public static Map contentDispositionHeader( boolean inline, Optional name) { - return JavaConverters.mapAsJavaMap( + return CollectionConverters.asJava( play.api.mvc.Results.contentDispositionHeader(inline, OptionConverters.toScala(name))); } diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution-without-documentation/app/controllers/Application.scala b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution-without-documentation/app/controllers/Application.scala index af7680a6aca..d3c75b32bb6 100644 --- a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution-without-documentation/app/controllers/Application.scala +++ b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution-without-documentation/app/controllers/Application.scala @@ -6,7 +6,6 @@ package controllers import play.api._ import play.api.mvc._ -import scala.collection.JavaConverters._ import javax.inject.Inject diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution/app/controllers/Application.scala b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution/app/controllers/Application.scala index 87ed8645dc3..7c5457f1ab3 100644 --- a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution/app/controllers/Application.scala +++ b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution/app/controllers/Application.scala @@ -6,7 +6,6 @@ package controllers import play.api._ import play.api.mvc._ -import scala.collection.JavaConverters._ import javax.inject.Inject diff --git a/documentation/manual/working/commonGuide/filters/code/javaguide/detailed/filters/csp/MyDynamicCSPAction.java b/documentation/manual/working/commonGuide/filters/code/javaguide/detailed/filters/csp/MyDynamicCSPAction.java index 2e69475ed8d..6707611978f 100644 --- a/documentation/manual/working/commonGuide/filters/code/javaguide/detailed/filters/csp/MyDynamicCSPAction.java +++ b/documentation/manual/working/commonGuide/filters/code/javaguide/detailed/filters/csp/MyDynamicCSPAction.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.stream.Collectors; -import scala.collection.JavaConverters; +import scala.jdk.javaapi.CollectionConverters; // #java-csp-dynamic-action public class MyDynamicCSPAction extends AbstractCSPAction { @@ -29,8 +29,7 @@ private CSPConfig cspConfig() { } private List generateDirectives() { - // import scala.collection.JavaConverters; - List baseDirectives = JavaConverters.seqAsJavaList(cspConfig.directives()); + List baseDirectives = CollectionConverters.asJava(cspConfig.directives()); return baseDirectives.stream() .map( directive -> {