This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko.git
The following commit(s) were added to refs/heads/main by this push:
new bc32e04b13 Fix CollectionUtil `toSeq` methods
bc32e04b13 is described below
commit bc32e04b1331c1cf45fc33c3efdcf19847f13d25
Author: Matthew de Detrich <[email protected]>
AuthorDate: Tue Oct 1 12:19:32 2024 +0200
Fix CollectionUtil `toSeq` methods
Signed-off-by: Matthew de Detrich <[email protected]>
---
.../scala-2.12/org/apache/pekko/stream/javadsl/CollectionUtil.scala | 2 ++
.../org/apache/pekko/stream/javadsl/CollectionUtil.scala | 2 ++
.../org/apache/pekko/stream/javadsl/CollectionUtil.scala | 6 ++++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/stream/src/main/scala-2.12/org/apache/pekko/stream/javadsl/CollectionUtil.scala
b/stream/src/main/scala-2.12/org/apache/pekko/stream/javadsl/CollectionUtil.scala
index 1fc7d88887..a77daba8a6 100644
---
a/stream/src/main/scala-2.12/org/apache/pekko/stream/javadsl/CollectionUtil.scala
+++
b/stream/src/main/scala-2.12/org/apache/pekko/stream/javadsl/CollectionUtil.scala
@@ -21,6 +21,7 @@ package javadsl
import scala.collection.immutable
import org.apache.pekko
+import pekko.annotation.InternalApi
import pekko.japi.Util.immutableSeq
/**
@@ -28,6 +29,7 @@ import pekko.japi.Util.immutableSeq
*
* Utility methods for converting Java collections to Scala collections.
*/
+@InternalApi
private[javadsl] object CollectionUtil {
@inline def toSeq[T](jlist: java.util.List[T]): immutable.Seq[T] =
immutableSeq(jlist)
diff --git
a/stream/src/main/scala-2.13+/org/apache/pekko/stream/javadsl/CollectionUtil.scala
b/stream/src/main/scala-2.13/org/apache/pekko/stream/javadsl/CollectionUtil.scala
similarity index 96%
copy from
stream/src/main/scala-2.13+/org/apache/pekko/stream/javadsl/CollectionUtil.scala
copy to
stream/src/main/scala-2.13/org/apache/pekko/stream/javadsl/CollectionUtil.scala
index 1a456b5e51..1f83183088 100644
---
a/stream/src/main/scala-2.13+/org/apache/pekko/stream/javadsl/CollectionUtil.scala
+++
b/stream/src/main/scala-2.13/org/apache/pekko/stream/javadsl/CollectionUtil.scala
@@ -21,6 +21,7 @@ package javadsl
import scala.collection.immutable
import org.apache.pekko
+import pekko.annotation.InternalApi
import pekko.util.ccompat.JavaConverters._
/**
@@ -28,6 +29,7 @@ import pekko.util.ccompat.JavaConverters._
*
* Utility methods for converting Java collections to Scala collections.
*/
+@InternalApi
private[javadsl] object CollectionUtil {
@inline def toSeq[T](jlist: java.util.List[T]): immutable.Seq[T] =
jlist.asScala.toSeq
diff --git
a/stream/src/main/scala-2.13+/org/apache/pekko/stream/javadsl/CollectionUtil.scala
b/stream/src/main/scala-3/org/apache/pekko/stream/javadsl/CollectionUtil.scala
similarity index 85%
rename from
stream/src/main/scala-2.13+/org/apache/pekko/stream/javadsl/CollectionUtil.scala
rename to
stream/src/main/scala-3/org/apache/pekko/stream/javadsl/CollectionUtil.scala
index 1a456b5e51..e940c7062d 100644
---
a/stream/src/main/scala-2.13+/org/apache/pekko/stream/javadsl/CollectionUtil.scala
+++
b/stream/src/main/scala-3/org/apache/pekko/stream/javadsl/CollectionUtil.scala
@@ -21,6 +21,7 @@ package javadsl
import scala.collection.immutable
import org.apache.pekko
+import pekko.annotation.InternalApi
import pekko.util.ccompat.JavaConverters._
/**
@@ -28,10 +29,11 @@ import pekko.util.ccompat.JavaConverters._
*
* Utility methods for converting Java collections to Scala collections.
*/
+@InternalApi
private[javadsl] object CollectionUtil {
- @inline def toSeq[T](jlist: java.util.List[T]): immutable.Seq[T] =
+ inline def toSeq[T](jlist: java.util.List[T]): immutable.Seq[T] =
jlist.asScala.toSeq
- @inline def toSeq[T](jiterable: java.lang.Iterable[T]): immutable.Seq[T] =
+ inline def toSeq[T](jiterable: java.lang.Iterable[T]): immutable.Seq[T] =
jiterable.asScala.toSeq
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
