Switch to Akka streams MergeSequence

cloudstateio · Oct 18, 2020 · e0b5e6a · e0b5e6a
1 parent ffa306b
commit e0b5e6a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 243 deletions.
diff --git a/proxy/core/src/main/scala/io/cloudstate/proxy/eventing/EventingManager.scala b/proxy/core/src/main/scala/io/cloudstate/proxy/eventing/EventingManager.scala
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 import akka.{Done, NotUsed}
 import akka.actor.{ActorSystem, Cancellable}
 import akka.http.scaladsl.model.{MediaType, MediaTypes}
-import akka.stream.scaladsl.{Broadcast, Flow, GraphDSL, Partition, Source, Zip}
+import akka.stream.scaladsl.{Broadcast, Flow, GraphDSL, MergeSequence, Partition, Source, Zip}
 import akka.stream.{FlowShape, Materializer}
 import com.google.protobuf.TextFormat.ParseException
 import com.google.protobuf.{ByteString, CodedOutputStream, UnsafeByteOperations, WireFormat}
@@ -37,7 +37,6 @@ import com.google.protobuf.Descriptors.MethodDescriptor
 import io.cloudstate.proxy.UserFunctionRouter
 import io.cloudstate.proxy.entity.UserFunctionReply
 import io.cloudstate.proxy.protobuf.Options
-import io.cloudstate.proxy.streams.MergeSequence
 import org.slf4j.LoggerFactory
 
 import scala.collection.JavaConverters._

diff --git a/proxy/core/src/main/scala/io/cloudstate/proxy/streams/MergeSequence.scala b/proxy/core/src/main/scala/io/cloudstate/proxy/streams/MergeSequence.scala
diff --git a/proxy/core/src/test/scala/io/cloudstate/proxy/streams/MergeSequenceSpec.scala b/proxy/core/src/test/scala/io/cloudstate/proxy/streams/MergeSequenceSpec.scala