This is an automated email from the ASF dual-hosted git repository.

hepin 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 a0f807d05a chore: Drop ActorMaterializer class. (#2137)
a0f807d05a is described below

commit a0f807d05a0f04a29984193968b3597c803accad
Author: He-Pin(kerr) <[email protected]>
AuthorDate: Thu Sep 4 04:55:07 2025 +0800

    chore: Drop ActorMaterializer class. (#2137)
---
 .../pekko/stream/ActorMaterializerSpec.scala       |  4 +-
 .../apache/pekko/stream/DslConsistencySpec.scala   |  2 +-
 .../org/apache/pekko/stream/io/FileSinkSpec.scala  |  2 +-
 .../apache/pekko/stream/io/FileSourceSpec.scala    |  2 +-
 .../pekko/stream/io/InputStreamSourceSpec.scala    | 10 +++-
 .../pekko/stream/io/OutputStreamSinkSpec.scala     |  4 +-
 .../pekko/stream/scaladsl/AttributesSpec.scala     |  2 +-
 .../pekko/stream/scaladsl/FlowDispatcherSpec.scala |  3 +-
 .../stream/scaladsl/FlowRecoverWithSpec.scala      |  2 +-
 .../pekko/stream/scaladsl/FlowSlidingSpec.scala    |  4 +-
 .../apache/pekko/stream/scaladsl/FlowSpec.scala    |  2 +-
 .../stream/scaladsl/GraphBackedFlowSpec.scala      |  2 +-
 .../pekko/stream/scaladsl/TakeLastSinkSpec.scala   |  4 +-
 .../remove-deprecated-methods.excludes             |  9 ++++
 .../apache/pekko/stream/ActorMaterializer.scala    | 59 ++--------------------
 .../pekko/stream/impl/ActorMaterializerImpl.scala  |  3 +-
 16 files changed, 41 insertions(+), 73 deletions(-)

diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/ActorMaterializerSpec.scala
 
b/stream-tests/src/test/scala/org/apache/pekko/stream/ActorMaterializerSpec.scala
index 2e90a5ef42..15ee24a957 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/ActorMaterializerSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/ActorMaterializerSpec.scala
@@ -45,7 +45,7 @@ object IndirectMaterializerCreation extends 
ExtensionId[IndirectMaterializerCrea
 @nowarn
 class IndirectMaterializerCreation(ex: ExtendedActorSystem) extends Extension {
   // extension instantiation blocked on materializer (which has Await.result 
inside)
-  implicit val mat: ActorMaterializer = ActorMaterializer()(ex)
+  implicit val mat: Materializer = ActorMaterializer()(ex)
 
   def futureThing(n: Int): Future[Int] = {
     Source.single(n).runWith(Sink.head)
@@ -171,7 +171,7 @@ object ActorMaterializerSpec {
   class ActorWithMaterializer(p: TestProbe) extends Actor {
     private val settings: ActorMaterializerSettings =
       
ActorMaterializerSettings(context.system).withDispatcher("pekko.test.stream-dispatcher")
-    implicit val mat: ActorMaterializer = ActorMaterializer(settings)(context)
+    implicit val mat: Materializer = ActorMaterializer(settings)(context)
 
     Source
       .repeat("hello")
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/DslConsistencySpec.scala 
b/stream-tests/src/test/scala/org/apache/pekko/stream/DslConsistencySpec.scala
index 544e418fdf..b576641952 100755
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/DslConsistencySpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/DslConsistencySpec.scala
@@ -114,7 +114,7 @@ class DslConsistencySpec extends AnyWordSpec with Matchers {
     sRunnableGraphClass -> Set("builder"))
 
   @nowarn
-  def materializing(m: Method): Boolean = 
m.getParameterTypes.contains(classOf[ActorMaterializer])
+  def materializing(m: Method): Boolean = 
m.getParameterTypes.contains(classOf[Materializer])
 
   def assertHasMethod(c: Class[_], name: String): Unit = {
     // include class name to get better error message
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSinkSpec.scala 
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSinkSpec.scala
index 760e7c54a9..8dfd06209c 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSinkSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSinkSpec.scala
@@ -39,7 +39,7 @@ import org.scalatest.concurrent.ScalaFutures
 class FileSinkSpec extends StreamSpec(UnboundedMailboxConfig) with 
ScalaFutures {
 
   val settings = 
ActorMaterializerSettings(system).withDispatcher("pekko.actor.default-dispatcher")
-  implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+  implicit val materializer: Materializer = ActorMaterializer(settings)
   val fs = Jimfs.newFileSystem("FileSinkSpec", Configuration.unix())
 
   val TestLines = {
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSourceSpec.scala 
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSourceSpec.scala
index 9b9f3d9060..446ee4477f 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSourceSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSourceSpec.scala
@@ -44,7 +44,7 @@ object FileSourceSpec {
 class FileSourceSpec extends StreamSpec(UnboundedMailboxConfig) {
 
   val settings = 
ActorMaterializerSettings(system).withDispatcher("pekko.actor.default-dispatcher")
-  implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+  implicit val materializer: Materializer = ActorMaterializer(settings)
 
   val fs = Jimfs.newFileSystem("FileSourceSpec", Configuration.unix())
 
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/InputStreamSourceSpec.scala
 
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/InputStreamSourceSpec.scala
index 6cf45ae934..294d1a5e79 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/InputStreamSourceSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/InputStreamSourceSpec.scala
@@ -21,7 +21,13 @@ import scala.util.Success
 
 import org.apache.pekko
 import pekko.Done
-import pekko.stream.{ AbruptStageTerminationException, ActorMaterializer, 
ActorMaterializerSettings, IOResult }
+import pekko.stream.{
+  AbruptStageTerminationException,
+  ActorMaterializer,
+  ActorMaterializerSettings,
+  IOResult,
+  Materializer
+}
 import pekko.stream.scaladsl.{ Keep, Sink, StreamConverters }
 import pekko.stream.testkit._
 import pekko.stream.testkit.Utils._
@@ -32,7 +38,7 @@ import pekko.util.ByteString
 class InputStreamSourceSpec extends StreamSpec(UnboundedMailboxConfig) {
 
   val settings = 
ActorMaterializerSettings(system).withDispatcher("pekko.actor.default-dispatcher")
-  implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+  implicit val materializer: Materializer = ActorMaterializer(settings)
 
   private def inputStreamFor(bytes: Array[Byte]): InputStream =
     new ByteArrayInputStream(bytes)
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/OutputStreamSinkSpec.scala
 
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/OutputStreamSinkSpec.scala
index 09498fc555..d986dced46 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/OutputStreamSinkSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/OutputStreamSinkSpec.scala
@@ -20,7 +20,7 @@ import scala.util.Success
 
 import org.apache.pekko
 import pekko.Done
-import pekko.stream.{ ActorMaterializer, ActorMaterializerSettings, 
IOOperationIncompleteException }
+import pekko.stream.{ ActorMaterializer, ActorMaterializerSettings, 
IOOperationIncompleteException, Materializer }
 import pekko.stream.scaladsl.{ Source, StreamConverters }
 import pekko.stream.testkit._
 import pekko.stream.testkit.Utils._
@@ -33,7 +33,7 @@ import org.scalatest.concurrent.ScalaFutures
 class OutputStreamSinkSpec extends StreamSpec(UnboundedMailboxConfig) with 
ScalaFutures {
 
   val settings = 
ActorMaterializerSettings(system).withDispatcher("pekko.actor.default-dispatcher")
-  implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+  implicit val materializer: Materializer = ActorMaterializer(settings)
 
   "OutputStreamSink" must {
     "write bytes to void OutputStream" in {
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/AttributesSpec.scala
 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/AttributesSpec.scala
index 15e37fe744..84c090c4e3 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/AttributesSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/AttributesSpec.scala
@@ -143,7 +143,7 @@ class AttributesSpec
 
   val settings = ActorMaterializerSettings(system).withInputBuffer(initialSize 
= 2, maxSize = 16)
 
-  implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+  implicit val materializer: Materializer = ActorMaterializer(settings)
 
   "an attributes instance" must {
 
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowDispatcherSpec.scala
 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowDispatcherSpec.scala
index 51e47f7e49..a4973e35f9 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowDispatcherSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowDispatcherSpec.scala
@@ -19,6 +19,7 @@ import org.apache.pekko
 import pekko.stream.ActorMaterializer
 import pekko.stream.ActorMaterializerSettings
 import pekko.stream.testkit.StreamSpec
+import pekko.stream.Materializer
 import pekko.testkit.TestProbe
 
 @nowarn("msg=deprecated")
@@ -30,7 +31,7 @@ class FlowDispatcherSpec extends StreamSpec(s"my-dispatcher = 
$${pekko.test.stre
       settings: ActorMaterializerSettings = defaultSettings,
       dispatcher: String = "pekko.test.stream-dispatcher") = {
 
-    implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+    implicit val materializer: Materializer = ActorMaterializer(settings)
 
     val probe = TestProbe()
     Source(List(1, 2, 3)).map(i => { probe.ref ! 
Thread.currentThread().getName(); i }).to(Sink.ignore).run()
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowRecoverWithSpec.scala
 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowRecoverWithSpec.scala
index 07933c0378..4e7e362908 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowRecoverWithSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowRecoverWithSpec.scala
@@ -29,7 +29,7 @@ class FlowRecoverWithSpec extends StreamSpec {
 
   val settings = ActorMaterializerSettings(system).withInputBuffer(initialSize 
= 1, maxSize = 1)
 
-  implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+  implicit val materializer: Materializer = ActorMaterializer(settings)
 
   val ex = new RuntimeException("ex") with NoStackTrace
 
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSlidingSpec.scala
 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSlidingSpec.scala
index e6654f9f96..141a550bd3 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSlidingSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSlidingSpec.scala
@@ -20,7 +20,7 @@ import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 
 import org.apache.pekko
 import pekko.pattern.pipe
-import pekko.stream.{ ActorMaterializer, ActorMaterializerSettings }
+import pekko.stream.{ ActorMaterializer, ActorMaterializerSettings, 
Materializer }
 import pekko.stream.testkit._
 
 @nowarn
@@ -28,7 +28,7 @@ class FlowSlidingSpec extends StreamSpec with 
ScalaCheckPropertyChecks {
   import system.dispatcher
   val settings = ActorMaterializerSettings(system).withInputBuffer(initialSize 
= 2, maxSize = 16)
 
-  implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+  implicit val materializer: Materializer = ActorMaterializer(settings)
 
   "Sliding" must {
     import org.scalacheck.Shrink.shrinkAny
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSpec.scala 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSpec.scala
index 0364f130cb..88ad5c1218 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/FlowSpec.scala
@@ -53,7 +53,7 @@ class FlowSpec extends 
StreamSpec(ConfigFactory.parseString("pekko.actor.debug.r
 
   val settings = ActorMaterializerSettings(system).withInputBuffer(initialSize 
= 2, maxSize = 2)
 
-  implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+  implicit val materializer: Materializer = ActorMaterializer(settings)
 
   val identity: Flow[Any, Any, NotUsed] => Flow[Any, Any, NotUsed] = in => 
in.map(e => e)
   val identity2: Flow[Any, Any, NotUsed] => Flow[Any, Any, NotUsed] = in => 
identity(in)
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/GraphBackedFlowSpec.scala
 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/GraphBackedFlowSpec.scala
index 72395b666b..4ea1560961 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/GraphBackedFlowSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/GraphBackedFlowSpec.scala
@@ -56,7 +56,7 @@ class GraphFlowSpec extends StreamSpec {
 
   val settings = ActorMaterializerSettings(system).withInputBuffer(initialSize 
= 2, maxSize = 16)
 
-  implicit val materializer: ActorMaterializer = ActorMaterializer(settings)
+  implicit val materializer: Materializer = ActorMaterializer(settings)
 
   def validateProbe(probe: TestSubscriber.ManualProbe[Int], requests: Int, 
result: Set[Int]): Unit = {
     val subscription = probe.expectSubscription()
diff --git 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/TakeLastSinkSpec.scala
 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/TakeLastSinkSpec.scala
index b123a2313b..88da15d8b0 100644
--- 
a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/TakeLastSinkSpec.scala
+++ 
b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/TakeLastSinkSpec.scala
@@ -18,7 +18,7 @@ import scala.collection.immutable
 import scala.concurrent.{ Await, Future }
 
 import org.apache.pekko
-import pekko.stream.{ AbruptTerminationException, ActorMaterializer, 
ActorMaterializerSettings }
+import pekko.stream.{ AbruptTerminationException, ActorMaterializer, 
ActorMaterializerSettings, Materializer }
 import pekko.stream.testkit.{ StreamSpec, TestPublisher }
 
 @nowarn
@@ -26,7 +26,7 @@ class TakeLastSinkSpec extends StreamSpec {
 
   val settings = ActorMaterializerSettings(system).withInputBuffer(initialSize 
= 2, maxSize = 16)
 
-  implicit val mat: ActorMaterializer = ActorMaterializer(settings)
+  implicit val mat: Materializer = ActorMaterializer(settings)
 
   "Sink.takeLast" must {
     "return the last 3 elements" in {
diff --git 
a/stream/src/main/mima-filters/2.0.x.backwards.excludes/remove-deprecated-methods.excludes
 
b/stream/src/main/mima-filters/2.0.x.backwards.excludes/remove-deprecated-methods.excludes
index 843da33386..c9b81f0149 100644
--- 
a/stream/src/main/mima-filters/2.0.x.backwards.excludes/remove-deprecated-methods.excludes
+++ 
b/stream/src/main/mima-filters/2.0.x.backwards.excludes/remove-deprecated-methods.excludes
@@ -192,3 +192,12 @@ 
ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.stream.OverflowStr
 
ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.stream.OverflowStrategies$DropNew$")
 
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.OverflowStrategy.dropNew")
 
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.stage.GraphStageLogic.lastCancellationCause_=")
+ProblemFilters.exclude[FinalClassProblem]("org.apache.pekko.stream.ActorMaterializer")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.stream.ActorMaterializer.create")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.stream.ActorMaterializer.apply")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.ActorMaterializer.settings")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.ActorMaterializer.shutdown")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.ActorMaterializer.isShutdown")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.ActorMaterializer.system")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.stream.ActorMaterializer.this")
+
diff --git 
a/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala 
b/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
index 573957eafd..b9623e3682 100644
--- a/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
+++ b/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
@@ -25,9 +25,7 @@ import pekko.actor.ActorRef
 import pekko.actor.ActorRefFactory
 import pekko.actor.ActorSystem
 import pekko.actor.ExtendedActorSystem
-import pekko.actor.Props
 import pekko.annotation.InternalApi
-import pekko.event.LoggingAdapter
 import pekko.stream.impl._
 import pekko.stream.stage.GraphStageLogic
 import pekko.util.Helpers.toRootLowerCase
@@ -54,7 +52,7 @@ private[pekko] object ActorMaterializer {
     "Use the system wide materializer with stream attributes or configuration 
settings to change defaults",
     "Akka 2.6.0")
   def apply(materializerSettings: Option[ActorMaterializerSettings] = None, 
namePrefix: Option[String] = None)(
-      implicit context: ActorRefFactory): ActorMaterializer = {
+      implicit context: ActorRefFactory): Materializer = {
     val system = actorSystemOf(context)
 
     val settings = 
materializerSettings.getOrElse(SystemMaterializer(system).materializerSettings)
@@ -77,14 +75,14 @@ private[pekko] object ActorMaterializer {
     "Use the system wide materializer with stream attributes or configuration 
settings to change defaults",
     "Akka 2.6.0")
   def apply(materializerSettings: ActorMaterializerSettings, namePrefix: 
String)(
-      implicit context: ActorRefFactory): ActorMaterializer = {
+      implicit context: ActorRefFactory): Materializer = {
 
     context match {
       case system: ActorSystem =>
         // system level materializer, defer to the system materializer 
extension
         SystemMaterializer(system)
           .createAdditionalLegacySystemMaterializer(namePrefix, 
materializerSettings)
-          .asInstanceOf[ActorMaterializer]
+          .asInstanceOf[Materializer]
 
       case context: ActorContext =>
         // actor context level materializer, will live as a child of this actor
@@ -110,7 +108,7 @@ private[pekko] object ActorMaterializer {
   @deprecated(
     "Use the system wide materializer or Materializer.apply(actorContext) with 
stream attributes or configuration settings to change defaults",
     "Akka 2.6.0")
-  def apply(materializerSettings: ActorMaterializerSettings)(implicit context: 
ActorRefFactory): ActorMaterializer =
+  def apply(materializerSettings: ActorMaterializerSettings)(implicit context: 
ActorRefFactory): Materializer =
     apply(Some(materializerSettings), None)
 
   /**
@@ -127,7 +125,7 @@ private[pekko] object ActorMaterializer {
   @deprecated(
     "Use the system wide materializer or Materializer.create(actorContext) 
with stream attributes or configuration settings to change defaults",
     "Akka 2.6.0")
-  def create(context: ActorRefFactory): ActorMaterializer =
+  def create(context: ActorRefFactory): Materializer =
     apply()(context)
 
   private def actorSystemOf(context: ActorRefFactory): ActorSystem = {
@@ -144,53 +142,6 @@ private[pekko] object ActorMaterializer {
 
 }
 
-/**
- * An ActorMaterializer takes a stream blueprint and turns it into a running 
stream.
- */
-
-@InternalApi
-@deprecated("The Materializer now has all methods the ActorMaterializer used 
to have", "Akka 2.6.0")
-private[pekko] abstract class ActorMaterializer extends Materializer with 
MaterializerLoggingProvider {
-
-  @deprecated(
-    "Use attributes to access settings from stages, see 
https://doc.akka.io/docs/akka/2.6/project/migration-guide-2.5.x-2.6.x.html";,
-    "Akka 2.6.0")
-  def settings: ActorMaterializerSettings
-
-  /**
-   * Shuts down this materializer and all the operators that have been 
materialized through this materializer. After
-   * having shut down, this materializer cannot be used again. Any attempt to 
materialize operators after having
-   * shut down will result in an IllegalStateException being thrown at 
materialization time.
-   */
-  def shutdown(): Unit
-
-  /**
-   * Indicates if the materializer has been shut down.
-   */
-  def isShutdown: Boolean
-
-  /**
-   * INTERNAL API
-   */
-  private[pekko] def actorOf(context: MaterializationContext, props: Props): 
ActorRef
-
-  /**
-   * INTERNAL API
-   */
-  def system: ActorSystem
-
-  /**
-   * INTERNAL API
-   */
-  private[pekko] def logger: LoggingAdapter
-
-  /**
-   * INTERNAL API
-   */
-  private[pekko] def supervisor: ActorRef
-
-}
-
 /**
  * This exception or subtypes thereof should be used to signal materialization
  * failures.
diff --git 
a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorMaterializerImpl.scala
 
b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorMaterializerImpl.scala
index 84e66b6744..34b0685193 100644
--- 
a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorMaterializerImpl.scala
+++ 
b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorMaterializerImpl.scala
@@ -39,7 +39,8 @@ import pekko.util.OptionVal
  * INTERNAL API
  */
 @nowarn("msg=deprecated")
-@DoNotInherit private[pekko] abstract class ExtendedActorMaterializer extends 
ActorMaterializer {
+@DoNotInherit private[pekko] abstract class ExtendedActorMaterializer extends 
Materializer
+    with MaterializerLoggingProvider {
 
   override def withNamePrefix(name: String): ExtendedActorMaterializer
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to