From bf8f60f1ffcc4aa7a405efb54e50121878a4ebb6 Mon Sep 17 00:00:00 2001 From: "Richard S. Imaoka" Date: Sat, 16 Jun 2018 17:41:52 +0900 Subject: [PATCH] no need to rename to operators in internal API --- .../artery/compress/InboundCompressions.scala | 2 +- .../impl/fusing/GraphInterpreterSpecKit.scala | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/artery/compress/InboundCompressions.scala b/akka-remote/src/main/scala/akka/remote/artery/compress/InboundCompressions.scala index 2c906f947b..98f9015fd5 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/compress/InboundCompressions.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/compress/InboundCompressions.scala @@ -49,7 +49,7 @@ private[remote] trait InboundCompressions { * INTERNAL API * * One per incoming Aeron stream, actual compression tables are kept per-originUid and created on demand. - * All access is via the Decoder operator. + * All access is via the Decoder stage. */ private[remote] final class InboundCompressionsImpl( system: ActorSystem, diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala index 4f42533efd..74ea2d6281 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala @@ -17,27 +17,27 @@ import scala.collection.{ Map ⇒ SMap } object GraphInterpreterSpecKit { /** - * Create logics and enumerate operators and ports + * Create logics and enumerate stages and ports * - * @param operators Operators to "materialize" into operator logic instances - * @param upstreams Upstream boundary logics that are already instances of operator logic and should be - * part of the graph, is placed before the rest of the operators - * @param downstreams Downstream boundary logics, is placed after the other operators - * @param attributes Optional set of attributes to pass to the operators when creating the logics + * @param stages Stages to "materialize" into graph stage logic instances + * @param upstreams Upstream boundary logics that are already instances of graph stage logic and should be + * part of the graph, is placed before the rest of the stages + * @param downstreams Downstream boundary logics, is placed after the other stages + * @param attributes Optional set of attributes to pass to the stages when creating the logics * @return Created logics and the maps of all inlets respective outlets to those logics */ private[stream] def createLogics( - operators: Array[GraphStageWithMaterializedValue[_ <: Shape, _]], + stages: Array[GraphStageWithMaterializedValue[_ <: Shape, _]], upstreams: Array[UpstreamBoundaryStageLogic[_]], downstreams: Array[DownstreamBoundaryStageLogic[_]], attributes: Array[Attributes] = Array.empty): (Array[GraphStageLogic], SMap[Inlet[_], GraphStageLogic], SMap[Outlet[_], GraphStageLogic]) = { - if (attributes.nonEmpty && attributes.length != operators.length) + if (attributes.nonEmpty && attributes.length != stages.length) throw new IllegalArgumentException("Attributes must be either empty or one per stage") var inOwners = SMap.empty[Inlet[_], GraphStageLogic] var outOwners = SMap.empty[Outlet[_], GraphStageLogic] - val logics = new Array[GraphStageLogic](upstreams.length + operators.length + downstreams.length) + val logics = new Array[GraphStageLogic](upstreams.length + stages.length + downstreams.length) var idx = 0 while (idx < upstreams.length) { @@ -50,8 +50,8 @@ object GraphInterpreterSpecKit { } var stageIdx = 0 - while (stageIdx < operators.length) { - val stage = operators(stageIdx) + while (stageIdx < stages.length) { + val stage = stages(stageIdx) setPortIds(stage.shape) val stageAttributes =