URL Session Refactoring

Author: saiHemak

Foundation.xcodeproj/project.pbxproj

@@ -1,4 +1,4 @@
-// Foundation/URLSession/HTTPBodySource.swift - URLSession & libcurl
+// Foundation/URLSession/BodySource.swift - URLSession & libcurl
 //
 // This source file is part of the Swift.org open source project
 //
@@ -39,16 +39,16 @@ internal func splitData(dispatchData data: DispatchData, atPosition position: In
     return (data.subdata(in: 0..<position), data.subdata(in: position..<data.count))
 }
 
-/// A (non-blocking) source for HTTP body data.
-internal protocol _HTTPBodySource: class {
+/// A (non-blocking) source for body data.
+internal protocol _BodySource: class {
     /// Get the next chunck of data.
     ///
     /// - Returns: `.data` until the source is exhausted, at which point it will
     /// return `.done`. Since this is non-blocking, it will return `.retryLater`
     /// if no data is available at this point, but will be available later.
-    func getNextChunk(withLength length: Int) -> _HTTPBodySourceDataChunk
+    func getNextChunk(withLength length: Int) -> _BodySourceDataChunk
 }
-internal enum _HTTPBodySourceDataChunk {
+internal enum _BodySourceDataChunk {
     case data(DispatchData)
     /// The source is depleted.
     case done
@@ -57,26 +57,26 @@ internal enum _HTTPBodySourceDataChunk {
     case error
 }
 
-/// A HTTP body data source backed by `dispatch_data_t`.
-internal final class _HTTPBodyDataSource {
-    var data: DispatchData! 
+/// A body data source backed by `dispatch_data_t`.
+internal final class _BodyDataSource {
+    var data: DispatchData!
     init(data: DispatchData) {
         self.data = data
     }
 }
 
-extension _HTTPBodyDataSource : _HTTPBodySource {
+extension _BodyDataSource : _BodySource {
     enum _Error : Error {
         case unableToRewindData
     }
-
-    func getNextChunk(withLength length: Int) -> _HTTPBodySourceDataChunk {
+    
+    func getNextChunk(withLength length: Int) -> _BodySourceDataChunk {
         let remaining = data.count
         if remaining == 0 {
             return .done
         } else if remaining <= length {
             let r: DispatchData! = data
-            data = DispatchData.empty 
+            data = DispatchData.empty
             return .data(r)
         } else {
             let (chunk, remainder) = splitData(dispatchData: data, atPosition: length)
@@ -87,7 +87,7 @@ extension _HTTPBodyDataSource : _HTTPBodySource {
 }
 
 
-/// A HTTP body data source backed by a file.
+/// A body data source backed by a file.
 ///
 /// This allows non-blocking streaming of file data to the remote server.
 ///
@@ -98,10 +98,10 @@ extension _HTTPBodyDataSource : _HTTPBodySource {
 /// - Note: Calls to `getNextChunk(withLength:)` and callbacks from libdispatch
 /// should all happen on the same (serial) queue, and hence this code doesn't
 /// have to be thread safe.
-internal final class _HTTPBodyFileSource {
+internal final class _BodyFileSource {
     fileprivate let fileURL: URL
-    fileprivate let channel: DispatchIO 
-    fileprivate let workQueue: DispatchQueue 
+    fileprivate let channel: DispatchIO
+    fileprivate let workQueue: DispatchQueue
     fileprivate let dataAvailableHandler: () -> Void
     fileprivate var hasActiveReadHandler = false
     fileprivate var availableChunk: _Chunk = .empty
@@ -127,13 +127,14 @@ internal final class _HTTPBodyFileSource {
         }
         guard let channel = DispatchIO(type: .stream, path: fileSystemRepresentation,
                                        oflag: O_RDONLY, mode: 0, queue: workQueue,
-                                       cleanupHandler: {_ in }) else {
-            fatalError("Cant create DispatchIO channel")
+                                       cleanupHandler: {_ in })
+            else {
+                fatalError("Cant create DispatchIO channel")
         }
         self.channel = channel
         self.channel.setLimit(highWater: CFURLSessionMaxWriteSize)
     }
-
+    
     fileprivate enum _Chunk {
         /// Nothing has been read, yet
         case empty
@@ -146,7 +147,7 @@ internal final class _HTTPBodyFileSource {
     }
 }
 
-fileprivate extension _HTTPBodyFileSource {
+fileprivate extension _BodyFileSource {
     fileprivate var desiredBufferLength: Int { return 3 * CFURLSessionMaxWriteSize }
     /// Enqueue a dispatch I/O read to fill the buffer.
     ///
@@ -182,7 +183,7 @@ fileprivate extension _HTTPBodyFileSource {
             }
         }
     }
-
+    
     fileprivate func append(data: DispatchData, endOfFile: Bool) {
         switch availableChunk {
         case .empty:
@@ -196,7 +197,7 @@ fileprivate extension _HTTPBodyFileSource {
             fatalError("Trying to append data, but end-of-file was already detected.")
         }
     }
-
+    
     fileprivate var availableByteCount: Int {
         switch availableChunk {
         case .empty: return 0
@@ -208,8 +209,8 @@ fileprivate extension _HTTPBodyFileSource {
     }
 }
 
-extension _HTTPBodyFileSource : _HTTPBodySource {
-    func getNextChunk(withLength length: Int) -> _HTTPBodySourceDataChunk {    
+extension _BodyFileSource : _BodySource {
+    func getNextChunk(withLength length: Int) -> _BodySourceDataChunk {
         switch availableChunk {
         case .empty:
             readNextChunk()