diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorProcessor.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorProcessor.scala index 6dd7366fe3..e04897a15d 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorProcessor.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorProcessor.scala @@ -52,7 +52,7 @@ private[akka] abstract class BatchingInputBuffer(val size: Int, val pump: Pump) // TODO: buffer and batch sizing heuristics private var upstream: Subscription = _ - private val inputBuffer = Array.ofDim[AnyRef](size) + private val inputBuffer = new Array[AnyRef](size) private var inputBufferElements = 0 private var nextInputElementCursor = 0 private var upstreamCompleted = false diff --git a/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala b/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala index bf840428ca..d07219b643 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala @@ -50,7 +50,7 @@ object FanIn { } } - private[this] final val states = Array.ofDim[State](inputCount) + private[this] final val states = new Array[State](inputCount) private var markCount = 0 private var markedPending = 0 private var markedDepleted = 0 diff --git a/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala b/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala index 1359bf4ddb..6d0306e003 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala @@ -35,14 +35,14 @@ object FanOut { private val outputs = Array.tabulate(outputCount)(new FanoutOutputs(_, impl, pump)) - private val marked = Array.ofDim[Boolean](outputCount) + private val marked = new Array[Boolean](outputCount) private var markedCount = 0 - private val pending = Array.ofDim[Boolean](outputCount) + private val pending = new Array[Boolean](outputCount) private var markedPending = 0 - private val cancelled = Array.ofDim[Boolean](outputCount) + private val cancelled = new Array[Boolean](outputCount) private var markedCancelled = 0 - private val completed = Array.ofDim[Boolean](outputCount) - private val errored = Array.ofDim[Boolean](outputCount) + private val completed = new Array[Boolean](outputCount) + private val errored = new Array[Boolean](outputCount) override def toString: String = s"""|OutputBunch diff --git a/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala b/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala index bd08427ae3..8ca98533da 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala @@ -554,7 +554,7 @@ final class GraphStageIsland( private val logicArrayType = Array.empty[GraphStageLogic] private[this] val logics = new ArrayList[GraphStageLogic](64) // TODO: Resize - private val connections = Array.ofDim[Connection](64) + private val connections = new Array[Connection](64) private var maxConnections = 0 private var outConnections: List[Connection] = Nil private var fullIslandName: OptionVal[String] = OptionVal.None diff --git a/akka-stream/src/main/scala/akka/stream/impl/TraversalBuilder.scala b/akka-stream/src/main/scala/akka/stream/impl/TraversalBuilder.scala index 3e001afee1..ad13b0ba51 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/TraversalBuilder.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/TraversalBuilder.scala @@ -164,7 +164,7 @@ object TraversalBuilder { val builder = if (module.shape.outlets.isEmpty) { val b = CompletedTraversalBuilder( - traversalSoFar = MaterializeAtomic(module, Array.ofDim[Int](module.shape.outlets.size)), + traversalSoFar = MaterializeAtomic(module, new Array[Int](module.shape.outlets.size)), inSlots = module.shape.inlets.size, inToOffset = module.shape.inlets.map(in ⇒ in → in.id).toMap, Attributes.none) @@ -172,7 +172,7 @@ object TraversalBuilder { } else { AtomicTraversalBuilder( module, - Array.ofDim[Int](module.shape.outlets.size), + new Array[Int](module.shape.outlets.size), module.shape.outlets.size, Attributes.none) } diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala index 8521504a92..2b15e549dc 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala @@ -94,7 +94,7 @@ object ActorGraphInterpreter { private var actor: ActorRef = ActorRef.noSender private var upstream: Subscription = _ - private val inputBuffer = Array.ofDim[AnyRef](size) + private val inputBuffer = new Array[AnyRef](size) private var inputBufferElements = 0 private var nextInputElementCursor = 0 private var upstreamCompleted = false @@ -130,8 +130,7 @@ object ActorGraphInterpreter { ReactiveStreamsCompliance.requireNonNullElement(t) actor ! OnNext(shell, t) } - } - ) + }) } private def dequeue(): Any = { diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala index 975170df6d..c1625bc533 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala @@ -79,8 +79,7 @@ object GraphInterpreter { var outOwnerId: Int, var outOwner: GraphStageLogic, var inHandler: InHandler, - var outHandler: OutHandler - ) { + var outHandler: OutHandler) { var portState: Int = InReady var slot: Any = Empty @@ -225,7 +224,7 @@ final class GraphInterpreter( // An event queue implemented as a circular buffer // FIXME: This calculates the maximum size ever needed, but most assemblies can run on a smaller queue - private[this] val eventQueue = Array.ofDim[Connection](1 << (32 - Integer.numberOfLeadingZeros(connections.length - 1))) + private[this] val eventQueue = new Array[Connection](1 << (32 - Integer.numberOfLeadingZeros(connections.length - 1))) private[this] val mask = eventQueue.length - 1 private[this] var queueHead: Int = 0 private[this] var queueTail: Int = 0 diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamPublisher.scala b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamPublisher.scala index bc9faa05dd..9ceef29268 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamPublisher.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamPublisher.scala @@ -35,7 +35,7 @@ private[akka] class InputStreamPublisher(is: InputStream, completionPromise: Pro import InputStreamPublisher._ - val arr = Array.ofDim[Byte](chunkSize) + val arr = new Array[Byte](chunkSize) var readBytesTotal = 0L def receive = { diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala index b65a3b104f..84723c4600 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala @@ -377,7 +377,7 @@ private[akka] class BroadcastHub[T](bufferSize: Int) extends GraphStageWithMater * Elements are published by simply putting them into the array and bumping the tail. If necessary, certain * consumers are sent a wakeup message through an AsyncCallback. */ - private[this] val queue = Array.ofDim[AnyRef](bufferSize) + private[this] val queue = new Array[AnyRef](bufferSize) /* This is basically a classic Bucket Queue: https://en.wikipedia.org/wiki/Bucket_queue * (in fact, this is the variant described in the Optimizations section, where the given set * of priorities always fall to a range diff --git a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala index 5b3df91a2a..abcf4b32f1 100644 --- a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala +++ b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala @@ -240,7 +240,7 @@ abstract class GraphStageLogic private[stream] (val inCount: Int, val outCount: * INTERNAL API */ // Using common array to reduce overhead for small port counts - private[stream] val handlers = Array.ofDim[Any](inCount + outCount) + private[stream] val handlers = new Array[Any](inCount + outCount) /** * INTERNAL API @@ -261,7 +261,7 @@ abstract class GraphStageLogic private[stream] (val inCount: Int, val outCount: * INTERNAL API */ // Using common array to reduce overhead for small port counts - private[stream] val portToConn = Array.ofDim[Connection](handlers.length) + private[stream] val portToConn = new Array[Connection](handlers.length) /** * INTERNAL API