simplify materialized value computation tree, fixes #20015
- also fixes materialized value sources for graphs that import zero or one graphs, with and without Fusing
This commit is contained in:
parent
b52c498638
commit
b255a19374
31 changed files with 582 additions and 279 deletions
|
|
@ -8,7 +8,6 @@ import java.util.concurrent.atomic.{ AtomicBoolean, AtomicReference }
|
|||
import akka.NotUsed
|
||||
import akka.http.scaladsl.model.RequestEntity
|
||||
import akka.stream._
|
||||
import akka.stream.impl.StreamLayout.Module
|
||||
import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage
|
||||
import akka.stream.impl.{ PublisherSink, SinkModule, SourceModule }
|
||||
import akka.stream.scaladsl._
|
||||
|
|
@ -187,7 +186,7 @@ private[http] object StreamUtils {
|
|||
override protected def newInstance(shape: SinkShape[In]): SinkModule[In, Publisher[In]] =
|
||||
new OneTimePublisherSink[In](attributes, shape, cell)
|
||||
|
||||
override def withAttributes(attr: Attributes): Module =
|
||||
override def withAttributes(attr: Attributes): OneTimePublisherSink[In] =
|
||||
new OneTimePublisherSink[In](attr, amendShape(attr), cell)
|
||||
}
|
||||
/** A copy of SubscriberSource that allows access to the subscriber through the cell but can only materialized once */
|
||||
|
|
@ -212,7 +211,7 @@ private[http] object StreamUtils {
|
|||
|
||||
override protected def newInstance(shape: SourceShape[Out]): SourceModule[Out, Subscriber[Out]] =
|
||||
new OneTimeSubscriberSource[Out](attributes, shape, cell)
|
||||
override def withAttributes(attr: Attributes): Module =
|
||||
override def withAttributes(attr: Attributes): OneTimeSubscriberSource[Out] =
|
||||
new OneTimeSubscriberSource[Out](attr, amendShape(attr), cell)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
package akka.http.javadsl.model;
|
||||
|
||||
import akka.http.impl.util.Util;
|
||||
import akka.http.javadsl.model.headers.*;
|
||||
import akka.japi.Pair;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue