EventStreams: remove non-closure overload incl. its tests

Author: paulhdk

Sources/OpenAPIRuntime/EventStreams/ServerSentEventsDecoding.swift

@@ -106,11 +106,6 @@ extension AsyncSequence where Element == ArraySlice<UInt8>, Self: Sendable {
         ServerSentEventsLineDeserializationSequence<Self>
     > { .init(upstream: ServerSentEventsLineDeserializationSequence(upstream: self), terminate: terminate) }
 
-    /// Convenience function for `asDecodedServerSentEvents` that directly receives the terminating byte sequence.
-    public func asDecodedServerSentEvents(terminatingSequence: ArraySlice<UInt8>) -> ServerSentEventsDeserializationSequence<
-        ServerSentEventsLineDeserializationSequence<Self>
-    > { asDecodedServerSentEvents(terminate: { incomingSequence in return incomingSequence == terminatingSequence }) }
-
     /// Returns another sequence that decodes each event's data as the provided type using the provided decoder.
     ///
     /// Use this method if the event's `data` field is JSON.
@@ -139,19 +134,6 @@ extension AsyncSequence where Element == ArraySlice<UInt8>, Self: Sendable {
                 )
             }
     }
-
-    public func asDecodedServerSentEventsWithJSONData<JSONDataType: Decodable>(
-        of dataType: JSONDataType.Type = JSONDataType.self,
-        decoder: JSONDecoder = .init(),
-        terminatingData: ArraySlice<UInt8>
-    ) -> AsyncThrowingMapSequence<
-        ServerSentEventsDeserializationSequence<ServerSentEventsLineDeserializationSequence<Self>>,
-        ServerSentEventWithJSONData<JSONDataType>
-    > {
-        asDecodedServerSentEventsWithJSONData(of: dataType, decoder: decoder) { incomingData in
-            terminatingData == incomingData
-        }
-    }
 }
 
 extension ServerSentEventsDeserializationSequence.Iterator {

Tests/OpenAPIRuntimeTests/EventStreams/Test_ServerSentEventsDecoding.swift

@@ -29,18 +29,6 @@ final class Test_ServerSentEventsDecoding: Test_Runtime {
         }
     }
 
-    func _test(input: String, output: [ServerSentEvent], file: StaticString = #filePath, line: UInt = #line, terminatingData: ArraySlice<UInt8>, eventCountOffset: Int)
-        async throws {
-        try await _test(
-            input: input,
-            output: output,
-            file: file,
-            line: line,
-            terminate: { incomingData in incomingData == terminatingData },
-            eventCountOffset: eventCountOffset
-        )
-    }
-
     func test() async throws {
         // Simple event.
         try await _test(
@@ -118,25 +106,6 @@ final class Test_ServerSentEventsDecoding: Test_Runtime {
             },
             eventCountOffset: -2
         )
-
-        try await _test(
-            input: #"""
-                data: hello
-                data: world
-
-                data: [DONE]
-
-                data: hello2
-                data: world2
-
-
-                """#,
-            output: [
-                .init(data: "hello\nworld")
-            ],
-            terminatingData: ArraySlice<UInt8>(Data("[DONE]".utf8)),
-            eventCountOffset: -2
-        )
     }
     func _testJSONData<JSONType: Decodable & Hashable & Sendable>(
         input: String,
@@ -155,22 +124,6 @@ final class Test_ServerSentEventsDecoding: Test_Runtime {
         }
     }
 
-    func _testJSONData<JSONType: Decodable & Hashable & Sendable>(
-        input: String,
-        output: [ServerSentEventWithJSONData<JSONType>],
-        file: StaticString = #filePath,
-        line: UInt = #line,
-        terminatingDataSequence: ArraySlice<UInt8>?
-    ) async throws {
-        try await _testJSONData(
-            input: input,
-            output: output,
-            file: file,
-            terminate: { incomingData in incomingData == ArraySlice<UInt8>(Data("[DONE]".utf8))
-            }
-        )
-    }
-
     struct TestEvent: Decodable, Hashable, Sendable { var index: Int }
     func testJSONData() async throws {
         // Simple event.
@@ -222,33 +175,6 @@ final class Test_ServerSentEventsDecoding: Test_Runtime {
                 incomingData == ArraySlice<UInt8>(Data("[DONE]".utf8))
             }
         )
-        
-        try await _testJSONData(
-            input: #"""
-                event: event1
-                id: 1
-                data: {"index":1}
-
-                event: event2
-                id: 2
-                data: {
-                data:   "index": 2
-                data: }
-
-                data: [DONE]
-
-                event: event3
-                id: 1
-                data: {"index":3}
-                
-                
-                """#,
-            output: [
-                .init(event: "event1", data: TestEvent(index: 1), id: "1"),
-                .init(event: "event2", data: TestEvent(index: 2), id: "2"),
-            ],
-            terminatingDataSequence: ArraySlice<UInt8>(Data("[DONE]".utf8))
-        )
     }
 }