From 0339cf1086fff2f0f7a797d22fce6f1296442829 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 27 Sep 2025 18:12:04 +0100 Subject: [PATCH] Update EventStreamUnmarshalling.scala --- .../sse/EventStreamUnmarshalling.scala | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/EventStreamUnmarshalling.scala b/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/EventStreamUnmarshalling.scala index c005d0128..819fd6536 100644 --- a/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/EventStreamUnmarshalling.scala +++ b/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/sse/EventStreamUnmarshalling.scala @@ -70,18 +70,6 @@ trait EventStreamUnmarshalling { settings.oversizedLineStrategy, settings.oversizedEventStrategy) - private final def fromEventsStream(maxLineSize: Int, maxEventSize: Int, emitEmptyEvents: Boolean) - : FromEntityUnmarshaller[Source[ServerSentEvent, NotUsed]] = - fromEventsStream(maxLineSize, maxEventSize, emitEmptyEvents, "fail-stream") - - private final def fromEventsStream(maxLineSize: Int, maxEventSize: Int, emitEmptyEvents: Boolean, - oversizedStrategy: String): FromEntityUnmarshaller[Source[ServerSentEvent, NotUsed]] = - fromEventsStreamInternal(maxLineSize, maxEventSize, emitEmptyEvents, oversizedStrategy) - - private final def fromEventsStream(maxLineSize: Int, maxEventSize: Int, emitEmptyEvents: Boolean, - oversizedStrategy: OversizedSseStrategy): FromEntityUnmarshaller[Source[ServerSentEvent, NotUsed]] = - fromEventsStream(maxLineSize, maxEventSize, emitEmptyEvents, oversizedStrategy, oversizedStrategy) - private final def fromEventsStream(maxLineSize: Int, maxEventSize: Int, emitEmptyEvents: Boolean, oversizedLineStrategy: OversizedSseStrategy, oversizedEventStrategy: OversizedSseStrategy) : FromEntityUnmarshaller[Source[ServerSentEvent, NotUsed]] = { @@ -95,16 +83,4 @@ trait EventStreamUnmarshalling { Unmarshaller.strict(unmarshal).forContentTypes(`text/event-stream`) } - - private final def fromEventsStreamInternal(maxLineSize: Int, maxEventSize: Int, emitEmptyEvents: Boolean, - oversizedStrategy: String): FromEntityUnmarshaller[Source[ServerSentEvent, NotUsed]] = { - val eventStreamParser = EventStreamParser(maxLineSize, maxEventSize, emitEmptyEvents, oversizedStrategy) - def unmarshal(entity: HttpEntity) = - entity - .withoutSizeLimit // Because of streaming: the server keeps the response open and potentially streams huge amounts of data - .dataBytes - .viaMat(eventStreamParser)(Keep.none) - - Unmarshaller.strict(unmarshal).forContentTypes(`text/event-stream`) - } }