From fddc198178f7ff3d9cac23269afe24f2eba49a22 Mon Sep 17 00:00:00 2001 From: Andrea Peruffo Date: Mon, 20 Aug 2018 16:43:46 +0200 Subject: [PATCH] =str Avoid boxing Attributes in java Optional (#25456) --- .../scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala | 2 +- akka-stream/src/main/scala/akka/stream/impl/Sinks.scala | 2 +- akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala | 2 +- .../main/scala/akka/stream/impl/io/InputStreamSinkStage.scala | 2 +- .../scala/akka/stream/impl/io/OutputStreamSourceStage.scala | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala index 3a94efbab8..083d357c65 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala @@ -32,7 +32,7 @@ import akka.stream.stage._ new GraphStageLogic(shape) with InHandler { implicit def self: ActorRef = stageActor.ref - val maxBuffer = inheritedAttributes.getAttribute(classOf[InputBuffer], InputBuffer(16, 16)).max + val maxBuffer = inheritedAttributes.get[InputBuffer](InputBuffer(16, 16)).max require(maxBuffer > 0, "Buffer size must be greater than 0") val buffer: util.Deque[In] = new util.ArrayDeque[In]() diff --git a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala index 5a6e8e37a0..770e9c3b0f 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala @@ -333,7 +333,7 @@ import scala.util.{ Failure, Success, Try } val stageLogic = new GraphStageLogic(shape) with InHandler with SinkQueueWithCancel[T] { type Received[E] = Try[Option[E]] - val maxBuffer = inheritedAttributes.getAttribute(classOf[InputBuffer], InputBuffer(16, 16)).max + val maxBuffer = inheritedAttributes.get[InputBuffer](InputBuffer(16, 16)).max require(maxBuffer > 0, "Buffer size must be greater than 0") var buffer: Buffer[Received[T]] = _ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala b/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala index 63ac15b192..a0cc2703ff 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala @@ -59,7 +59,7 @@ private[akka] final class FileSource(path: Path, chunkSize: Int, startPosition: val logic = new GraphStageLogic(shape) with OutHandler { handler ⇒ val buffer = ByteBuffer.allocate(chunkSize) - val maxReadAhead = inheritedAttributes.getAttribute(classOf[InputBuffer], InputBuffer(16, 16)).max + val maxReadAhead = inheritedAttributes.get[InputBuffer](InputBuffer(16, 16)).max var channel: FileChannel = _ var position = startPosition var chunkCallback: Try[Int] ⇒ Unit = _ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSinkStage.scala b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSinkStage.scala index c578232b68..7bd3ca0b60 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSinkStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSinkStage.scala @@ -46,7 +46,7 @@ private[stream] object InputStreamSinkStage { override val shape: SinkShape[ByteString] = SinkShape.of(in) override def createLogicAndMaterializedValue(inheritedAttributes: Attributes): (GraphStageLogic, InputStream) = { - val maxBuffer = inheritedAttributes.getAttribute(classOf[InputBuffer], InputBuffer(16, 16)).max + val maxBuffer = inheritedAttributes.get[InputBuffer](InputBuffer(16, 16)).max require(maxBuffer > 0, "Buffer size must be greater than 0") val dataQueue = new LinkedBlockingDeque[StreamToAdapterMessage](maxBuffer + 2) diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala b/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala index 34ce2bb4e3..0845797bfe 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala @@ -37,7 +37,7 @@ final private[stream] class OutputStreamSourceStage(writeTimeout: FiniteDuration override val shape: SourceShape[ByteString] = SourceShape.of(out) override def createLogicAndMaterializedValue(inheritedAttributes: Attributes): (GraphStageLogic, OutputStream) = { - val maxBuffer = inheritedAttributes.getAttribute(classOf[InputBuffer], InputBuffer(16, 16)).max + val maxBuffer = inheritedAttributes.get[InputBuffer](InputBuffer(16, 16)).max require(maxBuffer > 0, "Buffer size must be greater than 0")